Thread: Can anyone make a patch for me?

  1. #1
    Registered User carrotcake1029's Avatar
    Join Date
    Apr 2008
    Posts
    404

    Can anyone make a patch for me?

    I for the life of me cannot create a patch that will work. These two files are from the source of ffmpeg and have been updated by myself, and I just want to create a simple diff file that I can use in the future.

    I thought it was as simple as this:
    Code:
    diff -urNp old updated > file.patch
    But when I apply the patch with this:
    Code:
    patch -p0 < file.patch
    I get the result:
    Code:
    (Stripping trailing CRs from patch.)
    patching file old/configure
    Hunk #1 FAILED at 2555.
    Hunk #2 FAILED at 2603.
    2 out of 2 hunks FAILED -- saving rejects to file old/configure.rej
    patching file old/libavcodec/allcodecs.c
    Which shows a successful patch on the second file, but a failed patch on the first.

    If someone could be so kind to either create a diff for me or tell me what I could be doing wrong, I would be so grateful.

    -Download (58.5 KB file)-
    ffmpeg_static_pthread_update.zip

    Thanks.

  2. #2
    Registered User carrotcake1029's Avatar
    Join Date
    Apr 2008
    Posts
    404
    Never mind. My problem was my editor wasn't treating the EOL as UNIX style.

Popular pages Recent additions subscribe to a feed

Similar Threads

  1. Establishing 'make clean' with GNU make
    By Jesdisciple in forum C Programming
    Replies: 9
    Last Post: 04-11-2009, 09:10 AM
  2. How to make a Packet sniffer/filter?
    By shown in forum C++ Programming
    Replies: 2
    Last Post: 02-22-2009, 09:51 PM
  3. HELP!wanting to make full screen game windowed
    By rented in forum Game Programming
    Replies: 3
    Last Post: 06-11-2004, 04:19 AM
  4. make all rule
    By duffy in forum C Programming
    Replies: 9
    Last Post: 09-11-2003, 01:05 PM
  5. Replies: 6
    Last Post: 04-20-2002, 06:35 PM