[vlc-commits] commit: Contribs: remove unneeded patch (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan  9 20:14:59 2011 +0100| [fd9eb658eaebbf85f7a137cd25cc899c90c4d729] | committer: Jean-Baptiste Kempf 

Contribs: remove unneeded patch

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

 extras/contrib/src/Patches/x264-svn-win32.patch |   36 -----------------------
 extras/contrib/src/contrib-src.mak              |    3 --
 2 files changed, 0 insertions(+), 39 deletions(-)

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
deleted file mode 100644
index 30249f1..0000000
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure	2008-04-06 09:07:25.000000000 +0200
-+++ configure	2008-04-06 09:10:52.000000000 +0200
-@@ -516,6 +516,7 @@
- # autodetect options that weren't forced nor disabled
- 
- libpthread=""
-+extradef=""
- if test "$pthread" = "auto" ; then
-     pthread="no"
-     case $SYS in
-@@ -523,13 +524,13 @@
-             pthread="yes"
-             ;;
-         MINGW)
--            if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then
-+            if cc_check pthread.h -lpthread "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
-                 pthread="yes"
-                 libpthread="-lpthread"
--            elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then
-+            elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0); pthread_num_processors_np(); " ; then
-                 pthread="yes"
-                 libpthread="-lpthreadGC2"
--            elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then
-+            elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
-                 pthread="yes"
-                 libpthread="-lpthreadGC2 -lwsock32"
-                 define PTW32_STATIC_LIB
-@@ -807,7 +808,7 @@
- Description: H.264 (MPEG4 AVC) encoder library
- Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
- Libs: $pclibs
--Cflags: -I$includedir
-+Cflags: -I$includedir $extradef
- EOF
- 
- filters="crop select_every"
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 3db90a5..02a523c 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1448,9 +1448,6 @@ x264-$(X264_VERSION).tar.gz:
 ifdef GIT
 x264:
 	$(GIT) clone git://git.videolan.org/x264.git
-ifdef HAVE_WIN32
-	(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
-endif
 ifdef HAVE_WIN64
 	(cd x264; patch -p0 < ../Patches/x264-svn-win64.patch )
 endif