X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=9c1d68a2d17423d3a5338fe0d7cdcec8f508fae1;hb=c77d34a29149f897bc0e43eac220b37895e2a1e6;hp=067a3cd3fa9bc4f35dfe082d44e2b8821b3ff18e;hpb=2169f3b770691e6f172cef776cd0bc8c32153b51;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 067a3cd3fa..9c1d68a2d1 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -38,10 +38,6 @@ include ./packages.mak export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH) export PKG_CONFIG_PATH export PKG_CONFIG_LIBDIR = $(PREFIX)/lib/pkgconfig -export DYLD_LIBRARY_PATH = $(PREFIX)/lib -# following is required for configure scripts that check dyld libraries -# by building and running a test app -export DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(PREFIX)/vlc-lib export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET) export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH) export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) @@ -119,7 +115,7 @@ endif # ifdef HAVE_WIN32 HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-dependency-tracking -FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --disable-debug +FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686 --disable-debug endif ifdef HAVE_WINCE @@ -129,14 +125,14 @@ endif ifdef HAVE_UCLIBC ifdef HAVE_BIGENDIAN -FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-small --enable-iwmmxt +FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt else FFMPEGCONF+= --arch=armv4l endif -FFMPEGCONF+= --enable-small --disable-debug --disable-encoders --disable-muxers --disable-demuxer=mpegts --disable-v4l --disable-v4l2 --disable-bktr --disable-dv1394 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols --disable-encoders +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 @@ -147,6 +143,10 @@ ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m endif +ifdef NO_TEXT_RELOCATION +FFMPEGCONF += --disable-mmx +endif + ifdef HAVE_DARWIN_OS X264CONF += --enable-pic ifdef HAVE_DARWIN_OS_ON_INTEL @@ -155,7 +155,7 @@ endif endif ifdef HAVE_AMR -FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb +FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree endif DATE=`date +%Y-%m-%d` @@ -206,38 +206,6 @@ endef # $(INSTALL_NAME) # touch $@ -ifdef HAVE_DARWIN_OS -# the original libtoto.dylib is copied from contrib/lib to vlc-lib as -# vlc_libtoto.dylib. a soft link to this library is created in contrib/lib -# using the orginal dylib name. if libtoto.la also exists, the library named -# in dlname is also changed to a soft-link to vlc-lib in order to support -# libtool. to satisfy VLC.app dyld search, vlc_libtoto.dylib dyld id is changed -# to @executable_path/lib/vlc_libtoto.dylib - -define INSTALL_NAME - if which install_name_tool >/dev/null; then \ - mkdir -p $(PREFIX)/vlc-lib ; \ - libname='lib$(patsubst .%,%,$@)' ; \ - dlname="$$libname.dylib" ; \ - cp $(PREFIX)/lib/$$dlname \ - $(PREFIX)/vlc-lib/vlc_$$dlname ; \ - rm $(PREFIX)/lib/$$dlname ; \ - ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \ - $(PREFIX)/lib/$$dlname ; \ - if [ -f $(PREFIX)/lib/$$libname.la ]; then \ - eval ltname=`sed -n 's/dlname=//p' $(PREFIX)/lib/$$libname.la`; \ - rm $(PREFIX)/lib/$$ltname ; \ - ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \ - $(PREFIX)/lib/$$ltname ; \ - fi ; \ - install_name_tool \ - -id @executable_path/lib/vlc_$$dlname \ - $(PREFIX)/vlc-lib/vlc_$$dlname ; \ - fi -endef - -endif - ifeq ($(HOST),i586-pc-beos) # We test if the file actually exists, as sometimes (but not always) # libtool won't accept to build the shared library @@ -289,6 +257,25 @@ CLEAN_FILE += .autoconf CLEAN_PKG += autoconf DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2 +# *************************************************************************** +# CMake +# *************************************************************************** +# cmake-$(CMAKE_VERSION).tar.gz: +# $(WGET) $(CMAKE_URL) +# +# cmake: cmake-$(CMAKE_VERSION).tar.gz +# $(EXTRACT_GZ) + +cmake: + cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake + +.cmake: cmake + (cd $<; ./configure --prefix=$(PREFIX) && make && make install) + touch $@ + +CLEAN_FILE += .cmake +CLEAN_PKG += cmake + # *************************************************************************** # libtool # *************************************************************************** @@ -376,9 +363,6 @@ gettext-$(GETTEXT_VERSION).tar.gz: gettext: gettext-$(GETTEXT_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/gettext-macosx.patch -endif ifdef HAVE_WIN32 patch -p0 < Patches/gettext-win32.patch endif @@ -457,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) @@ -466,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 @@ -511,13 +495,7 @@ fribidi-$(FRIBIDI_VERSION).tar.gz: fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/fribidi.patch.real -ifdef HAVE_WIN32 - patch -p0 " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) else @@ -772,7 +761,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2 ifdef HAVE_BEOS (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) else - ifdef HAVE_DARWIN_9 + 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) @@ -871,13 +860,6 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz # faad2 # *************************************************************************** -#faad2: -# @echo "*** Please type return here : ***" -# cvs -d $(FAAD2_CVSROOT) login -# cvs -d $(FAAD2_CVSROOT) co faad2 -# (cd $@; patch -p1 < ../Patches/faad2.patch) -# (cd $@; sh ./bootstrap) - faad2-$(FAAD2_VERSION).tar.gz: $(WGET) $(FAAD2_URL) @@ -939,7 +921,7 @@ libebml-$(LIBEBML_VERSION).tar.bz2: ## No reasons to use SVN anymore #ifdef SVN #libebml: -# $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml +# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml #else libebml: libebml-$(LIBEBML_VERSION).tar.bz2 $(EXTRACT_BZ2) @@ -978,7 +960,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: ## No reasons to use SVN anymore #if SVN #libmatroska: -# $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska +# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska #else libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) @@ -1053,8 +1035,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ifdef SVN ffmpeg: - $(SVN) export $(FFMPEG_SVN) ffmpeg - (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch) + $(SVN) co $(FFMPEG_SVN) ffmpeg ifeq ($(HOST),i586-pc-beos) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif @@ -1067,10 +1048,13 @@ endif ifdef HAVE_DARWIN_OS (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) endif +ifdef NO_TEXT_RELOCATION + (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.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-grab.patch + patch -p0 < Patches/ffmpeg-svn-libavformat.patch endif else @@ -1092,7 +1076,8 @@ else .ffmpeg: ffmpeg .faac .lame endif endif - (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay && make && make install-libs install-headers) + + (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 && make && make install-libs install-headers) touch $@ ifdef SVN @@ -1103,7 +1088,7 @@ SOURCE += ffmpeg-source endif CLEAN_FILE += .ffmpeg -CLEAN_PKG += ffmpeg ffmpeg.cvs +CLEAN_PKG += ffmpeg DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz # *************************************************************************** @@ -1115,7 +1100,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: ifdef SVN libdvdcss: - $(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss + $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss cd $@ && sh bootstrap else libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz @@ -1143,9 +1128,6 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** .dvdread: .dvdnav $(INSTALL_NAME) -ifdef HAVE_DARWIN_OS - install_name_tool -change $(PREFIX)/lib/libdvdread.4.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/vlc_libdvdnav.dylib -endif touch $@ CLEAN_FILE += .dvdread @@ -1156,16 +1138,22 @@ CLEAN_FILE += .dvdread ifdef SVN libdvdnav: - $(SVN) export $(LIBDVDNAV_SVN) libdvdnav + $(SVN) co $(LIBDVDNAV_SVN) libdvdnav patch -p0 < Patches/libdvdnav.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/libdvdnav-win32.patch +endif (cd $@; ./autogen.sh noconfig) else -libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: +libdvdnav-$(LIBDVDNAV_VERSION).tar.gz: $(WGET) $(LIBDVDNAV_URL) -libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 - $(EXTRACT_BZ2) +libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz + $(EXTRACT_GZ) patch -p0 < Patches/libdvdnav.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/libdvdnav-win32.patch +endif (cd $@; ./autogen.sh noconfig) endif @@ -1210,26 +1198,12 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz: live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/live.patch -ifdef HAVE_WIN32 - patch -p0 < Patches/livedotcom-win32.patch -endif -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/live-osx.patch -endif - patch -p0 < Patches/live-starttime.patch - (cd live/liveMedia/include; \ - mv liveMedia_version.hh liveMedia_version.hh.bak; \ - sed -e 's/.*LIVEMEDIA_LIBRARY_VERSION_INT.*/#define LIVEMEDIA_LIBRARY_VERSION_INT 9999999999/' liveMedia_version.hh.bak > liveMedia_version.hh ) - patch -Np0 < Patches/live-config.patch -ifdef HAVE_UCLIBC patch -p0 < Patches/live-noapps.patch -endif .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 $<; ./genMakefiles macosx && make) @@ -1244,6 +1218,14 @@ else endif endif endif + cp $ $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib) +.qt4_win32: qt4_win32 + (cd qt4_win32;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib) ifeq ($(BUILD),i686-pc-cygwin) - (cd qt4;cp bin/*.exe $(PREFIX)/bin) + (cd qt4_win32;cp bin/*.exe $(PREFIX)/bin) else - (cd qt4;cp bin/* $(PREFIX)/bin) + (cd qt4_win32;cp bin/* $(PREFIX)/bin) endif touch $@ -CLEAN_FILE += .qt4 -CLEAN_PKG += qt4 -DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz +CLEAN_FILE += .qt4_win32 +CLEAN_PKG += qt4_win32 +DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.bz2 # *************************************************************************** # qt4 (trolltech binaries) @@ -1520,30 +1527,50 @@ DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz qt-win-opensource-$(QT4T_VERSION)-mingw.exe: wget $(QT4T_URL) -Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe +Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe mkdir Qt - 7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib + 7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib \$$OUTDIR/bin\ /translations mv Qt/\$$OUTDIR/bin\ /* Qt/ && rmdir Qt/\$$OUTDIR/bin\ Qt/\$$OUTDIR find Qt -name '* ' -exec sh -c "mv \"{}\" `echo {}`" \; find Qt/src -name '*.cpp' -exec rm {} \; + find Qt/translations -type f -a ! -name 'qt_*.qm' -exec rm {} \; find Qt/include -name '*.h' -exec sh -c "mv {} {}.tmp; sed 's,..\/..\/src,..\/src,' {}.tmp > {}; rm -f {}.tmp" \; mkdir Qt/lib/pkgconfig sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtCore.pc.in > Qt/lib/pkgconfig/QtCore.pc sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtGui.pc.in > Qt/lib/pkgconfig/QtGui.pc -.Qt: Qt - mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig +.Qt_win32: Qt_win32 + mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig $(PREFIX)/share/qt4/translations cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin cp -r Qt/include/QtCore Qt/include/QtGui $(PREFIX)/include/qt4 cp -r Qt/src/corelib Qt/src/gui $(PREFIX)/include/qt4/src cp Qt/lib/libQtCore4.a Qt/lib/libQtGui4.a $(PREFIX)/lib - cp -r Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig + cp Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig + cp Qt/translations/* $(PREFIX)/share/qt4/translations touch $@ -CLEAN_FILE += .Qt -CLEAN_PKG += Qt +CLEAN_FILE += .Qt_win32 +CLEAN_PKG += Qt_win32 DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe +# *************************************************************************** +# qt4 (source-code compilation for Mac) +# *************************************************************************** + +qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz: + $(WGET) $(QT4_MAC_URL) + +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 -sdk $(MACOSX_SDK) -no-framework && make && make install) + touch $@ + +CLEAN_FILE += .qt4_mac +CLEAN_PKG += qt4_mac +DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz + # *************************************************************************** # zlib # *************************************************************************** @@ -1608,9 +1635,9 @@ 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 && make && make install) + (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) 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 && make && make install) + (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) endif ifndef HAVE_DARWIN_OS $(INSTALL_NAME) @@ -1665,7 +1692,7 @@ ifdef HAVE_DARWIN_OS_ON_INTEL (patch -p0 < Patches/libpng-darwin-mactel.patch) endif -.png: libpng +.png: libpng .zlib ifdef HAVE_DARWIN_OS (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) else @@ -1719,7 +1746,7 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 #ifdef SVN #libraw1394: -# $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394 +# $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394 # (cd $<; libtoolize --copy --force; \ # autopoint -f; \ # aclocal -I extras/contrib/share/aclocal; \ @@ -1750,7 +1777,7 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz #ifdef SVN #libdc1394: -# $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394 +# $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394 # (cd $<; libtoolize --copy --force; \ # autopoint -f; \ # aclocal -I extras/contrib/share/aclocal; \ @@ -1790,7 +1817,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 ifdef HAVE_DARWIN_OS_ON_INTEL (cd $<; ./autogen.sh) endif - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared --disable-languages && make && make install) # $(INSTALL_NAME) touch $@ @@ -1809,14 +1836,16 @@ 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 + .gcrypt: libgcrypt .gpg-error ifdef HAVE_WIN32 - (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && 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) && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install) else ifdef HAVE_DARWIN_OS_ON_INTEL - (cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install) + (cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install) endif - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install) endif $(INSTALL_NAME) touch $@ @@ -1920,6 +1949,9 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz $(EXTRACT_GZ) .gecko: gecko-sdk + rm -rf ../gecko-sdk + mv gecko-sdk .. + mkdir gecko-sdk #creating an empty dir is faster than copying the whole dir (cd $<) touch $@ @@ -1963,7 +1995,7 @@ mozilla-source-$(MOZILLA_VERSION).tar.bz2: mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2 $(EXTRACT_BZ2) -.mozilla-macosx: mozilla-macosx +.mozilla-macosx: mozilla (cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=mac --enable-standalone-modules=xpcom,plugin && make && make install) touch $@ @@ -2042,6 +2074,7 @@ 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 .SDL_image: SDL_image .SDL .png .jpeg .tiff (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install) @@ -2272,13 +2305,14 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz $(EXTRACT_GZ) .pthreads: pthreads - (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && cp -v *.a $(PREFIX)/lib/) + (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a $(PREFIX)/lib/) $(INSTALL_NAME) touch $@ CLEAN_FILE += .pthreads CLEAN_PKG += pthreads DISTCLEAN_PKG += pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz + # *************************************************************************** # ncurses library (with wide chars support) # *************************************************************************** @@ -2297,6 +2331,29 @@ 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 $