x264 moved to Git.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 12d032e59aa3ec9f11639bad61732068c5b8aac3..9c1d68a2d17423d3a5338fe0d7cdcec8f508fae1 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -132,7 +132,7 @@ endif
 FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
-FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscale
 endif
 
 ifdef HAVE_BEOS
@@ -441,7 +441,7 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
        patch -p0 < Patches/fontconfig.patch
        patch -p0 < Patches/fontconfig-nodocs.patch
 
-.fontconfig: fontconfig
+.fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
        (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
@@ -450,7 +450,7 @@ ifdef HAVE_WIN32
   endif
 else
   ifdef HAVE_DARWIN_OS
-       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data))
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
   else
        (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
@@ -573,6 +573,24 @@ CLEAN_FILE += .id3tag
 CLEAN_PKG += libid3tag
 DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz
 
+# ***************************************************************************
+# pcre
+# ***************************************************************************
+
+pcre-$(PCRE_VERSION).tar.bz2:
+       $(WGET) $(PCRE_URL)
+
+pcre: pcre-$(PCRE_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.pcre: pcre
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install )
+       touch $@
+
+CLEAN_FILE += .pcre
+CLEAN_PKG += pcre
+DISTCLEAN_PKG += pcre-$(PCRE_VERSION).tar.bz2
+
 # ***************************************************************************
 # lua
 # ***************************************************************************
@@ -1320,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
@@ -2305,13 +2336,17 @@ 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)
+       patch -p0 < Patches/asa-git.diff
 
-.asa: asa
-       (cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+.asa: asa .fontconfig .pcre .iconv
+       (cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
+       (cd $</lib/import; echo "Please copy a ./prepare file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building on Windows, press enter." ; read i ; make)
+       (cd $<; make && make install)
+       $(INSTALL_NAME)
        touch $@
 
 CLEAN_FILE += .asa