Patching problem

[GoogleCodeExporter]

What steps will reproduce the problem?
1. get latests mplayer svn
2. get latests coreavc-for-linux-readonly
3. run mplayer ./configure 
4. create patach with script provided in coreavc
5. try to patch mplayer

What is the expected output? What do you see instead?
Hunk #1 succeeded at 31 (offset 2 lines).
Hunk #2 FAILED at 39.
1 out of 2 hunks FAILED -- saving rejects to file loader/Makefile.rej

Please provide any additional information below.
***************
*** 38,46 ****
  dshow/test: dshow/test.c $(LIBNAME)
        $(CC) $(CFLAGS) -o $@ $^ -lstdc++

  clean::
        rm -f dshow/*.o dshow/*.a dshow/*~
        rm -f dmo/*.o dmo/*.a dmo/*~

  distclean::
        rm -f dshow/test dshow/test.raw
--- 39,51 ----
  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

Original issue reported on code.google.com by ristoav...@gmail.com on 13 Feb 2008 at 8:40

[GoogleCodeExporter]

I get the same problems. Running Ubuntu 7.10. Got latest mplayer svn (1.0RC2), 
latest
coreavc-for-linux, ./configure on mplayer, create the patch then try to patch
mplayer. In fact, I've tried mplayer 1.0RC1, 1.0RC2 and 1.0pre8, all with the 
same
problem.

Original comment by OrG...@gmail.com on 15 Feb 2008 at 5:59

[GoogleCodeExporter]

Same problem here. I removed that hunk from the patch file and ended up adding 
those
lines manually.

I patched against mplayer trunk (svn)

Original comment by m41n0k...@gmail.com on 16 Feb 2008 at 10:13

[GoogleCodeExporter]

i have the same exact error....but im a little confused to how you manually 
patch
it?. im kinda of a noob to patching things. it would be great if you could 
explain
what i need to edit in which files.

Original comment by rOO...@gmail.com on 4 Mar 2008 at 1:15

[GoogleCodeExporter]

I'm having this same problem, would be nice if it was fixed...

Original comment by makela....@gmail.com on 15 Mar 2008 at 5:23

[GoogleCodeExporter]

[deleted comment]

[GoogleCodeExporter]

[deleted comment]

[GoogleCodeExporter]

Alright just some foreword I'm not a linux/unix expert nor do I claim to be but 
from
reading this is what worked for me and from reading what you are suppose to do.

"+" denotes lines that are supposed to be added

so you need to add these lines in the correct places in your loader/Makefile (i 
put
rm -f registercodec under "clean::" though since I had no distclean::)

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

rm -f registercodec

also make sure you have a fresh mplayer source and do a "./configure
--disable-mencoder" otherwise you will probably run in to issue 21

I have attached my patched loader/Makefile from MPlayer dev-SVN-r26258-4.1.2

Original comment by astadt...@gmail.com on 17 Mar 2008 at 12:27

Attachments:

• Makefile

[GoogleCodeExporter]

That worked like a charm for me. Still working on getting mplayer to use 
CoreAVC but
at least it patched and compiled. Thanks!

Original comment by bwagnerm...@gmail.com on 11 Apr 2008 at 2:44

[GoogleCodeExporter]

fixed in r36

Original comment by alannis...@gmail.com on 7 May 2008 at 2:49

• Changed state: Fixed