* Fix x264 compilation on Darwin

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9d2ace1015e7643ba8bed4b7f675eb1f086c7cf3..65fee4d7fca19d89af00eefd8d6f3d19f442fb0f 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1159,9 +1159,6 @@ x264:
        $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
 ifdef HAVE_WIN32
        (cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
-else
-       patch -p 0 < Patches/x264_svn.patch
-       rm x264/x264.c
 endif
 else
 x264-$(X264_VERSION).tar.gz:

diff --git a/extras/contrib/src/Patches/x264_svn.patch b/extras/contrib/src/Patches/x264_svn.patch
deleted file mode 100644 (file)
index a76db6b..0000000
--- a/extras/contrib/src/Patches/x264_svn.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: x264/Makefile
-===================================================================
---- x264/Makefile      (revision 381)
-+++ x264/Makefile      (working copy)
-@@ -60,7 +60,7 @@
- DEP  = depend
- 
- .PHONY: default fprofiled clean distclean install uninstall
--default: $(DEP) x264$(EXE)
-+default: $(DEP) libx264.a
- 
- libx264.a: .depend $(OBJS) $(OBJASM)
-       ar rc libx264.a $(OBJS) $(OBJASM)
-@@ -128,13 +128,12 @@
- distclean: clean
-       rm -f config.mak vfw/build/cygwin/config.mak x264.pc
- 
--install: x264
-+install: libx264.a
-       install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-       install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
-       install -m 644 x264.h $(DESTDIR)$(includedir)
-       install -m 644 libx264.a $(DESTDIR)$(libdir)
-       install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
--      install x264 $(DESTDIR)$(bindir)
-       ranlib $(DESTDIR)$(libdir)/libx264.a
- 
- uninstall: