X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=cdea7206804129082178b647e7d5c156688e3743;hb=93d71d385db89194d8e756368147f92fada19246;hp=a3d760371d8c7efe692deaa6a6719b8a8573b2ed;hpb=64da792bed5517368a01ef0f1fa771661099f6ce;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index a3d760371d..cdea720680 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -129,14 +129,14 @@ endif ifdef HAVE_UCLIBC ifdef HAVE_BIGENDIAN -FFMPEGCONF+= --arch=armeb +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 +FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler endif ifdef HAVE_BEOS @@ -147,6 +147,10 @@ ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m endif +ifdef HAVE_DARWIN_9 +FFMPEGCONF += --disable-mmx +endif + ifdef HAVE_DARWIN_OS X264CONF += --enable-pic ifdef HAVE_DARWIN_OS_ON_INTEL @@ -154,6 +158,10 @@ FFMPEG_CFLAGS += -DHAVE_LRINTF endif endif +ifdef HAVE_AMR +FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb +endif + DATE=`date +%Y-%m-%d` # *************************************************************************** @@ -391,8 +399,13 @@ ifeq ($(BUILD),i586-pc-beos) ( cd $< && for f in `find . -name libtool`; do sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' -i $$f; chmod +x $$f; done ) endif ifneq ($(HOST),$(BUILD)) -# We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap + ifndef HAVE_CYGWIN + # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install ) + else + # We are compiling for MinGW on Cygwin -- build the full current gettext + ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install ) + endif else # Build and install the whole gettext ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install ) @@ -443,22 +456,23 @@ DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz fontconfig-$(FONTCONFIG_VERSION).tar.gz: $(WGET) $(FONTCONFIG_URL) -fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Makefile Patches/fontconfig.patch +fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch $(EXTRACT_GZ) patch -p0 < Patches/fontconfig.patch + patch -p0 < Patches/fontconfig-nodocs.patch .fontconfig: fontconfig ifdef HAVE_WIN32 ifdef HAVE_CYGWIN - (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) + (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) else - (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) + (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) endif else ifdef HAVE_DARWIN_OS - (cd $<; $(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 && 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)) else - (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) + (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 endif $(INSTALL_NAME) @@ -496,11 +510,11 @@ DISTCLEAN_PKG += freetype-$(FREETYPE2_VERSION).tar.gz # fribidi # *************************************************************************** -fribidi-$(FRIBIDI_VERSION).tar.bz2: +fribidi-$(FRIBIDI_VERSION).tar.gz: $(WGET) $(FRIBIDI_URL) -fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 - $(EXTRACT_BZ2) +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 @@ -762,8 +776,11 @@ 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 + (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 endif $(INSTALL_NAME) touch $@ @@ -804,10 +821,9 @@ flac-$(FLAC_VERSION).tar.gz: flac: flac-$(FLAC_VERSION).tar.gz $(EXTRACT_GZ) -ifneq ($(HOST),$(BUILD)) - (patch -p0 < Patches/flac-cross.patch) +ifdef HAVE_WIN32 + patch -p0 < Patches/flac-win32.patch endif - cd $@ && autoconf FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs @@ -866,21 +882,20 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz # (cd $@; patch -p1 < ../Patches/faad2.patch) # (cd $@; sh ./bootstrap) -faad2-$(FAAD2_VERSION).tar.bz2: +faad2-$(FAAD2_VERSION).tar.gz: $(WGET) $(FAAD2_URL) -faad: faad2-$(FAAD2_VERSION).tar.bz2 - $(EXTRACT_BZ2) - (cd $@; patch -p1 < ../Patches/faad2.patch && ./bootstrap) +faad2: faad2-$(FAAD2_VERSION).tar.gz + $(EXTRACT_GZ) + (cd $@; ./bootstrap) -.faad: faad - (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install) - $(INSTALL_NAME) +.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) touch $@ CLEAN_FILE += .faad -CLEAN_PKG += faad -DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2 +CLEAN_PKG += faad2 +DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz # *************************************************************************** # faac @@ -891,8 +906,6 @@ faac-$(FAAC_VERSION).tar.gz: faac: faac-$(FAAC_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/faac.patch - cd $@; perl -pi -e 's/\r$$//' bootstrap configure.in Makefile.am; cd .. .faac: faac (cd $<; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --without-mp4v2 --prefix=$(PREFIX) --disable-shared && make && make install) @@ -911,7 +924,6 @@ lame-$(LAME_VERSION).tar.gz: lame: lame-$(LAME_VERSION).tar.gz $(EXTRACT_GZ) - rm -rf lame; mv lame-3.97 lame; touch lame .lame: lame (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) @@ -928,13 +940,15 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz libebml-$(LIBEBML_VERSION).tar.bz2: $(WGET) $(LIBEBML_URL) -ifdef SVN -libebml: - $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml -else +## No reasons to use SVN anymore +#ifdef SVN +#libebml: +# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml +#else libebml: libebml-$(LIBEBML_VERSION).tar.bz2 $(EXTRACT_BZ2) -endif +#endif + ifdef HAVE_WIN32 (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch) endif @@ -947,12 +961,12 @@ else $(RANLIB) $(PREFIX)/lib/libebml.a endif touch $@ - -ifdef SVN -libebml-source: libebml - tar cfvz libebml-$(DATE).tar.gz libebml -SOURCE += libebml-source -endif +## No reasons to use SVN anymore +#ifdef SVN +#libebml-source: libebml +# tar cfvz libebml-$(DATE).tar.gz libebml +#SOURCE += libebml-source +#endif CLEAN_FILE += .ebml CLEAN_PKG += libebml @@ -965,13 +979,15 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2 libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: $(WGET) $(LIBMATROSKA_URL) -ifdef SVN -libmatroska: - $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska -else +## No reasons to use SVN anymore +#if SVN +#libmatroska: +# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska +#else libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) -endif +#endif + ifdef HAVE_WIN32 (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch) endif @@ -985,25 +1001,65 @@ else endif touch $@ -ifdef SVN -libmatroska-source: libmatroska - tar cfvz libmatroska-$(DATE).tar.gz libmatroska - -SOURCE += libmatroska-source -endif +## No reasons to use SVN anymore +#ifdef SVN +#libmatroska-source: libmatroska +# tar cfvz libmatroska-$(DATE).tar.gz libmatroska +# +#SOURCE += libmatroska-source +#endif CLEAN_FILE += .matroska CLEAN_PKG += libmatroska DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 # *************************************************************************** +# libamrnb +# *************************************************************************** + +amrnb-$(LIBAMR_NB_VERSION).tar.bz2: + $(WGET) $(LIBAMR_NB) + +libamrnb: amrnb-$(LIBAMR_NB_VERSION).tar.bz2 + $(EXTRACT_BZ2) + +.libamrnb: libamrnb + (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --enable-shared && make && make install) + touch $@ + +CLEAN_FILE += .libamrnb +CLEAN_PKG += libamrnb +DISTCLEAN_PKG += amrnb-$(LIBAMR_NB_VERSION).tar.bz2 + +# *************************************************************************** +# libamrwb +# *************************************************************************** + +amrwb-$(LIBAMR_WB_VERSION).tar.bz2: + $(WGET) $(LIBAMR_WB) + +libamrwb: amrwb-$(LIBAMR_WB_VERSION).tar.bz2 + $(EXTRACT_BZ2) + +.libamrwb: libamrwb + (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --enable-shared && make && make install) + touch $@ + + +CLEAN_FILE += .libamrwb +CLEAN_PKG += libamrwb +DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 + +# *************************************************************************** + # ffmpeg # *************************************************************************** ifdef SVN ffmpeg: - $(SVN) export $(FFMPEG_SVN) ffmpeg - (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch) + $(SVN) co $(FFMPEG_SVN) ffmpeg + (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \ + patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch) ifeq ($(HOST),i586-pc-beos) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif @@ -1013,10 +1069,18 @@ endif ifdef HAVE_BEOS (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch) endif +ifdef HAVE_DARWIN_OS + (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) +endif +ifdef HAVE_DARWIN_9 +ifdef HAVE_DARWIN_OS_ON_INTEL + (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch) +endif +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 @@ -1061,7 +1125,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 @@ -1089,7 +1153,9 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** .dvdread: .dvdnav $(INSTALL_NAME) - (install_name_tool -change $(PREFIX)/lib/libdvdread.0.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/vlc_libdvdnav.dylib) +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 @@ -1098,18 +1164,30 @@ CLEAN_FILE += .dvdread # libdvdnav # *************************************************************************** -libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: +ifdef 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.gz: $(WGET) $(LIBDVDNAV_URL) -libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 - $(EXTRACT_BZ2) - patch -p0 < Patches/dvdnav.patch - patch -p0 < Patches/libdvdnav-mactel.patch +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 .dvdnav: libdvdnav .dvdcss ifdef HAVE_WIN32 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -Dssize_t=long" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install) endif @@ -1124,10 +1202,10 @@ DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 # libdvbpsi # *************************************************************************** -libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz: +libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz: $(WGET) $(LIBDVBPSI_URL) -libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz +libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz $(EXTRACT_GZ) .dvbpsi: libdvbpsi @@ -1137,7 +1215,7 @@ libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz CLEAN_FILE += .dvbpsi CLEAN_PKG += libdvbpsi -DISTCLEAN_PKG += libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz +DISTCLEAN_PKG += libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz # *************************************************************************** # live @@ -1148,23 +1226,14 @@ 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 +#Still needed + (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_DARWIN_OS (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx) (cd $<; ./genMakefiles macosx && make) @@ -1177,7 +1246,6 @@ endif else (cd $<; ./genMakefiles linux && make $(HOSTCC)) endif -endif endif touch $@ @@ -1219,15 +1287,14 @@ endif ifdef HAVE_WIN32 (cd $@; dos2unix configure.in) patch -p0 < Patches/goom2k4-0-win32.patch -else - patch -p0 < Patches/goom2k4-0-mmx.patch endif + patch -p0 < Patches/goom2k4-0-mmx.patch .goom2k4: goom ifdef HAVE_DARWIN_OS (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) else - (cd $< && rm -f configure; aclocal -Im4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) + (cd $< && rm -f configure; aclocal -I m4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) endif touch $@ @@ -1269,6 +1336,7 @@ libdca: libdca-$(LIBDCA_VERSION).tar.bz2 .dca: libdca (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + $(INSTALL_NAME) touch $@ CLEAN_FILE += .dca @@ -1284,16 +1352,21 @@ x264-$(X264_VERSION).tar.gz: ifdef SVN x264: - $(SVN) export svn://svn.videolan.org/x264/trunk/ x264 + $(SVN) co svn://svn.videolan.org/x264/trunk/ -r 701 x264 ifdef HAVE_WIN32 (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) endif +ifdef HAVE_DARWIN_OS + (cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch ) +endif else x264: x264-$(X264_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_WIN32 + ifndef HAVE_CYGWIN (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch) + endif else patch -p0 < Patches/x264.patch rm x264/x264.c @@ -1302,7 +1375,11 @@ endif ifdef HAVE_WIN32 .x264: x264 .pthreads + 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) + endif else .x264: x264 (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) @@ -1442,6 +1519,39 @@ CLEAN_FILE += .qt4 CLEAN_PKG += qt4 DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz +# *************************************************************************** +# qt4 (trolltech binaries) +# *************************************************************************** + +qt-win-opensource-$(QT4T_VERSION)-mingw.exe: + wget $(QT4T_URL) + +Qt: 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 \$$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 $(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 Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig + cp Qt/translations/* $(PREFIX)/share/qt4/translations + touch $@ + +CLEAN_FILE += .Qt +CLEAN_PKG += Qt +DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe + # *************************************************************************** # zlib # *************************************************************************** @@ -1505,7 +1615,11 @@ endif 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) + 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) + endif ifndef HAVE_DARWIN_OS $(INSTALL_NAME) endif @@ -1571,9 +1685,9 @@ ifeq ($(PNG_VERSION),1.2.8) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) endif +endif endif $(INSTALL_NAME) -endif touch $@ CLEAN_FILE += .png @@ -1600,6 +1714,7 @@ ifdef HAVE_DARWIN_OS else (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) endif + $(INSTALL_NAME) touch $@ CLEAN_FILE += .zvbi @@ -1612,7 +1727,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; \ @@ -1643,7 +1758,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; \ @@ -1678,9 +1793,6 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2: libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 $(EXTRACT_BZ2) -ifdef HAVE_WIN32 - patch -p0 < Patches/libgpg-error-win32.patch -endif .gpg-error: libgpg-error ifdef HAVE_DARWIN_OS_ON_INTEL @@ -1850,7 +1962,7 @@ CLEAN_PKG += gecko-sdk-win32 DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip # *************************************************************************** -# mozilla +# mozilla-macosx # *************************************************************************** mozilla-source-$(MOZILLA_VERSION).tar.bz2: @@ -1859,12 +1971,12 @@ mozilla-source-$(MOZILLA_VERSION).tar.bz2: mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2 $(EXTRACT_BZ2) -.mozilla: mozilla +.mozilla-macosx: mozilla-macosx (cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=mac --enable-standalone-modules=xpcom,plugin && make && make install) touch $@ -CLEAN_FILE += .mozilla -CLEAN_PKG += mozilla +CLEAN_FILE += .mozilla-macosx +CLEAN_PKG += mozilla-macosx DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2 # *************************************************************************** @@ -1985,6 +2097,10 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) patch -p0