X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=fc3e434661f378a3de66793db6069865df852b68;hb=ca0d8dc71f0b9250b2afb5f672c720970c87ab67;hp=9fec7482a2f91ac60a2b89f801e6dd4e0d50e9e9;hpb=132bf65db16a3496f2b14bb219b90695bdec3b86;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 9fec7482a2..fc3e434661 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1,13 +1,13 @@ #*************************************************************************** # src/Makefile : Dearchive and compile all files necessary # *************************************************************************** -# Copyright (C) 2003 - 2007 the VideoLAN team +# Copyright (C) 2003 - 2008 the VideoLAN team # $Id$ # # Authors: Christophe Massiot # Derk-Jan Hartman # Eric Petit -# Felix Kühne +# Felix Paul Kühne # Christophe Mutricy # Gildas Bazin # Damien Fouilleul @@ -101,7 +101,7 @@ ifneq ($(BUILD),$(HOST)) # ifndef HAVE_CYGWIN # We are REALLY cross compiling - FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile + FFMPEGCONF=--cross-prefix=$(HOST)- --enable-cross-compile X264CONF=--host=$(HOST) PTHREADSCONF="CROSS=$(HOST)-" else @@ -115,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 @@ -132,7 +132,7 @@ endif 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 @@ -151,6 +151,8 @@ ifdef HAVE_DARWIN_OS X264CONF += --enable-pic ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF +else +FFMPEGCONF += --disable-altivec endif endif @@ -257,17 +259,39 @@ CLEAN_FILE += .autoconf CLEAN_PKG += autoconf DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2 +# *************************************************************************** +# gnumake +# *************************************************************************** + +make-$(GNUMAKE_VERSION).tar.bz2: + $(WGET) $(GNUMAKE_URL) + +gnumake: make-$(GNUMAKE_VERSION).tar.bz2 + $(EXTRACT_BZ2) + +.gnumake: gnumake +ifdef HAVE_DARWIN_OS +ifndef HAVE_DARWIN_9 + (cd $<; ./configure --prefix=$(PREFIX) && make && make install) +endif +endif + touch $@ + +CLEAN_FILE += .gnumake +CLEAN_PKG += gnumake +DISTCLEAN_PKG += make-$(GNUMAKE_VERSION).tar.bz2 + # *************************************************************************** # CMake # *************************************************************************** -# cmake-$(CMAKE_VERSION).tar.gz: -# $(WGET) $(CMAKE_URL) -# -# cmake: cmake-$(CMAKE_VERSION).tar.gz -# $(EXTRACT_GZ) +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: +# cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake .cmake: cmake (cd $<; ./configure --prefix=$(PREFIX) && make && make install) @@ -366,6 +390,9 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz ifdef HAVE_WIN32 patch -p0 < Patches/gettext-win32.patch endif +ifdef HAVE_DARWIN_OS + patch -p0 < Patches/gettext-macosx.patch +endif .intl: gettext .iconv ifdef HAVE_WIN32 @@ -441,7 +468,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) @@ -450,7 +477,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 @@ -563,6 +590,7 @@ libid3tag-$(LIBID3TAG_VERSION).tar.gz: libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz $(EXTRACT_GZ) + patch -d libid3tag -p0 < Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch .id3tag: libid3tag (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) @@ -573,6 +601,24 @@ CLEAN_FILE += .id3tag CLEAN_PKG += libid3tag DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz +# *************************************************************************** +# pcre +# *************************************************************************** + +pcre-$(PCRE_VERSION).tar.bz2: + $(WGET) $(PCRE_URL) + +pcre: pcre-$(PCRE_VERSION).tar.bz2 + $(EXTRACT_BZ2) + +.pcre: pcre + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install ) + touch $@ + +CLEAN_FILE += .pcre +CLEAN_PKG += pcre +DISTCLEAN_PKG += pcre-$(PCRE_VERSION).tar.bz2 + # *************************************************************************** # lua # *************************************************************************** @@ -675,6 +721,9 @@ libvorbis-$(VORBIS_VERSION).tar.gz: libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/libvorbis.patch + patch -d libvorbis -p0 < Patches/libvorbis-r14598-CVE-2008-1420.patch + patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1419.patch + patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1423.patch (cd $@; autoconf) .vorbis: libvorbis .ogg @@ -737,6 +786,7 @@ libtheora-$(THEORA_VERSION).tar.bz2: libtheora: libtheora-$(THEORA_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/theora.patch + patch -p0 < Patches/libtheora-includes.patch (cd $@; autoconf) .theora: libtheora .ogg @@ -1017,7 +1067,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ifdef SVN ffmpeg: - $(SVN) co $(FFMPEG_SVN) ffmpeg + $(SVN) co $(FFMPEG_SVN) ffmpeg -r 13752 ifeq ($(HOST),i586-pc-beos) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif @@ -1029,16 +1079,16 @@ ifdef HAVE_BEOS endif ifdef HAVE_DARWIN_OS (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) + (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch) endif ifdef NO_TEXT_RELOCATION - (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch) + (cd $@; patch -p1 < ../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-libavformat.patch endif - else ffmpeg-$(FFMPEG_VERSION).tar.gz: echo "ffmpeg snapshot is too old, you MUST use subversion !" @@ -1058,7 +1108,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 --disable-devices && 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 --disable-protocols && make && make install-libs install-headers) touch $@ ifdef SVN @@ -1069,7 +1120,7 @@ SOURCE += ffmpeg-source endif CLEAN_FILE += .ffmpeg -CLEAN_PKG += ffmpeg ffmpeg.cvs +CLEAN_PKG += ffmpeg DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz # *************************************************************************** @@ -1107,11 +1158,34 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** # dummy dvdread to trigger the INSTALL_NAME script # *************************************************************************** -.dvdread: .dvdnav +# .dvdread: .dvdnav +# $(INSTALL_NAME) +# touch $@ +# +# CLEAN_FILE += .dvdread + +# *************************************************************************** +# libdvdread: We use dvdnav's dvdread +# *************************************************************************** + +libdvdread-$(LIBDVDREAD_VERSION).tar.gz: + $(WGET) $(LIBDVDREAD_URL) + +libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz + $(EXTRACT_GZ) +#ifdef HAVE_WIN32 + patch -p 0 < Patches/libdvdread-win32.patch + (cd $@; ./bootstrap ) +#endif + +.libdvdread: libdvdread .dvdcss + (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ -CLEAN_FILE += .dvdread +CLEAN_FILE += .libdvdread +CLEAN_PKG += libdvdread +DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz # *************************************************************************** # libdvdnav @@ -1120,10 +1194,7 @@ CLEAN_FILE += .dvdread ifdef SVN libdvdnav: $(SVN) co $(LIBDVDNAV_SVN) libdvdnav - patch -p0 < Patches/libdvdnav.patch -ifdef HAVE_WIN32 - patch -p0 < Patches/libdvdnav-win32.patch -endif + patch -d libdvdnav -p0 < Patches/libdvdnav.patch (cd $@; ./autogen.sh noconfig) else libdvdnav-$(LIBDVDNAV_VERSION).tar.gz: @@ -1138,7 +1209,7 @@ endif (cd $@; ./autogen.sh noconfig) endif -.dvdnav: libdvdnav .dvdcss +.dvdnav: libdvdnav .libdvdread .dvdcss ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install) else @@ -1244,10 +1315,11 @@ goom: goom$(GOOM2k4_VERSION).tar.gz ifdef HAVE_DARWIN_OS patch -p0 < Patches/goom.patch endif - patch -p0 < Patches/goom2k4-0-mmx.patch ifdef HAVE_WIN32 (cd $@; dos2unix configure.in) patch -p0 < Patches/goom2k4-0-win32.patch +else + patch -p0 < Patches/goom2k4-0-mmx.patch endif .goom2k4: goom @@ -1318,9 +1390,9 @@ DISTCLEAN_PKG += libdca-$(LIBDCA_VERSION).tar.bz2 x264-$(X264_VERSION).tar.gz: $(WGET) $(X264_URL) -ifdef SVN -x264: - $(SVN) co svn://svn.videolan.org/x264/trunk/ x264 +ifdef GIT +x264: + $(GIT) clone git://git.videolan.org/x264.git patch -p0 < Patches/x264-svn-info-threads.patch ifdef HAVE_WIN32 (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) @@ -1328,6 +1400,7 @@ endif ifdef HAVE_DARWIN_OS (cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch ) endif + else x264: x264-$(X264_VERSION).tar.gz @@ -1350,8 +1423,13 @@ ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) endif else -.x264: x264 +ifdef HAVE_DARWIN_OS_ON_INTEL + .x264: x264 .yasm + (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) +else + .x264: x264 (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) +endif endif touch $@ @@ -1375,6 +1453,9 @@ libmodplug-$(MODPLUG_VERSION).tar.gz: libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz $(EXTRACT_GZ) +#ifdef HAVE_WIN32 + patch -p0 < Patches/libmodplug-win32.patch +#end .mod: libmodplug (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) @@ -1435,9 +1516,10 @@ libcdio-$(CDIO_VERSION).tar.gz: libcdio: libcdio-$(CDIO_VERSION).tar.gz $(EXTRACT_GZ) + patch -p0 < Patches/libcdio-install-cdparanoia-pc.patch .cdio: libcdio - (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install) + (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && autoreconf -fisv && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install) touch $@ CLEAN_FILE += .cdio @@ -1485,7 +1567,7 @@ endif CLEAN_FILE += .qt4_win32 CLEAN_PKG += qt4_win32 -DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz +DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.bz2 # *************************************************************************** # qt4 (trolltech binaries) @@ -1602,9 +1684,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) @@ -1784,7 +1866,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 $@ @@ -1803,14 +1885,13 @@ 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) --disable-shared --enable-static --disable-nls && 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) -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 $@ @@ -1819,6 +1900,24 @@ CLEAN_FILE += .gcrypt CLEAN_PKG += libgcrypt DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.bz2 +# *************************************************************************** +# opencdk (requires by gnutls 2.x) +# *************************************************************************** + +opencdk-$(OPENCDK_VERSION).tar.bz2: + $(WGET) $(OPENCDK_URL) + +opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2 + $(EXTRACT_BZ2) + +.opencdk: opencdk + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install) + touch $@ + +CLEAN_FILE += .opencdk +CLEAN_PKG += opencdk +DISTCLEAN_PKG += opencdk-$(OPENCDK_VERSION).tar.bz2 + # *************************************************************************** # gnutls # *************************************************************************** @@ -1830,14 +1929,14 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 $(EXTRACT_BZ2) ifdef HAVE_WIN32 patch -p0 < Patches/gnutls-win32.patch - (cd $@; cd lgl; ln -sf alloca_.h alloca.h) + (cd $@; cd lgl; ln -sf alloca_.h alloca.h;) endif -.gnutls: gnutls .gcrypt .gpg-error +.gnutls: gnutls .opencdk .gcrypt .gpg-error ifdef HAVE_WIN32 - (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) + (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls && cd lgl && make && cd ../gl && make && cd ../lib &&make && make install && cd ../includes && make install) else - (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) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install) endif $(INSTALL_NAME) touch $@ @@ -2184,27 +2283,22 @@ CLEAN_PKG += clinkcc DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz # *************************************************************************** -# NASM assembler +# YASM assembler # *************************************************************************** -nasm-$(NASM_VERSION).tar.bz2: - $(WGET) $(NASM_URL) - -nasm: nasm-$(NASM_VERSION).tar.bz2 - $(EXTRACT_BZ2) +yasm-$(YASM_VERSION).tar.gz: + $(WGET) $(YASM_URL) -#nasm: -# echo $(NASM_CVSROOT) A > ./nasm.cvs -# CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm -# (cd $@ && autoconf && autoheader) +yasm: yasm-$(YASM_VERSION).tar.gz + $(EXTRACT_GZ) -.nasm: nasm +.yasm: yasm (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install) touch $@ -CLEAN_FILE += .nasm -CLEAN_PKG += nasm nasm.cvs -DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2 +CLEAN_FILE += .yasm +CLEAN_PKG += yasm +DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2 # *************************************************************************** # Copy aclocal files @@ -2246,12 +2340,15 @@ taglib-$(TAGLIB_VERSION).tar.gz: taglib: taglib-$(TAGLIB_VERSION).tar.gz $(EXTRACT_GZ) +ifdef HAVE_WIN32 + patch -p0 < Patches/taglib.patch +endif ifdef HAVE_CYGWIN - patch -p0