contribs/ffmpeg: fixed compilation on PPC-based Macs, removed old patch

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f35bcb428099ab21243bdb5898a1888b2840bec8..b0eacf0e70169f204a24db95950224c7400619de 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1007,18 +1007,13 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-       $(SVN) co $(FFMPEG_SVN) ffmpeg
+       $(SVN) co $(FFMPEG_SVN) ffmpeg -r 19836
 ifdef HAVE_ISA_THUMB
        patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif
 ifdef HAVE_WINCE
        patch -p1 < Patches/ffmpeg-svn-wince.patch
 endif
-ifdef HAVE_DARWIN_OS
-ifndef HAVE_DARWIN_OS_ON_INTEL
-       (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch)
-endif
-endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch

diff --git a/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch b/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
deleted file mode 100644 (file)
index 09efa46..0000000
--- a/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure
-===================================================================
---- configure  (révision 19634)
-+++ configure  (copie de travail)
-@@ -1873,8 +1873,6 @@
-         FFSERVERLDFLAGS=-Wl,-bind_at_load
-         objformat="macho"
-         enabled x86_64 && objformat="macho64"
--        enabled shared ||
--            { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
-         ;;
-     mingw32*)
-         if test $target_os = "mingw32ce"; then