[vlc-commits] contribs: remove unneeded x264 patch for w64

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Jul  3 00:55:39 2011 -0400| [aa7b1edc03ae137237d4c1f4ad4a7b2693b74624] | committer: Rafaël Carré

contribs: remove unneeded x264 patch for w64

just don't build the cli

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa7b1edc03ae137237d4c1f4ad4a7b2693b74624
---

 contrib/src/x264/rules.mak                      |    4 +---
 contrib/src/x264/x264-svn-win64.patch           |   11 -----------
 extras/contrib/src/Patches/x264-svn-win64.patch |   11 -----------
 extras/contrib/src/contrib-src.mak              |    5 +----
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index b9997c7..0681034 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -12,6 +12,7 @@ X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
 	--enable-static \
 	--disable-avs \
 	--disable-lavf \
+	--disable-cli \
 	--disable-ffms
 ifndef HAVE_WIN32
 X264CONF += --enable-pic
@@ -40,9 +41,6 @@ X264_VERSION := git
 
 x264: x264-$(X264_VERSION).tar.xz .sum-x264
 	$(UNPACK)
-ifdef HAVE_WIN64
-	$(APPLY) $(SRC)/x264/x264-svn-win64.patch
-endif
 	$(MOVE)
 
 .x264: x264
diff --git a/contrib/src/x264/x264-svn-win64.patch b/contrib/src/x264/x264-svn-win64.patch
deleted file mode 100644
index 906f08b..0000000
--- a/contrib/src/x264/x264-svn-win64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- x264-git.orig/Makefile	2010-10-08 22:52:14.799265002 +0200
-+++ x264-git/Makefile	2010-10-08 22:55:01.549265004 +0200
-@@ -136,7 +136,7 @@
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
- 
- x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264)
--	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
-+	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS) -liberty
- 
- checkasm: tools/checkasm.o libx264.a
- 	$(CC) -o $@ $+ $(LDFLAGS)
diff --git a/extras/contrib/src/Patches/x264-svn-win64.patch b/extras/contrib/src/Patches/x264-svn-win64.patch
deleted file mode 100644
index 979651f..0000000
--- a/extras/contrib/src/Patches/x264-svn-win64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2010-10-08 22:52:14.799265002 +0200
-+++ Makefile	2010-10-08 22:55:01.549265004 +0200
-@@ -136,7 +136,7 @@
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
- 
- x264$(EXE): $(OBJCLI) libx264.a
--	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
-+	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) -liberty
- 
- checkasm: tools/checkasm.o libx264.a
- 	$(CC) -o $@ $+ $(LDFLAGS)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 35c0ec7..a717c40 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1441,7 +1441,7 @@ ifdef HAVE_LINUX
 X264CONF += --enable-pic
 endif
 
-X264CONF += --disable-avs --disable-lavf --disable-ffms --enable-static
+X264CONF += --disable-avs --disable-lavf --disable-ffms --enable-static --disable-cli
 
 x264-$(X264_VERSION).tar.gz:
 	$(WGET) $(X264_URL)
@@ -1449,9 +1449,6 @@ x264-$(X264_VERSION).tar.gz:
 ifdef GIT
 x264:
 	$(GIT) clone git://git.videolan.org/x264.git
-ifdef HAVE_WIN64
-	(cd x264; patch -p0 < ../Patches/x264-svn-win64.patch )
-endif
 else
 x264:
 	echo "x264 snapshot is too old, you MUST use Git !"