[vlc-devel] commit: contrib/x264: removed no-longer needed patch ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Tue Oct 27 18:44:19 2009 +0100| [988bdbd0754aa9f15851da4a72096f2845add46c] | committer: Felix Paul Kühne 

contrib/x264: removed no-longer needed patch

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

 extras/contrib/src/Makefile                      |    3 --
 extras/contrib/src/Patches/x264-svn-darwin.patch |   27 ----------------------
 2 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 512a663..acc8106 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1392,9 +1392,6 @@ x264:
 ifdef HAVE_WIN32
 	(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
-ifdef HAVE_DARWIN_OS
-	(cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch )
-endif
 
 else
 
diff --git a/extras/contrib/src/Patches/x264-svn-darwin.patch b/extras/contrib/src/Patches/x264-svn-darwin.patch
deleted file mode 100644
index b40de08..0000000
--- a/extras/contrib/src/Patches/x264-svn-darwin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 715)
-+++ configure	(working copy)
-@@ -396,7 +396,7 @@
-     CFLAGS="$CFLAGS -fPIC"
-     ASFLAGS="$ASFLAGS -D__PIC__"
-     # resolve textrels in the x86 asm
--    cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
-+    cc_check stdio.h -Wl && LDFLAGS="$LDFLAGS -Wl"
- fi
- 
- if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-
-Index: common/common.h
-===================================================================
---- common/common.h	(revision 701)
-+++ common/common.h	(working copy)
-@@ -67,7 +67,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
--#include "x264.h"
-+#include "../x264.h"
- #include "bs.h"
- #include "set.h"
- #include "predict.h"