X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=54eef6a15f354f02d3d3decd6f5d335b59b0a7f4;hb=832ce82dac31f15dca7b734c7df7c943ea652bd6;hp=2bb2cf113a3b96331900fa35b89a88cb1bfb46bf;hpb=5ecef9fc2f16566bd4268e56e531ac705174435f;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 2bb2cf113a..54eef6a15f 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1,13 +1,13 @@ #*************************************************************************** # src/Makefile : Dearchive and compile all files necessary # *************************************************************************** -# Copyright (C) 2003 - 2008 the VideoLAN team +# Copyright (C) 2003 - 2009 the VideoLAN team # $Id$ # # Authors: Christophe Massiot # Derk-Jan Hartman # Eric Petit -# Felix Paul Kühne +# Felix Paul Kühne # Christophe Mutricy # Gildas Bazin # Damien Fouilleul @@ -44,6 +44,11 @@ export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS) +ifdef HAVE_DARWIN_OS +export CC +export CXX +export LD +endif # *************************************************************************** # Cross compilation variables @@ -54,6 +59,7 @@ export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS) ifneq ($(CC),) HOSTCC+= CC="$(CC)" +FFMPEGCONF += --cc=$(CC) endif ifneq ($(CXX),) HOSTCC+= CXX="$(CXX)" @@ -84,14 +90,9 @@ else HOSTCC2=$(HOSTCC) endif -# For ffmpeg if not cross compiling -ifneq ($(CC),) - FFMPEGCONF=--cc="$(CC)" -endif +FFMPEGCONF= -# # cross compiling -# #This should be inside the if block but some config scripts are buggy HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix="" ifneq ($(BUILD),$(HOST)) @@ -101,7 +102,7 @@ ifneq ($(BUILD),$(HOST)) # ifndef HAVE_CYGWIN # We are REALLY cross compiling - FFMPEGCONF=--cross-prefix=$(HOST)- --enable-cross-compile + FFMPEGCONF+=--cross-prefix=$(HOST)- --enable-cross-compile X264CONF=--host=$(HOST) PTHREADSCONF="CROSS=$(HOST)-" else @@ -132,7 +133,7 @@ endif FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99 else -FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-swscale +FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-libgsm endif ifdef HAVE_BEOS @@ -140,19 +141,18 @@ FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos endif ifdef HAVE_DARWIN_OS_ON_INTEL -FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m -endif - -ifdef NO_TEXT_RELOCATION -FFMPEGCONF += --disable-mmx +FFMPEGCONF += --enable-memalign-hack endif ifdef HAVE_DARWIN_OS X264CONF += --enable-pic +FFMPEGCONF += --cc=$(CC) +FFMPEGCONF += --arch=$(ARCH) +ifdef HAVE_DARWIN_10 +FFMPEGCONF += --cpu=core2 +endif ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF -else -FFMPEGCONF += --disable-altivec endif endif @@ -166,7 +166,7 @@ DATE=`date +%Y-%m-%d` # Standard rules # *************************************************************************** # Generated by ./bootstrap from default configuration in src/Distributions -# +# include ../distro.mak FORCE: @@ -177,14 +177,14 @@ FORCE: define EXTRACT_GZ rm -rf $@ || true - gunzip -c $< | tar xf - --exclude='[*?:<>\|]' + gunzip -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true touch $@ endef define EXTRACT_BZ2 rm -rf $@ || true - bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' + bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.bz2,%,$(notdir $<)) $@ || true touch $@ endef @@ -289,7 +289,7 @@ cmake-$(CMAKE_VERSION).tar.gz: cmake: cmake-$(CMAKE_VERSION).tar.gz $(EXTRACT_GZ) - + #cmake: # cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake @@ -369,9 +369,10 @@ pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz $(EXTRACT_GZ) patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch patch -d pkgconfig -p0 < Patches/pkgcfg.patch + (cd $@; autoconf) .pkgcfg: pkgconfig - (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) + (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) touch $@ CLEAN_FILE += .pkgcfg @@ -467,19 +468,20 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch $(EXTRACT_GZ) patch -p0 < Patches/fontconfig.patch patch -p0 < Patches/fontconfig-nodocs.patch + (cd $@; autoreconf) .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 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) + (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) else - (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) + (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) 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-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/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)) + (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/usr/X11/var/cache/fontconfig --with-confdir=/usr/X11/lib/X11/fonts --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --with-arch=$(ARCH) --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) + (cd $<; $(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 endif $(INSTALL_NAME) @@ -522,9 +524,10 @@ fribidi-$(FRIBIDI_VERSION).tar.gz: fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/fribidi.patch + ( cd $@; rm -f configure; ./bootstrap) .fribidi: fribidi .iconv - (cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -651,7 +654,7 @@ ifdef HAVE_WIN32 ( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;) (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a) (cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig) -else +else (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX)) endif touch $@ @@ -669,6 +672,9 @@ libmad-$(LIBMAD_VERSION).tar.gz: libmad: libmad-$(LIBMAD_VERSION).tar.gz $(EXTRACT_GZ) +ifdef HAVE_DARWIN_OS + ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig configure ) +endif .mad: libmad (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install) @@ -723,12 +729,10 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz patch -d libvorbis -p0 < Patches/libvorbis-r14598-CVE-2008-1420.patch patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1419.patch patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1423.patch - (cd $@; autoconf) + (cd $@; sh autogen.sh) .vorbis: libvorbis .ogg -# FIXME: shared libs disabled for now because of linking errors -# -- titer 2005/09/16 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) # $(INSTALL_NAME) touch $@ @@ -745,7 +749,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz # *************************************************************************** ifdef SVN -tremor: +tremor: $(SVN) co http://svn.xiph.org/trunk/Tremor tremor (cd $@ && patch -p0 < ../Patches/tremor.patch) (cd $@; rm -f ogg.h && echo "#include " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) @@ -786,17 +790,25 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/theora.patch patch -p0 < Patches/libtheora-includes.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/theora-doc.patch +endif (cd $@; autoconf) +THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples +ifdef HAVE_WIN32 +THEORACONF += --disable-docs +endif + +ifdef HAVE_DARWIN_10 +THEORACONF += --disable-asm +endif + .theora: libtheora .ogg ifdef HAVE_BEOS - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install) else - ifdef NO_TEXT_RELOCATION - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) - else - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install) - endif + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install) endif $(INSTALL_NAME) touch $@ @@ -818,7 +830,7 @@ ifdef HAVE_WIN32 patch -p0 < Patches/libshout-win32.patch (cd $@; autoreconf && automake) endif - + .shout: libshout .theora .ogg .speex .vorbis (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install ) $(INSTALL_NAME) @@ -843,7 +855,7 @@ endif FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs -.flac: flac .ogg +.flac: flac .ogg ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) else @@ -896,7 +908,7 @@ faad2-$(FAAD2_VERSION).tar.gz: faad2: faad2-$(FAAD2_VERSION).tar.gz $(EXTRACT_GZ) - (cd $@; ./bootstrap) + (cd $@; sh ./bootstrap) .faad: faad2 (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install) @@ -933,7 +945,6 @@ lame-$(LAME_VERSION).tar.gz: lame: lame-$(LAME_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/libmp3lame-mingw32.patch .lame: lame (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) @@ -958,7 +969,6 @@ libebml-$(LIBEBML_VERSION).tar.bz2: libebml: libebml-$(LIBEBML_VERSION).tar.bz2 $(EXTRACT_BZ2) #endif - ifdef HAVE_WIN32 (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch) endif @@ -969,13 +979,13 @@ ifdef HAVE_WIN32 else (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) $(RANLIB) $(PREFIX)/lib/libebml.a -endif +endif touch $@ ## No reasons to use SVN anymore #ifdef SVN #libebml-source: libebml # tar cfvz libebml-$(DATE).tar.gz libebml -#SOURCE += libebml-source +#SOURCE += libebml-source #endif CLEAN_FILE += .ebml @@ -996,8 +1006,8 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: #else libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) -#endif - +#endif + patch -p0 < ./Patches/libmatroska-kaxblock.patch ifdef HAVE_WIN32 (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch) endif @@ -1079,19 +1089,21 @@ ifdef HAVE_BEOS endif ifdef HAVE_DARWIN_OS_ON_INTEL (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) -endif -ifdef HAVE_DARWIN_OS - (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch) - (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-libswscale-head.patch) -endif -ifdef NO_TEXT_RELOCATION - (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch) +else + (cd $@; patch -p0 < ../Patches/ffmpeg-swscale-ppc.patch) endif ifdef HAVE_UCLIBC patch -p0 < Patches/ffmpeg-svn-uclibc.patch patch -p0 < Patches/ffmpeg-svn-internal-define.patch patch -p0 < Patches/ffmpeg-svn-libavformat.patch endif +ifdef HAVE_WIN32 + (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch) +endif +ifdef NO_TEXT_RELOCATION + echo "Broken LD. Fix your tools." + exit -1 +endif else ffmpeg-$(FFMPEG_VERSION).tar.gz: echo "ffmpeg snapshot is too old, you MUST use subversion !" @@ -1102,17 +1114,21 @@ 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 +ifdef HAVE_WIN32 +FFMPEGCONF += --disable-bzlib --disable-decoder=dca +endif + ifdef HAVE_WINCE .ffmpeg: ffmpeg .zlib else ifdef HAVE_UCLIBC .ffmpeg: ffmpeg else -.ffmpeg: ffmpeg .faac .lame +.ffmpeg: ffmpeg .faac .lame .gsm endif endif - - (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --disable-filters --disable-shared --enable-static && make && make install-libs install-headers) + (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers) touch $@ ifdef SVN @@ -1134,7 +1150,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: $(WGET) $(LIBDVDCSS_URL) ifdef SVN -libdvdcss: +libdvdcss: $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss cd $@ && sh bootstrap else @@ -1164,7 +1180,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # .dvdread: .dvdnav # $(INSTALL_NAME) # touch $@ -# +# # CLEAN_FILE += .dvdread # *************************************************************************** @@ -1172,7 +1188,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** -libdvdread: +libdvdread: $(SVN) co $(LIBDVDREAD_SVN) libdvdread (cd $@; patch -p 0 < ../Patches/libdvdread.patch) ifdef HAVE_WIN32 @@ -1212,7 +1228,7 @@ endif endif .dvdnav: libdvdnav .libdvdread -ifdef HAVE_WIN32 +ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install) @@ -1256,11 +1272,11 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz patch -p0 < Patches/live-uselocale.patch .live: live -ifdef HAVE_WIN32 - (cd $<;./genMakefiles mingw && make $(HOSTCC)) -else +ifdef HAVE_WIN32 + (cd $<;./genMakefiles mingw && make $(HOSTCC)) +else ifdef HAVE_DARWIN_OS - (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx) + (cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -i.orig config.macosx) (cd $<; ./genMakefiles macosx && make) else (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head) @@ -1304,8 +1320,11 @@ ifdef HAVE_WIN32 (cd $@; dos2unix configure.in) patch -p0 < Patches/goom2k4-0-win32.patch else +ifndef HAVE_DARWIN_OS patch -p0 < Patches/goom2k4-0-mmx.patch endif +endif + patch -p0 < Patches/goom2k4-0-memleaks.patch .goom2k4: goom ifdef HAVE_DARWIN_OS @@ -1335,6 +1354,8 @@ ifdef HAVE_DARWIN_OS ifndef HAVE_DARWIN_OS_ON_INTEL patch -p0 < Patches/caca-osx-ppc.patch endif + patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch + (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig configure) endif .caca: libcaca @@ -1358,6 +1379,9 @@ libdca-$(LIBDCA_VERSION).tar.bz2: libdca: libdca-$(LIBDCA_VERSION).tar.bz2 $(EXTRACT_BZ2) +ifdef HAVE_DARWIN_9 + ( cd $@; patch -p0 < ../Patches/libdca-llvm-gcc.patch ) +endif .dca: libdca (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) @@ -1405,10 +1429,10 @@ ifdef HAVE_WIN32 ifdef HAVE_CYGWIN (cd $<; $(HOSTCC) RANLIB="ranlib" AR="ar" STRIP="strip" ./configure $(X264CONF) --prefix="$(PREFIX)" --extra-cflags="-I$(PREFIX)/include" --extra-ldflags="-L$(PREFIX)/lib" && make && make install) else - (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pthread && make && make install) endif else -ifdef HAVE_DARWIN_OS_ON_INTEL +ifdef HAVE_DARWIN_OS .x264: x264 .yasm (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) else @@ -1438,8 +1462,10 @@ libmodplug-$(MODPLUG_VERSION).tar.gz: libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz $(EXTRACT_GZ) + patch -p0 < Patches/libmodplug-gccllvm42.patch ifdef HAVE_WIN32 patch -p0 < Patches/libmodplug-win32.patch + (cd $@; autoreconf) endif .mod: libmodplug @@ -1502,6 +1528,9 @@ libcdio-$(CDIO_VERSION).tar.gz: libcdio: libcdio-$(CDIO_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/libcdio-install-cdparanoia-pc.patch +ifdef HAVE_DARWIN_OS + patch -p0 < Patches/libcdio-modernOSX.patch +endif .cdio: libcdio (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && autoreconf -fisv && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install) @@ -1581,7 +1610,7 @@ Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe cp -r Qt/src/corelib Qt/src/gui $(PREFIX)/include/qt4/src cp Qt/lib/libQtCore4.a Qt/lib/libQtGui4.a $(PREFIX)/lib cp Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig - cp Qt/translations/* $(PREFIX)/share/qt4/translations + cp Qt/translations/* $(PREFIX)/share/qt4/translations touch $@ CLEAN_FILE += .Qt_win32 @@ -1627,7 +1656,7 @@ CLEAN_PKG += zlib DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz # *************************************************************************** -# PortAudio +# PortAudio # *************************************************************************** pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz: @@ -1639,7 +1668,7 @@ ifneq ($(HOST),$(BUILD)) (patch -p0 < Patches/portaudio-cross.patch;cd $@; autoconf) endif -.portaudio: portaudio +.portaudio: portaudio (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -1657,22 +1686,17 @@ libxml2-$(XML_VERSION).tar.gz: xml: libxml2-$(XML_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WIN32 - patch -p0 < Patches/xml2-win32.patch - rm -f xml/aclocal.m4 -endif ifdef HAVE_UCLIBC patch -p0 < Patches/xml2-uclibc.patch endif +XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp --without-debug --without-docbook --without-regexps --without-python + .xml: xml -ifdef HAVE_WIN32 - (cd xml; aclocal && automake && autoreconf) -endif ifdef HAVE_CYGWIN - (cd xml; ac_cv_header_pthread_h="no" CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp --without-debug --without-docbook --without-regexps && make && make install) + (cd xml; ac_cv_header_pthread_h="no" CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(XMLCONF) && make && make install) else - (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp --without-debug --without-docbook --without-regexps && make && make install) + (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(XMLCONF) && make && make install) endif ifndef HAVE_DARWIN_OS $(INSTALL_NAME) @@ -1695,11 +1719,11 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz ifdef HAVE_BEOS patch -p0 < Patches/twolame-BeOS.patch endif - -.twolame: twolame ifdef HAVE_WIN32 (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h") -endif +endif + +.twolame: twolame (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame && make && make install) $(INSTALL_NAME) touch $@ @@ -1757,6 +1781,9 @@ zvbi-$(ZVBI_VERSION).tar.bz2: zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 $(EXTRACT_BZ2) +ifdef HAVE_WIN32 + (cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf) +endif ifdef HAVE_WIN32 .zvbi: zvbi .pthreads @@ -1766,7 +1793,11 @@ endif ifdef HAVE_DARWIN_OS (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install) else - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) +ifdef HAVE_WIN32 + (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install) +else + (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install) +endif endif $(INSTALL_NAME) touch $@ @@ -1801,7 +1832,7 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) install) # sed 's/^typedef u_int8_t byte_t;/\/* typedef u_int8_t byte_t;\*\//' touch $@ - + CLEAN_FILE += .raw1394 CLEAN_PKG += libraw1394 DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz @@ -1833,13 +1864,13 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz patch -p1 < ../Patches/libdc1394-noexamples.patch && \ make && make DESTDIR=$(PREFIX) install) touch $@ - + CLEAN_FILE += .dc1394 CLEAN_PKG += libdc1394 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz # *************************************************************************** -# gpg-error +# gpg-error # *************************************************************************** libgpg-error-$(GPGERROR_VERSION).tar.bz2: @@ -1871,11 +1902,11 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/gcrypt.patch -CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa +CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa .gcrypt: libgcrypt .gpg-error ifdef HAVE_WIN32 - (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install) + (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install) endif @@ -1893,7 +1924,7 @@ DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.bz2 opencdk-$(OPENCDK_VERSION).tar.bz2: $(WGET) $(OPENCDK_URL) -opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2 +opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2 $(EXTRACT_BZ2) .opencdk: opencdk @@ -1916,13 +1947,14 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 ifdef HAVE_WIN32 patch -p0 < Patches/gnutls-win32.patch (cd $@; cd lgl; ln -sf alloca_.h alloca.h;) + (cd $@; autoconf) endif -.gnutls: gnutls .opencdk .gcrypt .gpg-error +.gnutls: gnutls .gcrypt .gpg-error ifdef HAVE_WIN32 - (cd $<; autoconf && $(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 lgl && make && cd ../gl && make && cd ../lib &&make && make install && cd ../includes && make install) else - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-included-opencdk --disable-guile && make && make install) endif $(INSTALL_NAME) touch $@ @@ -2060,7 +2092,7 @@ DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2 jpeg-$(JPEG_VERSION).tar.gz: $(WGET) $(JPEG_URL) -jpeg: jpeg-$(JPEG_VERSION).tar.gz +jpeg: jpeg-$(JPEG_VERSION).tar.gz $(EXTRACT_GZ) .jpeg: jpeg @@ -2079,7 +2111,7 @@ DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz tiff-$(TIFF_VERSION).tar.gz: $(WGET) $(TIFF_URL) -tiff: tiff-$(TIFF_VERSION).tar.gz +tiff: tiff-$(TIFF_VERSION).tar.gz $(EXTRACT_GZ) .tiff: tiff @@ -2096,14 +2128,20 @@ CLEAN_PKG += tiff DISTCLEAN_PKG += tiff-$(TIFF_VERSION).tar.gz # *************************************************************************** -# SDL +# LibSDL # *************************************************************************** +ifndef HAVE_DARWIN_OS SDL-$(SDL_VERSION).tar.gz: $(WGET) $(SDL_URL) -SDL: SDL-$(SDL_VERSION).tar.gz +SDL: SDL-$(SDL_VERSION).tar.gz $(EXTRACT_GZ) +else +SDL: + $(SVN) co http://svn.libsdl.org/trunk/SDL -r 4444 SDL + (cd $@; sh autogen.sh) +endif .SDL: SDL (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --enable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install) @@ -2121,7 +2159,7 @@ DISTCLEAN_PKG += SDL-$(SDL_VERSION).tar.gz SDL_image-$(SDL_IMAGE_VERSION).tar.gz: $(WGET) $(SDL_IMAGE_URL) -SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz +SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/SDL_image.patch patch -p0 < Patches/SDL_image-CVE-2006-4484.patch @@ -2142,13 +2180,13 @@ DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz libmpcdec-$(MUSE_VERSION).tar.bz2: $(WGET) $(MUSE_URL) -mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 +mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/mpcdec.patch (cd $@; autoreconf) .mpcdec: mpcdec -ifdef HAVE_WIN32 +ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS=-D_PTRDIFF_T=mpc_int32_t && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) @@ -2171,12 +2209,15 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) - patch -p1 -d dirac