Contrib: fix liboil for Win64

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ae8f52dc4c1ac6a82db919c8265ffe14b5e3b738..b1080acd2acb767333fbbb1418fb5162e686c8c9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -116,12 +116,12 @@ endif
 #
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
-FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686 --disable-debug
+FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
 endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
+FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 endif
 
 ifdef HAVE_UCLIBC
@@ -130,14 +130,14 @@ FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 FFMPEGCONF+= --arch=armv4l
 endif
-FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
+FFMPEGCONF+= --enable-small --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
 endif
 
 ifdef HAVE_BEOS
-FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos
+FFMPEGCONF+= --cpu=x86 --disable-audio-beos
 endif
 
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -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
@@ -1092,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 !"
@@ -1103,7 +1108,16 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 endif
 
-FFMPEGCONF += --enable-gpl --enable-postproc --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network
+FFMPEGCONF += \
+       --disable-debug \
+       --enable-gpl \
+       --enable-postproc \
+       --disable-ffserver \
+       --disable-ffmpeg \
+       --disable-ffplay \
+       --disable-devices \
+       --disable-protocols \
+       --disable-network
 ifdef HAVE_WIN32
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca
 endif
@@ -1593,7 +1607,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
-       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework && make && make install)
+       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework -arch $(ARCH) && make && make install)
        touch $@
 
 CLEAN_FILE += .qt4_mac
@@ -1689,7 +1703,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 $@
 
@@ -2065,20 +2079,20 @@ DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
 # libjpeg
 # ***************************************************************************
 
-jpeg-$(JPEG_VERSION).tar.gz:
+jpegsrc.v$(JPEG_VERSION).tar.gz:
        $(WGET) $(JPEG_URL)
 
-jpeg: jpeg-$(JPEG_VERSION).tar.gz
+jpeg-7: jpegsrc.v$(JPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.jpeg: jpeg
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib)
+.jpeg: jpeg-7
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
        $(RANLIB) $(PREFIX)/lib/libjpeg.a
        touch $@
 
 CLEAN_FILE += .jpeg
-CLEAN_PKG += jpeg
-DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
+CLEAN_PKG += jpeg-7
+DISTCLEAN_PKG += jpegsrc.v$(JPEG_VERSION).tar.gz
 
 # ***************************************************************************
 # tiff
@@ -2424,7 +2438,6 @@ DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 fluidsynth-$(FLUID_VERSION).tar.gz:
        $(WGET) $(FLUID_URL)
 
-
 fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
@@ -2450,6 +2463,9 @@ liboil-$(OIL_VERSION).tar.gz:
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -d liboil -p1 < Patches/liboil-noshared.patch
+       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
+       patch -d liboil -p1 < Patches/liboil-win64.patch
+
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS
@@ -2495,32 +2511,41 @@ DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 libass-$(ASS_VERSION).tar.bz2:
        $(WGET) $(ASS_URL)
 
-ifdef GIT
 libass:
        $(GIT) clone $(ASS_GIT)
-ifneq ($(HOST),$(BUILD))
-       patch -p0 < Patches/libass-cross.patch
-endif
        (cd $@; autoreconf -ivf)
-else
-# 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
-       (cd $@; autoreconf -ivf)
-endif
-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-$(SPARKLE_VERSION).zip
+
 # ***************************************************************************
 # UPNP library
 # ***************************************************************************
@@ -2552,6 +2577,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)
@@ -2577,7 +2605,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