X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=97191d63eaa369b26d6057b9e3498fca7b85b1cf;hb=cb7f325d7b724c3a1d43cb40302ab37130624847;hp=e21cf045f105bac63f20b48334feaecd76f81b11;hpb=4a0cb62f7ab3240490733d7e4e440fd0a0af14a2;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index e21cf045f1..97191d63ea 100644 --- 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-libfaac --enable-libgsm +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,11 +145,13 @@ FFMPEGCONF += --enable-memalign-hack endif ifdef HAVE_DARWIN_OS +X264CONF=--host=$(HOST) X264CONF += --enable-pic FFMPEGCONF += --cc=$(CC) FFMPEGCONF += --arch=$(ARCH) ifdef HAVE_DARWIN_10 FFMPEGCONF += --cpu=core2 +X264CONF+=--host=x86_64-apple-darwin10 endif ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF @@ -160,6 +162,10 @@ ifdef HAVE_AMR FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree endif +ifdef HAVE_LINUX +X264CONF += --enable-pic +endif + DATE=`date +%Y-%m-%d` # *************************************************************************** @@ -466,16 +472,19 @@ fontconfig-$(FONTCONFIG_VERSION).tar.gz: fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch $(EXTRACT_GZ) - patch -p0 < Patches/fontconfig.patch patch -p0 < Patches/fontconfig-nodocs.patch - (cd $@; autoreconf) +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-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 $<; ./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-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) ./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 @@ -648,14 +657,18 @@ 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 - ( 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) + ( cd $< && sed -i.orig 's/lua luac/lua.exe/' Makefile && cd src && sed -i.orig 's/CC=/#CC=/' Makefile && sed -i 's/strip/\$(STRIP)/' 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 - (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX)) + (cd $<&& patch -p1) < Patches/lua-noreadline.patch + (cd $<&& $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX)) endif touch $@ @@ -725,11 +738,6 @@ libvorbis-$(VORBIS_VERSION).tar.gz: libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/libvorbis.patch - 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 $@; sh autogen.sh) .vorbis: libvorbis .ogg (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) @@ -788,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 @@ -803,6 +815,9 @@ endif ifdef HAVE_DARWIN_10 THEORACONF += --disable-asm endif +ifdef HAVE_WIN64 +THEORACONF += --disable-asm +endif .theora: libtheora .ogg ifdef HAVE_BEOS @@ -828,7 +843,6 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_WIN32 patch -p0 < Patches/libshout-win32.patch - (cd $@; autoreconf && automake) endif .shout: libshout .theora .ogg .speex .vorbis @@ -918,24 +932,6 @@ CLEAN_FILE += .faad CLEAN_PKG += faad2 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz -# *************************************************************************** -# faac -# *************************************************************************** - -faac-$(FAAC_VERSION).tar.gz: - $(WGET) $(FAAC_URL) - -faac: faac-$(FAAC_VERSION).tar.gz - $(EXTRACT_GZ) - -.faac: faac - (cd $<; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --without-mp4v2 --prefix=$(PREFIX) --disable-shared && make && make install) - touch $@ - -CLEAN_FILE += .faac -CLEAN_PKG += faac -DISTCLEAN_PKG += faac-$(FAAC_VERSION).tar.gz - # *************************************************************************** # lame # *************************************************************************** @@ -972,6 +968,9 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2 ifdef HAVE_WIN32 (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch) endif +ifdef HAVE_WIN64 + patch -p0 < Patches/libebml-win64.patch +endif .ebml: libebml ifdef HAVE_WIN32 @@ -1089,9 +1088,8 @@ 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 $@; patch -p0 < ../Patches/ffmpeg-swscale.patch) +else + (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) endif ifdef HAVE_UCLIBC patch -p0 < Patches/ffmpeg-svn-uclibc.patch @@ -1105,6 +1103,7 @@ ifdef NO_TEXT_RELOCATION echo "Broken LD. Fix your tools." exit -1 endif + (cd $@; patch -p1 < ../Patches/eac3_spectral.patch) else ffmpeg-$(FFMPEG_VERSION).tar.gz: echo "ffmpeg snapshot is too old, you MUST use subversion !" @@ -1115,7 +1114,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 @@ -1126,7 +1134,7 @@ else ifdef HAVE_UCLIBC .ffmpeg: ffmpeg else -.ffmpeg: ffmpeg .faac .lame .gsm +.ffmpeg: ffmpeg .lame .gsm endif endif (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) @@ -1271,6 +1279,9 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/live-noapps.patch patch -p0 < Patches/live-uselocale.patch +ifdef HAVE_WIN64 + patch -p0 < Patches/live-win64.patch +endif .live: live ifdef HAVE_WIN32 @@ -1286,10 +1297,12 @@ ifdef HAVE_BIGENDIAN (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC)) endif else + (cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux) (cd $<; ./genMakefiles linux && make $(HOSTCC)) endif endif endif + mkdir -p $(PREFIX)/lib $(PREFIX)/include cp $ configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) -endif + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) touch $@ CLEAN_FILE += .goom2k4 @@ -1352,9 +1358,6 @@ ifdef HAVE_DARWIN_OS #remove me at next libcaca upgrade patch -p0 < Patches/caca_driver_cocoa.diff patch -p0 < Patches/caca_macosx.diff -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 @@ -1463,10 +1466,9 @@ 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) + (cd $@; autoreconf -ivf ) endif .mod: libmodplug @@ -1541,26 +1543,6 @@ CLEAN_FILE += .cdio CLEAN_PKG += libcdio DISTCLEAN_PKG += libcdio-$(CDIO_VERSION).tar.gz -# *************************************************************************** -# wxWidgets -# *************************************************************************** - -wxWidgets-$(WXWIDGETS_VERSION).tar.gz: - $(WGET) $(WXWIDGETS_URL) - -wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz - $(EXTRACT_GZ) - (cd wxwidgets; patch -p0 < ../Patches/wxwidgets_uri.patch) - -.wxwidgets: wxwidgets - (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install) - $(INSTALL_NAME) - touch $@ - -CLEAN_FILE += .wxwidgets -CLEAN_PKG += wxwidgets -DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz - # *************************************************************************** # qt4 (win32 binary) # *************************************************************************** @@ -1629,7 +1611,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 @@ -1725,7 +1707,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 $@ @@ -1783,7 +1765,7 @@ 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) + (cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf -ivf) endif ifdef HAVE_WIN32 @@ -1795,7 +1777,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 @@ -1909,7 +1891,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1 ifdef HAVE_WIN32 (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) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -lgpg-error" $(CIPHDIG) && make && make install) endif $(INSTALL_NAME) touch $@ @@ -1947,13 +1929,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 @@ -1988,18 +1969,21 @@ DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2 # glib # *************************************************************************** -glib-$(GLIB_VERSION).tar.gz: +glib-$(GLIB_VERSION).tar.bz2: $(WGET) $(GLIB_URL) -glib: glib-$(GLIB_VERSION).tar.gz - $(EXTRACT_GZ) - patch -p0 < Patches/glib.patch +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 $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install) + (cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install) touch $@ -CLEAN_FILE += .glibl +CLEAN_FILE += .glib CLEAN_PKG += glib DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz @@ -2007,14 +1991,14 @@ DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz # libIDL # *************************************************************************** -libIDL-$(LIBIDL_VERSION).tar.gz: +libIDL-$(LIBIDL_VERSION).tar.bz2: $(WGET) $(LIBIDL_URL) -libIDL: libIDL-$(LIBIDL_VERSION).tar.gz - $(EXTRACT_GZ) +libIDL: libIDL-$(LIBIDL_VERSION).tar.bz2 + $(EXTRACT_BZ2) .IDL: libIDL - (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install ) + (cd $<; ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install ) touch $@ CLEAN_FILE += .IDL @@ -2070,40 +2054,49 @@ DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip gli # *************************************************************************** # mozilla-macosx +# +# Note that this dependency needs to be compiled against the 10.4u SDK using +# using GCC-4.0. Using newer releases of one of these won't lead to a +# successful compilation! Adapt the respective variables in ../config.mak! # *************************************************************************** -mozilla-source-$(MOZILLA_VERSION).tar.bz2: +firefox-$(MOZILLA_VERSION)-source.tar.bz2: $(WGET) $(MOZILLA_URL) -mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2 +mozilla: firefox-$(MOZILLA_VERSION)-source.tar.bz2 $(EXTRACT_BZ2) + (cd $@; patch -p0 < ../Patches/firefox-darwin.patch) -.mozilla-macosx: mozilla - (cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=mac --enable-standalone-modules=xpcom,plugin && make && make install) +.mozilla-macosx: mozilla .glib .IDL + ifneq($(SDK_TARGET),"10.4") + echo "Compiling the mozilla target requires the 10.4 SDK!" + exit -1 + endif + (cd $<; ./configure --prefix=$(PREFIX)/gecko-sdk-new --enable-default-toolkit=cairo-cocoa --enable-standalone-modules=xpcom,plugin --enable-application=xulrunner && make && make install) touch $@ CLEAN_FILE += .mozilla-macosx -CLEAN_PKG += mozilla-macosx -DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2 +CLEAN_PKG += mozilla +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 @@ -2184,7 +2177,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/mpcdec.patch - (cd $@; autoreconf) + (cd $@; autoreconf -ivf) .mpcdec: mpcdec ifdef HAVE_WIN32 @@ -2327,7 +2320,7 @@ yasm: yasm-$(YASM_VERSION).tar.gz CLEAN_FILE += .yasm CLEAN_PKG += yasm -DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2 +DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.gz # *************************************************************************** # kate @@ -2442,28 +2435,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 $