]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Compile all the twolame packages so we can get the .pc
[vlc] / extras / contrib / src / Makefile
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 676910b9c9cb4e5aaff8dcd874a63d759ba73e23..cc16ace60453de3b5bfe06b98d06164247d0c9c8 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -145,6 +145,7 @@ FFMPEGCONF += --enable-memalign-hack
 endif
 
 ifdef HAVE_DARWIN_OS
+X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
 FFMPEGCONF += --cc=$(CC)
 FFMPEGCONF += --arch=$(ARCH)
@@ -474,15 +475,16 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
        patch -p0 < Patches/fontconfig-nodocs.patch
 ifdef HAVE_WIN32
        patch -p0 < Patches/fontconfig.patch
+       patch -p0 < Patches/fontconfig-noxml2.patch
 endif
        (cd $@; autoreconf -ivf)
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-       (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<;  ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
+       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 --disable-docs && make && make install)
   endif
 else
   ifdef HAVE_DARWIN_OS
@@ -655,6 +657,9 @@ lua-$(LUA_VERSION).tar.gz:
 
 lua: lua-$(LUA_VERSION).tar.gz
        $(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
+       (cd $@; sed -e 's%gcc%$(CC)%' -e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  src/Makefile)
+endif
 
 .lua: lua
 ifdef HAVE_WIN32
@@ -791,7 +796,11 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
+ifndef HAVE_DARWIN_OS
        patch -p0 < Patches/theora.patch
+else
+       patch -p0 < Patches/theora_mac.patch
+endif
        patch -p0 < Patches/libtheora-includes.patch
 ifdef HAVE_WIN32
        patch -p0 < Patches/theora-doc.patch
@@ -1088,7 +1097,7 @@ ifdef NO_TEXT_RELOCATION
        echo "Broken LD. Fix your tools."
        exit -1
 endif
-       patch -p0 < Patches/eac3_spectral.patch
+       (cd $@; patch -p1 < ../Patches/eac3_spectral.patch)
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1685,7 +1694,7 @@ ifdef HAVE_WIN32
 endif
 
 .twolame: twolame
-       (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install)
+       (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -1755,7 +1764,7 @@ ifdef HAVE_DARWIN_OS
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
 else
 ifdef HAVE_WIN32
-       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install)
+       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -DPTW32_STATIC_LIB --std=gnu99"  && make && make install)
 else
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install)
 endif
@@ -1907,13 +1916,12 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
        patch -p0 < Patches/gnutls-win32.patch
-       (cd $@; cd lgl; ln -sf alloca_.h alloca.h;)
-       (cd $@; autoconf)
+       (cd $@; autoreconf)
 endif
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls   --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls --with-included-opencdk --with-included-libtasn1 &&  cd gl && make && cd ../lib && make && make install )
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-included-opencdk --disable-guile && make && make install)
 endif
@@ -1954,6 +1962,9 @@ glib-$(GLIB_VERSION).tar.bz2:
 glib: glib-$(GLIB_VERSION).tar.bz2
        $(EXTRACT_BZ2)
        (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
+ifdef HAVE_DARWIN_10
+       (cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
+endif
 
 .glib: glib
        (cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install)
@@ -1985,11 +1996,11 @@ DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
 # Gecko SDK
 # ***************************************************************************
 
-gecko-sdk-i386-10.4u-1.9.0.11.tar.bz2:
+gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz:
        $(WGET) $(GECKO_SDK_MAC_URL)
 
-gecko-sdk: gecko-sdk-i386-10.4u-1.9.0.11.tar.bz2
-       $(EXTRACT_BZ2)
+gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
+       $(EXTRACT_GZ)
 
 .gecko: gecko-sdk
        rm -rf ../gecko-sdk
@@ -2000,7 +2011,7 @@ gecko-sdk: gecko-sdk-i386-10.4u-1.9.0.11.tar.bz2
 
 CLEAN_FILE += .gecko
 CLEAN_PKG += gecko-sdk
-DISTCLEAN_PKG += gecko-sdk-i386-10.4u-1.9.0.11.tar.bz2
+DISTCLEAN_PKG += gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
 
 # ***************************************************************************
 # Gecko SDK win32
@@ -2411,28 +2422,6 @@ CLEAN_FILE += .ncurses
 CLEAN_PKG += ncurses
 DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
-# ***************************************************************************
-# asa library (ASS/SSA support)
-# ***************************************************************************
-
-asa.git.tar.gz:
-       $(WGET) $(ASA_URL)
-
-asa: asa.git.tar.gz
-       $(EXTRACT_GZ)
-       patch -p0 < Patches/asa-git.diff
-
-.asa: asa .fontconfig .pcre .iconv
-       (cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
-       (cd $</lib/import; make || (echo "Please copy a ./preparse file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
-       (cd $<; make && make install)
-       $(INSTALL_NAME)
-       touch $@
-
-CLEAN_FILE += .asa
-CLEAN_PKG += asa
-DISTCLEAN_PKG += asa.git.tar.gz
-
 # ***************************************************************************
 # FluidSynth library (Midi)
 # ***************************************************************************
@@ -2440,7 +2429,6 @@ DISTCLEAN_PKG += asa.git.tar.gz
 fluidsynth-$(FLUID_VERSION).tar.gz:
        $(WGET) $(FLUID_URL)
 
-
 fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
@@ -2511,23 +2499,41 @@ DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 libass-$(ASS_VERSION).tar.bz2:
        $(WGET) $(ASS_URL)
 
-# mplayer patches up to August 8, 2008 are included
-libass: libass-$(ASS_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-       (cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch)
-ifneq ($(HOST),$(BUILD))
-       patch -p0 < Patches/libass-cross.patch
+libass:
+       $(GIT) clone $(ASS_GIT)
        (cd $@; autoreconf -ivf)
-endif
 
-.libass: libass .png
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+.libass: libass
+       (cd $<; $(HOSTCC) ./configure --disable-png $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .libass
 CLEAN_PKG += libass
 DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
 
+# ***************************************************************************
+# Sparkle
+# ***************************************************************************
+
+"Sparkle\ $(SPARKLE_VERSION).zip":
+       $(WGET) $(SPARKLE_URL)
+
+Sparkle: "Sparkle\ $(SPARKLE_VERSION).zip"
+       rm -rf $@ || true
+       unzip $<
+       touch $@
+
+.Sparkle: Sparkle
+       rm -rf ../Sparkle
+       mv Sparkle ..
+       mkdir Sparkle
+       (cd $<)
+       touch $@
+
+CLEAN_FILE += .Sparkle
+CLEAN_PKG += Sparkle
+DISTCLEAN_PKG += Sparkle%20$(SPARKLE_VERSION).zip
+
 # ***************************************************************************
 # UPNP library
 # ***************************************************************************
@@ -2559,6 +2565,9 @@ gsm: gsm-$(GSM_VERSION).tar.gz
 ifneq ($(HOST),$(BUILD))
        (patch -p0 < Patches/gsm-cross.patch)
 endif
+ifdef HAVE_DARWIN_OS
+       (cd $@; sed -e 's%-O2%-O2\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%# LDFLAGS  =%LDFLAGS       = $(EXTRA_LDFLAGS)%' -e 's%gcc%$(CC)%' -i.orig  Makefile)
+endif
 
 .gsm: gsm
        (cd $<; $(HOSTCC) make && cp inc/gsm.h $(PREFIX)/include && cp lib/libgsm.a  $(PREFIX)/lib)
@@ -2584,7 +2593,7 @@ clean-src: clean
        rm -rf $(DISTCLEAN_PKG)
 
 clean-svn:
-       rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live
+       rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live libass
 
 distclean: clean-src
 
Unnamed repository; edit this file 'description' to name the repository.