X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=a09780f1f1c5c7dd6395aea389ef72619568926e;hb=12efcf820dd8163b5a7f7f351d2ae6ca5b688f48;hp=8e0220c48080253cd674ae325947d9839625b141;hpb=06bbffa635c81d01e1e7a71cafb75bb9c273a416;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 8e0220c480..a09780f1f1 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -71,6 +71,10 @@ endif ifneq ($(AR),) HOSTCC+= AR="$(AR)" endif +ifneq ($(STRIP),) +HOSTCC+= STRIP="$(STRIP)" +endif + # Define ranlib on non-cross compilation setups ifeq ($(RANLIB),) @@ -102,7 +106,7 @@ ifneq ($(BUILD),$(HOST)) ifndef HAVE_CYGWIN # We are REALLY cross compiling FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile - X264CONF=--crosscompile=$(HOST) + X264CONF=--host=$(HOST) PTHREADSCONF="CROSS=$(HOST)-" else # We are compiling for MinGW on Cygwin @@ -294,10 +298,14 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz .libtool: libtool (cd $<; ./configure --prefix=$(PREFIX) && make && make install) + ln -sf libtool $(PREFIX)/bin/glibtool + ln -sf libtoolize $(PREFIX)/bin/glibtoolize touch $@ CLEAN_PKG += libtool DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz +CLEAN_FILE += .libtool + endif ifeq ($(BUILD),i586-pc-beos) @@ -313,10 +321,10 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz CLEAN_PKG += libtool DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz -endif - CLEAN_FILE += .libtool +endif + # *************************************************************************** # automake # *************************************************************************** @@ -383,8 +391,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 ) @@ -428,6 +441,38 @@ CLEAN_FILE += .iconv CLEAN_PKG += libiconv DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz +# *************************************************************************** +# fontconfig +# *************************************************************************** + +fontconfig-$(FONTCONFIG_VERSION).tar.gz: + $(WGET) $(FONTCONFIG_URL) + +fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Makefile Patches/fontconfig.patch + $(EXTRACT_GZ) + patch -p0 < Patches/fontconfig.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) + 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) + 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)) + 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) + endif +endif + $(INSTALL_NAME) + touch $@ + +CLEAN_FILE += .fontconfig +CLEAN_PKG += fontconfig +DISTCLEAN_PKG += fontconfig-$(FONTCONFIG_VERSION).tar.gz + # *************************************************************************** # freetype2 # *************************************************************************** @@ -437,6 +482,7 @@ freetype-$(FREETYPE2_VERSION).tar.gz: freetype2: freetype-$(FREETYPE2_VERSION).tar.gz $(EXTRACT_GZ) + patch -p0 < Patches/freetype-cross.patch .freetype: freetype2 ifdef HAVE_CYGWIN @@ -544,7 +590,6 @@ CLEAN_FILE += .id3tag CLEAN_PKG += libid3tag DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz - # *************************************************************************** # lua # *************************************************************************** @@ -576,7 +621,8 @@ lua: lua-$(LUA_VERSION).tar.gz .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)) + (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)) endif @@ -652,7 +698,7 @@ libvorbis-$(VORBIS_VERSION).tar.gz: libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/libvorbis-1.1.patch + patch -p0 < Patches/libvorbis.patch (cd $@; autoconf) .vorbis: libvorbis .ogg @@ -681,6 +727,8 @@ tremor: (cd $@; rm -f ogg.h && echo "#include " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) else tremor-$(TREMOR_VERSION).tar.bz2: + echo "tremor snapshot does not exist, you MUST use subversion !" + exit -1 $(WGET) $(TREMOR_URL) tremor: tremor-$(TREMOR_VERSION).tar.bz2 @@ -694,8 +742,6 @@ endif ifdef SVN tremor-source: tremor - cd tremor; find . -depth -iname ".svn" -exec rm -rf {} \; - cd ..; tar cfvz tremor-$(DATE).tar.gz tremor SOURCE += tremor-source @@ -703,7 +749,7 @@ endif CLEAN_FILE += .tremor CLEAN_PKG += tremor -#DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.gz +#DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.bz2 #no tremor snapshot # *************************************************************************** # theora @@ -715,14 +761,13 @@ libtheora-$(THEORA_VERSION).tar.bz2: libtheora: libtheora-$(THEORA_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/theora.patch - patch -p0 < Patches/theora-1.0a7.patch (cd $@; autoconf) .theora: libtheora .ogg ifdef HAVE_BEOS - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --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 && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install) endif $(INSTALL_NAME) @@ -743,10 +788,10 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_WIN32 patch -p0 < Patches/libshout-win32.patch - (cd $@; aclocal && automake) + (cd $@; autoreconf && automake) endif -.shout: libshout .theora .ogg .speex +.shout: libshout .theora .ogg .speex .vorbis (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install ) $(INSTALL_NAME) touch $@ @@ -764,25 +809,24 @@ flac-$(FLAC_VERSION).tar.gz: flac: flac-$(FLAC_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WIN32 - patch -p0 < Patches/flac-mingw32.patch -endif -ifneq ($(HOST),$(BUILD)) - (patch -p0 < Patches/flac-cross.patch && cd $@ && autoconf) +ifdef HAVE_CYGWIN + patch -p0 < Patches/flac-win32.patch endif +FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs + .flac: flac .ogg ifdef HAVE_WIN32 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) else ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS_ON_INTEL - (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations&& cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) else - (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) endif else - (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) endif endif $(INSTALL_NAME) @@ -834,7 +878,7 @@ faad: faad2-$(FAAD2_VERSION).tar.bz2 (cd $@; patch -p1 < ../Patches/faad2.patch && ./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) + (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) $(INSTALL_NAME) touch $@ @@ -846,20 +890,21 @@ DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2 # faac # *************************************************************************** -faac-$(FAAC_VERSION).tar.bz2: +faac-$(FAAC_VERSION).tar.gz: $(WGET) $(FAAC_URL) -faac: faac-$(FAAC_VERSION).tar.bz2 - $(EXTRACT_BZ2) +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 $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) + (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.bz2 +DISTCLEAN_PKG += faac-$(FAAC_VERSION).tar.gz # *************************************************************************** # lame @@ -870,7 +915,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) @@ -887,13 +931,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) export 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 @@ -906,14 +952,12 @@ else $(RANLIB) $(PREFIX)/lib/libebml.a endif touch $@ - -ifdef SVN -libebml-source: libebml - cd libebml; find . -depth -iname ".svn" -exec rm -rf {} \; - cd ..; - 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 @@ -926,13 +970,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) export 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 @@ -946,15 +992,13 @@ else endif touch $@ -ifdef SVN -libmatroska-source: libmatroska - cd libmatroska; find . -depth -iname ".svn" -exec rm -rf {} \; - cd ..; - 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 @@ -964,6 +1008,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 # ffmpeg # *************************************************************************** +ifdef SVN ffmpeg: $(SVN) export $(FFMPEG_SVN) ffmpeg (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch) @@ -982,12 +1027,15 @@ ifdef HAVE_UCLIBC patch -p0 < Patches/ffmpeg-svn-grab.patch endif +else ffmpeg-$(FFMPEG_VERSION).tar.gz: + echo "ffmpeg snapshot is too old, you MUST use subversion !" + exit -1 $(WGET) $(FFMPEG_URL) -#ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz -# $(EXTRACT_GZ) -# patch -p0 < Patches/ffmpeg.patch +ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz + $(EXTRACT_GZ) +endif ifdef HAVE_WINCE .ffmpeg: ffmpeg .zlib @@ -998,13 +1046,11 @@ 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-network --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-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay && make && make install-libs install-headers) touch $@ ifdef SVN ffmpeg-source: ffmpeg - cd ffmpeg; find . -depth -iname ".svn" -exec rm -rf {} \; - cd ..; tar cfvz ffmpeg-$(DATE).tar.gz ffmpeg SOURCE += ffmpeg-source @@ -1037,46 +1083,15 @@ endif ifdef SVN libdvdcss-source: libdvdcss - cd libmatroska; find . -depth -iname ".svn" -exec rm -rf {} \; - cd ..; tar cfvz libdvdcss-$(DATE).tar.gz libdvdcss SOURCE += libdvdcss-source endif - CLEAN_FILE += .dvdcss CLEAN_PKG += libdvdcss DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz -# *************************************************************************** -# libdvdread: We use dvdnav's dvdread -# *************************************************************************** - -#libdvdread-$(LIBDVDREAD_VERSION).tar.bz2: -# $(WGET) $(LIBDVDREAD_URL) - -#libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 -# $(EXTRACT_BZ2) -# patch -p 0 < Patches/libdvdread.patch -#ifdef HAVE_WIN32 -# if automake-1.4 --version >/dev/null 2>&1; then \ -# echo "Please get rid of your automake 1.4"; \ -# rm -rf $@ \ -# exit 1; \ -# fi -# (cd libdvdread; patch -p0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap) -#endif - -#.dvdread: libdvdread .dvdcss -# (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install) -# $(INSTALL_NAME) -# touch $@ - -#CLEAN_FILE += .dvdread -#CLEAN_PKG += libdvdread -#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 - # *************************************************************************** # dummy dvdread to trigger the INSTALL_NAME script # *************************************************************************** @@ -1130,7 +1145,7 @@ libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz CLEAN_FILE += .dvbpsi CLEAN_PKG += libdvbpsi -DISTCLEAN_PKG += libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz +DISTCLEAN_PKG += libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz # *************************************************************************** # live @@ -1149,7 +1164,10 @@ ifdef HAVE_DARWIN_OS patch -p0 < Patches/live-osx.patch endif patch -p0 < Patches/live-starttime.patch - patch -p0 < Patches/live-config.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 @@ -1220,7 +1238,7 @@ endif ifdef HAVE_DARWIN_OS (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) else - (cd $< && rm -f configure; 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 $@ @@ -1286,7 +1304,9 @@ 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 @@ -1295,17 +1315,19 @@ endif ifdef HAVE_WIN32 .x264: x264 .pthreads - (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) + 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 $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) endif touch $@ ifdef SVN x264-source: x264 - cd x264; find . -depth -iname ".svn" -exec rm -rf {} \; - cd ..; tar cfvz x264-$(DATE).tar.gz x264 SOURCE += x264-source @@ -1393,24 +1415,6 @@ CLEAN_FILE += .cdio CLEAN_PKG += libcdio DISTCLEAN_PKG += libcdio-$(CDIO_VERSION).tar.gz -# *************************************************************************** -# OpenMash -# *************************************************************************** -# -#mash-src-$(MASH_VERSION).tar.gz: -# $(WGET) $(MASH_URL) -# -#mash-code: mash-src-$(MASH_VERSION).tar.gz -# $(EXTRACT_GZ) -# -#.mash: mash-code -# (cd $<; ./configure && make) -# touch $@ -# -#CLEAN_FILE += .mash -#CLEAN_PKG += mash-code -#DISTCLEAN_PKG += mash-src-$(MASH_VERSION).tar.gz - # *************************************************************************** # wxWidgets # *************************************************************************** @@ -1442,7 +1446,6 @@ qt4-$(QT4_VERSION)-win32-bin.tar.gz: qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz $(EXTRACT_GZ) - .qt4: qt4 (cd qt4;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) @@ -1454,7 +1457,7 @@ endif CLEAN_FILE += .qt4 CLEAN_PKG += qt4 -#DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz +DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz # *************************************************************************** # zlib @@ -1476,7 +1479,6 @@ CLEAN_FILE += .zlib CLEAN_PKG += zlib DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz - # *************************************************************************** # PortAudio # *************************************************************************** @@ -1499,7 +1501,6 @@ CLEAN_FILE += .portaudio CLEAN_PKG += portaudio DISTCLEAN_PKG += pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz - # *************************************************************************** # xml # *************************************************************************** @@ -1518,7 +1519,14 @@ ifdef HAVE_UCLIBC endif .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 && 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 @@ -1528,7 +1536,6 @@ CLEAN_FILE += .xml CLEAN_PKG += xml DISTCLEAN_PKG += libxml2-$(XML_VERSION).tar.gz - # *************************************************************************** # twolame # *************************************************************************** @@ -1621,9 +1628,6 @@ CLEAN_PKG += zvbi DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 # *************************************************************************** -# gpg-error -# *************************************************************************** - # libraw1394 # *************************************************************************** @@ -1650,7 +1654,7 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz # sed 's/^typedef u_int8_t byte_t;/\/* typedef u_int8_t byte_t;\*\//' touch $@ -CLEAN_file += .raw1394 +CLEAN_FILE += .raw1394 CLEAN_PKG += libraw1394 DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz @@ -1682,11 +1686,14 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz make && make DESTDIR=$(PRFIX) install) touch $@ -CLEAN_file += .dc1394 +CLEAN_FILE += .dc1394 CLEAN_PKG += libdc1394 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz # *************************************************************************** +# gpg-error +# *************************************************************************** + libgpg-error-$(GPGERROR_VERSION).tar.bz2: $(WGET) $(GPGERROR_URL) @@ -1972,7 +1979,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/mpcdec.patch - (cd $@; autoreconf -vif) + (cd $@; autoreconf) .mpcdec: mpcdec ifdef HAVE_WIN32 @@ -1998,13 +2005,11 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_DARWIN_OS -# patch -p0