[Ffmpeg-devel] Patch error

[Yannick Prié]

While trying to build libraries for VLC on Mac OS 10.4 :

echo :pserver:anonymous at mplayerhq.hu:/cvsroot/ffmpeg A > ./ffmpeg.cvs
CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d :pserver:anonymous at mplayerhq.hu:/ 
cvsroot/ffmpeg co ffmpeg
cvs checkout: Updating ffmpeg
U ffmpeg/.cvsignore
U ffmpeg/COPYING
U ffmpeg/CREDITS
U ffmpeg/Changelog
U ffmpeg/Doxyfile
U ffmpeg/INSTALL
U ffmpeg/Makefile

...

cvs checkout: Updating ffmpeg/vhook
U ffmpeg/vhook/Makefile
U ffmpeg/vhook/drawtext.c
U ffmpeg/vhook/fish.c
U ffmpeg/vhook/imlib2.c
U ffmpeg/vhook/null.c
U ffmpeg/vhook/ppm.c
U ffmpeg/vhook/watermark.c
patch -p 0 < Patches/ffmpeg.patch.cvs
patching file ffmpeg/configure
Hunk #1 succeeded at 254 (offset 42 lines).
Hunk #2 succeeded at 448 with fuzz 2 (offset 61 lines).
Hunk #3 succeeded at 867 (offset 127 lines).
Hunk #4 FAILED at 997.
Hunk #5 succeeded at 1008 (offset 127 lines).
1 out of 5 hunks FAILED -- saving rejects to file ffmpeg/configure.rej
patching file ffmpeg/libavcodec/eval.c
patching file ffmpeg/libavformat/tcp.c
make[1]: *** [ffmpeg] Error 1
make: *** [src] Error 2



Content of configure.rej :

***************
*** 985,990 ****
   EOF

   have_lrintf="no"
   if $cc $extralibs -o $TMPE $TMPC 2> /dev/null ; then
     have_lrintf="yes"
     # allanc at chickenandporn.com: cannot execute cross-compiled
--- 997,1005 ----
   EOF

   have_lrintf="no"
+ # BeOS doesn't have lrintf, make sure it is not enabled when
+ # cross-compiling
+ if test "${cross_prefix}" != "i586-pc-beos-"; then
   if $cc $extralibs -o $TMPE $TMPC 2> /dev/null ; then
     have_lrintf="yes"
     # allanc at chickenandporn.com: cannot execute cross-compiled