1 chunk fails on patch to mplayer/loader/Makefile (prevents compilation) - hand fixed easy

What steps will reproduce the problem?
1. Get latest coreavc-for-linux
2. Get latest mplayer (revision 26450 w/ 12810 for some libs)
3. cd mplayer && ./configure --disable-mencoder
4. create patch
5. attempt to patch

What is the expected output? What do you see instead?

Patch doesn't apply correctly:
....
patching file loader/wine/windows.h
patching file loader/wine/winerror.h
patching file loader/wine/winestring.h
patching file loader/wine/winnt.h
patching file loader/wine/winreg.h
patching file loader/wine/winuser.h
patching file loader/wineacm.h
patching file loader/wrapper.h
patching file loader/Makefile
Hunk #1 succeeded at 31 with fuzz 1 (offset 2 lines).
Hunk #2 FAILED at 39.
1 out of 2 hunks FAILED -- saving rejects to file loader/Makefile.rej

Fixed by hand:
------------------------------
mplayer/loader/Makefile:
------------------------------
dshow/test: dshow/test.c ../get_path.o $(TEST_OBJS)
        $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) -lstdc++

registercodec: modify_reg.c registry.c
        $(CC) $(CFLAGS) -o $@ $<

qtx/qtxload: qtx/qtxload.c $(TEST_OBJS)
        $(CC) -o $@ $^ $(TEST_LDFLAGS)

qtx/list: qtx/list.c  $(TEST_OBJS)
        $(CC) -o $@ $^ $(TEST_LDFLAGS)

clean::
        rm -f dshow/*.o dshow/*.a dshow/*~
        rm -f dmo/*.o dmo/*.a dmo/*~
        rm -f dshow/test dshow/test.raw
        rm -f qtx/list qtx/qtxload
        rm -f registercodec
------------------------------

This is the "bad" patch (chunk taken from mplayerfull.patch):
------------------------------
Index: loader/Makefile
===================================================================
--- loader/Makefile     (revision 23850)
+++ loader/Makefile     (working copy)
@@ -29,6 +29,7 @@
                dmo/dmo.c  \
                dmo/dmo_guids.c \

+LIBS-yes += registercodec
 include ../mpcommon.mak

 CFLAGS+=-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
@@ -36,9 +37,13 @@
 dshow/test: dshow/test.c $(LIBNAME)
        $(CC) $(CFLAGS) -o $@ $^ -lstdc++

+registercodec: modify_reg.c registry.c
+       $(CC) $(CFLAGS) -o $@ $<
+
 clean::
        rm -f dshow/*.o dshow/*.a dshow/*~
        rm -f dmo/*.o dmo/*.a dmo/*~

 distclean::
        rm -f dshow/test dshow/test.raw
+       rm -f registercodec
------------------------------

What version of the product are you using? On what operating system?

Latest SVN for coreavc-for-linux. Mplayer SVN revision 23850. Gentoo Linux.

Please provide any additional information below.

Compiles fine after hand edit.

Original issue reported on code.google.com by cymen...@gmail.com on 14 Apr 2008 at 12:08

chenyunecjtu / coreavc-for-linux

1 chunk fails on patch to mplayer/loader/Makefile (prevents compilation) - hand fixed easy #22