X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=9809feeb632e9d8e52e5e57ef8a9bcbf79c80300;hb=3f3025aa794fbdad01150af9401bcb708263488f;hp=3b31adab1c27bd045c1aea2c579f8c548258c886;hpb=fd1a965309497d080aa51c5c1ffcd68fce9c1866;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 3b31adab1c..9809feeb63 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1,7 +1,7 @@ #*************************************************************************** # src/Makefile : Dearchive and compile all files necessary # *************************************************************************** -# Copyright (C) 2003 - 2006 the VideoLAN team +# Copyright (C) 2003 - 2007 the VideoLAN team # $Id$ # # Authors: Christophe Massiot @@ -11,6 +11,7 @@ # Christophe Mutricy # Gildas Bazin # Damien Fouilleul +# Jean-Baptiste Kempf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,16 +92,21 @@ endif # # cross compiling # +#This should be inside the if block but some config scripts are buggy +HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix="" ifneq ($(BUILD),$(HOST)) # # Compiling for MinGW under Cygwin could be deemed as cross compiling # unfortunately there isn't a complete separate GCC toolchain for MinGW under Cygwin # - HOSTCONF=--host=$(HOST) --build=$(BUILD) - ifeq ($(findstring cygwin,$(BUILD)),) - # We are REALLY cross compiling - FFMPEGCONF=--cross-prefix=$(HOST)- - X264CONF=--crosscompile=$(HOST) + ifndef HAVE_CYGWIN + # We are REALLY cross compiling + FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile + X264CONF=--crosscompile=$(HOST) + PTHREADSCONF="CROSS=$(HOST)-" + else + # We are compiling for MinGW on Cygwin + PTHREADSCONF=$(HOSTCC) endif endif @@ -109,99 +115,49 @@ endif # ifdef HAVE_WIN32 HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-dependency-tracking -FFMPEGCONF+= --enable-mingw32 --enable-memalign-hack --cpu=x86 --disable-debug +FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --disable-debug 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 +endif + +ifdef HAVE_UCLIBC +ifdef HAVE_BIGENDIAN +FFMPEGCONF+= --arch=armeb else -FFMPEGCONF+= --enable-mp3lame --enable-faac +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 +FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99 +else +FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 endif ifdef HAVE_BEOS FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos endif -ifeq ($(HOST),i686-apple-darwin8) +ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEGCONF += --enable-memalign-hack endif ifdef HAVE_DARWIN_OS -X264CONF += --enable-pic --enable-debug -ifneq ($(HOST),i686-apple-darwin8) +X264CONF += --enable-pic +ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF endif endif +DATE=`date +%Y-%m-%d` + # *************************************************************************** # Standard rules # *************************************************************************** - -ifdef HAVE_DARWIN_OS - all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \ - .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ - .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \ - .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \ - .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \ - .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \ - .libdca .tag .x264 .goom2k4 -# .expat .clinkcc don't work with SDK yet -# .glib .libidl .gecko are required to build the mozilla plugin -# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package -else - - ifdef HAVE_BEOS - ifeq ($(HOST),$(BUILD)) -# Native build: we need perl, autoconf, etc first - all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \ - .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ - .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ - .dvdnav .dvbpsi .aclocal .libdca - #.speex seems - else -# Cross compiling: we already have the Linux tools, only build the -# libraries now - all: .iconv .intl .freetype .fribidi \ - .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ - .FLAC .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \ - .dvdnav .dvbpsi .aclocal .libdca - endif - #.speex - else - - ifdef HAVE_WIN32 - - all: .iconv .intl .freetype .fribidi .zlib \ - .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \ - .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ - .live .goom2k4 .caca .mod .x264 .xml .twolame \ - .png .gpg-error .gcrypt .gnutls .mpcdec \ - .dvdnav .dvbpsi .wxwidgets .qt4 .dirac \ - .dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca \ - .SDL_image -# .SDL_image .daap .cddb .cdio .vcdimager .portaudio - else - - ifdef HAVE_WINCE - - all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad - - else -# Standard Linux or other UNIX-like systems - all: .iconv .intl .freetype .fribidi .zlib \ - .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ - .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ - .live .goom2k4 .caca .mod .x264 .xml .twolame\ - .png .gpg-error .gcrypt .gnutls .mpcdec\ - .dvdnav .dvbpsi .wxwidgets .dirac \ - .aclocal .libdca -# .png .gpg-error .gcrypt .gnutls .mpcdec\ -# .SDL_image .daap .cddb .cdio .vcdimager - endif - endif - endif -endif +# Generated by ./bootstrap from default configuration in src/Distributions +# +include ../distro.mak FORCE: @@ -211,7 +167,7 @@ FORCE: define EXTRACT_GZ rm -rf $@ || true - tar xzf $< --exclude='[*?:<>\|]' + gunzip -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true touch $@ endef @@ -395,7 +351,7 @@ pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz CLEAN_FILE += .pkgcfg CLEAN_PKG += pkgconfig -DISTCLEAN_PKG += pkgconfig-$(PKGCFG_VERSION).tar.gz +DISTCLEAN_PKG += pkg-config-$(PKGCFG_VERSION).tar.gz # *************************************************************************** # gettext @@ -407,14 +363,17 @@ gettext-$(GETTEXT_VERSION).tar.gz: gettext: gettext-$(GETTEXT_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_DARWIN_OS - patch -p 0 < Patches/gettext-macosx.patch + patch -p0 < Patches/gettext-macosx.patch +endif +ifdef HAVE_WIN32 + patch -p0 < Patches/gettext-win32.patch endif .intl: gettext .iconv ifdef HAVE_WIN32 ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java) else - ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java) + ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java --without-emacs) endif ifeq ($(BUILD),i586-pc-beos) # The ugliest kludge ever - so libtool correctly links shared libraries @@ -422,15 +381,15 @@ 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 - ( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install ) +# 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 # Build and install the whole gettext - ( cd $< && make && make install ) + ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install ) endif # Work around another non-sense of autoconf. ifdef HAVE_WIN32 - (cd ../include; sed -i.orig '311 c #if !1' libintl.h) + (cd ../include; sed -i.orig '311 c #if 0' libintl.h) endif $(INSTALL_NAME) touch $@ @@ -449,8 +408,9 @@ libiconv-$(LIBICONV_VERSION).tar.gz: libiconv: libiconv-$(LIBICONV_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_DARWIN_OS - patch -p 0 < Patches/libiconv.patch + patch -p0 < Patches/libiconv.patch endif + patch -p0 < Patches/libiconv-autoconf-uclibc.patch ifdef HAVE_DARWIN_OS .iconv: @@ -477,7 +437,11 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz $(EXTRACT_GZ) .freetype: freetype2 +ifdef HAVE_CYGWIN + (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install) +else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) +endif $(INSTALL_NAME) touch $@ @@ -489,15 +453,19 @@ DISTCLEAN_PKG += freetype-$(FREETYPE2_VERSION).tar.gz # fribidi # *************************************************************************** -fribidi-$(FRIBIDI_VERSION).tar.gz: +fribidi-$(FRIBIDI_VERSION).tar.bz2: $(WGET) $(FRIBIDI_URL) -fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz - $(EXTRACT_GZ) - patch -p 0 < Patches/fribidi.patch.real +fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 + $(EXTRACT_BZ2) + patch -p0 < Patches/fribidi.patch.real ifdef HAVE_WIN32 - patch -p 0 " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) else @@ -680,9 +648,18 @@ endif $(INSTALL_NAME) touch $@ +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 +endif + CLEAN_FILE += .tremor CLEAN_PKG += tremor -DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.gz +#DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.gz # *************************************************************************** # theora @@ -743,19 +720,23 @@ flac-$(FLAC_VERSION).tar.gz: flac: flac-$(FLAC_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_DARWIN_OS - patch -p 0 < Patches/flac-mactel.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/flac-mingw32.patch endif ifneq ($(HOST),$(BUILD)) - (patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf) + (patch -p0 < Patches/flac-cross.patch && cd $@ && autoconf) endif -.FLAC: flac +.flac: flac .ogg ifdef HAVE_WIN32 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) else ifdef HAVE_DARWIN_OS - (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && sed -e 's%-Wl,-syslibroot,%-syslibroot %' -i.orig src/libFLAC/Makefile && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) +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) +else + (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && 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) endif @@ -798,7 +779,7 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz # @echo "*** Please type return here : ***" # cvs -d $(FAAD2_CVSROOT) login # cvs -d $(FAAD2_CVSROOT) co faad2 -# (cd $@; patch -p 0 < ../Patches/faad2.patch) +# (cd $@; patch -p1 < ../Patches/faad2.patch) # (cd $@; sh ./bootstrap) faad2-$(FAAD2_VERSION).tar.bz2: @@ -806,7 +787,7 @@ faad2-$(FAAD2_VERSION).tar.bz2: faad: faad2-$(FAAD2_VERSION).tar.bz2 $(EXTRACT_BZ2) - (cd $@; patch -p 0 < ../Patches/faad2.patch && ./bootstrap) + (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) @@ -826,7 +807,7 @@ faac-$(FAAC_VERSION).tar.bz2: faac: faac-$(FAAC_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/faac.patch + patch -p0 < Patches/faac.patch .faac: faac (cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) @@ -859,18 +840,18 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz # libebml # *************************************************************************** -ifdef SVN -libebml: - $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml -else libebml-$(LIBEBML_VERSION).tar.bz2: $(WGET) $(LIBEBML_URL) +ifdef SVN +libebml: + $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml +else libebml: libebml-$(LIBEBML_VERSION).tar.bz2 $(EXTRACT_BZ2) endif ifdef HAVE_WIN32 - (cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch) + (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch) endif .ebml: libebml @@ -882,6 +863,14 @@ else 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 + CLEAN_FILE += .ebml CLEAN_PKG += libebml DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2 @@ -890,18 +879,18 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2 # libmatroska # *************************************************************************** -ifdef SVN -libmatroska: - $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska -else libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: $(WGET) $(LIBMATROSKA_URL) +ifdef SVN +libmatroska: + $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska +else libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) endif ifdef HAVE_WIN32 - (cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch) + (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch) endif .matroska: libmatroska .ebml @@ -913,6 +902,16 @@ 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 + + CLEAN_FILE += .matroska CLEAN_PKG += libmatroska DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 @@ -922,12 +921,22 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 # *************************************************************************** ffmpeg: - $(SVN) co $(FFMPEG_SVN) ffmpeg + $(SVN) export $(FFMPEG_SVN) ffmpeg + (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-nofile.patch) + (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch) ifeq ($(HOST),i586-pc-beos) - (cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch) + (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif ifdef HAVE_WINCE - patch -p 1 < Patches/ffmpeg-svn-wince.patch + patch -p1 < Patches/ffmpeg-svn-wince.patch +endif +ifdef HAVE_BEOS + (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.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 endif ffmpeg-$(FFMPEG_VERSION).tar.gz: @@ -935,16 +944,29 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz: #ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz # $(EXTRACT_GZ) -# patch -p 0 < Patches/ffmpeg.patch +# patch -p0 < Patches/ffmpeg.patch ifdef HAVE_WINCE .ffmpeg: ffmpeg .zlib else +ifdef HAVE_UCLIBC +.ffmpeg: ffmpeg +else .ffmpeg: ffmpeg .faac .lame 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-network --enable-a52 --disable-ffplay && make install-libs install-headers) +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) 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 +endif + CLEAN_FILE += .ffmpeg CLEAN_PKG += ffmpeg ffmpeg.cvs DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz @@ -953,14 +975,14 @@ DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz # libdvdcss # *************************************************************************** +libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: + $(WGET) $(LIBDVDCSS_URL) + ifdef SVN libdvdcss: - $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss + $(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss cd $@ && sh bootstrap else -libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: - $(WGET) $(LIBDVDCSS_URL) - libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz $(EXTRACT_GZ) endif @@ -970,6 +992,16 @@ endif $(INSTALL_NAME) touch $@ +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 @@ -990,7 +1022,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # rm -rf $@ \ # exit 1; \ # fi -# (cd libdvdread; patch -p 0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap) +# (cd libdvdread; patch -p0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap) #endif #.dvdread: libdvdread .dvdcss @@ -1021,8 +1053,8 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/dvdnav.patch - patch -p 0 < Patches/libdvdnav-mactel.patch + patch -p0 < Patches/dvdnav.patch + patch -p0 < Patches/libdvdnav-mactel.patch (cd $@; ./autogen.sh noconfig) .dvdnav: libdvdnav .dvdcss @@ -1066,9 +1098,18 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz: live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/live.patch - patch -p 0 < Patches/livedotcom-win32.patch - patch -p 0 < Patches/live-osx.patch + 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 + patch -p0 < Patches/live-config.patch +ifdef HAVE_UCLIBC + patch -p0 < Patches/live-noapps.patch +endif .live: live ifdef HAVE_WIN32 @@ -1082,9 +1123,15 @@ ifdef HAVE_DARWIN_OS (cd $<; ./genMakefiles macosx && make) else (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head) +ifdef HAVE_UCLIBC +ifdef HAVE_BIGENDIAN + (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC)) +endif +else (cd $<; ./genMakefiles linux && make $(HOSTCC)) endif endif +endif endif touch $@ @@ -1121,13 +1168,13 @@ goom$(GOOM2k4_VERSION).tar.gz: goom: goom$(GOOM2k4_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_DARWIN_OS - patch -p 0 < Patches/goom.patch + patch -p0 < Patches/goom.patch endif ifdef HAVE_WIN32 (cd $@; dos2unix configure.in) - patch -p 0 < Patches/goom2k4-0-win32.patch + patch -p0 < Patches/goom2k4-0-win32.patch else - patch -p 0 < Patches/goom2k4-0-mmx.patch + patch -p0 < Patches/goom2k4-0-mmx.patch endif .goom2k4: goom @@ -1168,49 +1215,63 @@ DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz # libdca # *************************************************************************** -libdca: - $(SVN) co $(LIBDCA_SVN) libdca - (cd $@; ./bootstrap) +libdca-$(LIBDCA_VERSION).tar.bz2: + $(WGET) $(LIBDCA_URL) + +libdca: libdca-$(LIBDCA_VERSION).tar.bz2 + $(EXTRACT_BZ2) -.libdca: libdca +.dca: libdca (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) touch $@ -CLEAN_FILE += .libdca +CLEAN_FILE += .dca CLEAN_PKG += libdca +DISTCLEAN_PKG += libdca-$(LIBDCA_VERSION).tar.bz2 # *************************************************************************** # libx264 # *************************************************************************** +x264-$(X264_VERSION).tar.gz: + $(WGET) $(X264_URL) + ifdef SVN x264: - $(SVN) co svn://svn.videolan.org/x264/trunk/ x264 + $(SVN) export svn://svn.videolan.org/x264/trunk/ x264 ifdef HAVE_WIN32 - (cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch ) + (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) endif else -x264-$(X264_VERSION).tar.gz: - $(WGET) $(X264_URL) x264: x264-$(X264_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_WIN32 - (cd x264;patch -p 0 <../Patches/x264-20050624-win32.patch) + (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch) else - patch -p 0 < Patches/x264.patch + patch -p0 < Patches/x264.patch rm x264/x264.c endif endif -ifeq ($(HOST),i686-apple-darwin8) -.x264: x264 .nasm +ifdef HAVE_WIN32 +.x264: x264 .pthreads + (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) else .x264: x264 -endif (cd $<; ./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 +endif + CLEAN_FILE += .x264 CLEAN_PKG += x264 DISTCLEAN_PKG += x264-$(X264_VERSION).tar.gz @@ -1296,20 +1357,20 @@ 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 +# +#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 @@ -1324,7 +1385,7 @@ wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz # (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch) .wxwidgets: wxwidgets - (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --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) + (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 $@ @@ -1344,12 +1405,17 @@ qt4: qt4-$(QT4_VERSION)-win32-bin.tar.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;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin) + (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) + (cd qt4;cp bin/*.exe $(PREFIX)/bin) +else + (cd qt4;cp bin/* $(PREFIX)/bin) +endif touch $@ CLEAN_FILE += .qt4 CLEAN_PKG += qt4 -DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz +#DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz # *************************************************************************** # zlib @@ -1360,7 +1426,7 @@ zlib-$(ZLIB_VERSION).tar.gz: zlib: zlib-$(ZLIB_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/zlib.patch + patch -p0 < Patches/zlib.patch .zlib: zlib (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install) @@ -1382,7 +1448,7 @@ pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz: portaudio: pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz $(EXTRACT_GZ) ifneq ($(HOST),$(BUILD)) - (patch -p 0 < Patches/portaudio-cross.patch;cd $@; autoconf) + (patch -p0 < Patches/portaudio-cross.patch;cd $@; autoconf) endif .portaudio: portaudio @@ -1392,7 +1458,7 @@ endif CLEAN_FILE += .portaudio CLEAN_PKG += portaudio -DISTCLEAN_PKG += pa_snapshot_v$(PORTAUDIO__VERSION).tar.gz +DISTCLEAN_PKG += pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz # *************************************************************************** @@ -1405,9 +1471,12 @@ libxml2-$(XML_VERSION).tar.gz: xml: libxml2-$(XML_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_WIN32 - patch -p 0 < Patches/xml2-win32.patch + patch -p0 < Patches/xml2-win32.patch rm -f xml/aclocal.m4 endif +ifdef HAVE_UCLIBC + patch -p0 < Patches/xml2-uclibc.patch +endif .xml: xml (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) @@ -1431,11 +1500,14 @@ twolame-$(TWOLAME_VERSION).tar.gz: twolame: twolame-$(TWOLAME_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_BEOS - patch -p 0 < Patches/twolame-BeOS.patch + patch -p0 < Patches/twolame-BeOS.patch endif .twolame: twolame - (cd twolame; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) +ifdef HAVE_WIN32 + (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h") +endif + (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame && make && make install) $(INSTALL_NAME) touch $@ @@ -1457,14 +1529,14 @@ ifdef HAVE_WIN32 else (cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0) endif - (patch -p 0 < Patches/libpng-makefile.patch) -ifeq ($(HOST),i686-apple-darwin8) - (patch -p 0 < Patches/libpng-darwin-mactel.patch) + (patch -p0 < Patches/libpng-makefile.patch) +ifdef HAVE_DARWIN_OS_ON_INTEL + (patch -p0 < Patches/libpng-darwin-mactel.patch) endif .png: libpng ifdef HAVE_DARWIN_OS - (cd $<; cp scripts/makefile.darwin Makefile && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) else ifdef HAVE_WIN32 (cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install-static) @@ -1505,15 +1577,80 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 # gpg-error # *************************************************************************** -libgpg-error-$(GPGERROR_VERSION).tar.gz: - $(WGET) $(GPGERROR_URL) +# libraw1394 +# *************************************************************************** + +#ifdef SVN +#libraw1394: +# $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394 +# (cd $<; libtoolize --copy --force; \ +# autopoint -f; \ +# aclocal -I extras/contrib/share/aclocal; \ +# autoconf; \ +# autoheader; \ +# automake --add-missing --copy -Wall) +# +#else +libraw1394-$(LIBRAW1394_VERSION).tar.gz: + $(WGET) $(LIBRAW1394_URL) -libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz +libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/libgpg-error.patch +#endif + +.raw1394: libraw1394 + (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install) +# sed 's/^typedef u_int8_t byte_t;/\/* typedef u_int8_t byte_t;\*\//' + touch $@ + +CLEAN_file += .raw1394 +CLEAN_PKG += libraw1394 +DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz + +# *************************************************************************** +# libdc1394 +# *************************************************************************** + +#ifdef SVN +#libdc1394: +# $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394 +# (cd $<; libtoolize --copy --force; \ +# autopoint -f; \ +# aclocal -I extras/contrib/share/aclocal; \ +# autoconf; \ +# autoheader; \ +# automake --add-missing --copy -Wall) +# +#else +libdc1394-$(LIBDC1394_VERSION).tar.gz: + $(WGET) $(LIBDC1394_URL) + +libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz + $(EXTRACT_GZ) +#endif + +.dc1394: libdc1394 + (cd $<; ./configure --prefix=$(PREFIX) && \ + patch -p1 < ../Patches/libdc1394-noexamples.patch && \ + make && make DESTDIR=$(PRFIX) install) + touch $@ + +CLEAN_file += .dc1394 +CLEAN_PKG += libdc1394 +DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz + +# *************************************************************************** +libgpg-error-$(GPGERROR_VERSION).tar.bz2: + $(WGET) $(GPGERROR_URL) + +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 -ifeq ($(HOST),i686-apple-darwin8) +ifdef HAVE_DARWIN_OS_ON_INTEL (cd $<; ./autogen.sh) endif (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install) @@ -1522,7 +1659,7 @@ endif CLEAN_FILE += .gpg-error CLEAN_PKG += libgpg-error -DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz +DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.bz2 # *************************************************************************** # libgcrypt @@ -1533,14 +1670,14 @@ libgcrypt-$(GCRYPT_VERSION).tar.bz2: libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/gcrypt.patch + patch -p0 < Patches/gcrypt.patch .gcrypt: libgcrypt .gpg-error ifdef HAVE_WIN32 - (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-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)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install) else -ifeq ($(HOST),i686-apple-darwin8) - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install) +ifdef HAVE_DARWIN_OS_ON_INTEL + (cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install) endif (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) endif @@ -1560,13 +1697,16 @@ gnutls-$(GNUTLS_VERSION).tar.bz2: 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) +endif .gnutls: gnutls .gcrypt .gpg-error ifdef HAVE_WIN32 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --program-prefix="" && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install) + (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make && cd ../lgl && make && cd ../lib &&make && make install && cd ../includes && make install) else - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx && cd gl && make && cd ../lgl && make && cd ../lib &&make && make install && cd ../includes && make install) endif $(INSTALL_NAME) touch $@ @@ -1584,7 +1724,7 @@ libopendaap-$(DAAP_VERSION).tar.bz2: libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/daap.patch + patch -p0 < Patches/daap.patch .opendaap: libopendaap (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install) @@ -1604,7 +1744,7 @@ glib-$(GLIB_VERSION).tar.gz: glib: glib-$(GLIB_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/glib.patch + patch -p0 < Patches/glib.patch .glib: glib (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install) @@ -1624,11 +1764,11 @@ libIDL-$(LIBIDL_VERSION).tar.gz: libIDL: libIDL-$(LIBIDL_VERSION).tar.gz $(EXTRACT_GZ) -.libidl: libIDL +.IDL: libIDL (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install ) touch $@ -CLEAN_FILE += .libidl +CLEAN_FILE += .IDL CLEAN_PKG += libIDL DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz @@ -1674,7 +1814,7 @@ glib-19990228.zip: CLEAN_FILE += .gecko-win32 CLEAN_PKG += gecko-sdk-win32 -DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.7.5.zip libIDL-0.6.3-win32-bin.zip vc71-glib-1.2.10-bin.zip +DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip # *************************************************************************** # mozilla @@ -1729,6 +1869,7 @@ ifdef HAVE_WIN32 else (cd $<; ./configure --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) && make -C port &&make -C libtiff && make -C libtiff install) endif + $(INSTALL_NAME) touch $@ CLEAN_FILE += .tiff @@ -1763,7 +1904,7 @@ SDL_image-$(SDL_IMAGE_VERSION).tar.gz: SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/SDL_image.patch + patch -p0 < Patches/SDL_image.patch .SDL_image: SDL_image .SDL .png .jpeg .tiff (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install) @@ -1783,10 +1924,8 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/mpcdec.patch -ifdef HAVE_WIN32 - (cd $@; ./autogen.sh) -endif + patch -p0 < Patches/mpcdec.patch + (cd $@; autoreconf -vif) .mpcdec: mpcdec ifdef HAVE_WIN32 @@ -1813,15 +1952,21 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_DARWIN_OS - patch -p 0