x264 moved to Git.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e261dccc4220397b2f648df20bd67fb09296189f..9c1d68a2d17423d3a5338fe0d7cdcec8f508fae1 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1338,6 +1338,19 @@ DISTCLEAN_PKG += libdca-$(LIBDCA_VERSION).tar.bz2
 x264-$(X264_VERSION).tar.gz:
        $(WGET) $(X264_URL)
 
+ifdef GIT
+x264:
+       $(GIT) clone git://git.videolan.org/x264.git
+       patch -p0 < Patches/x264-svn-info-threads.patch
+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
+
 ifdef SVN
 x264: 
        $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
@@ -2323,7 +2336,7 @@ DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 # ***************************************************************************
 
 asa.git.tar.gz:
-       $(WGET) $(ASA_URL) -O $@
+       $(WGET) $(ASA_URL)
 
 asa: asa.git.tar.gz
        $(EXTRACT_GZ)