X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=5de3966f8d3101c7772d18b62e449fc7de4cde29;hb=bde69111f30b2466ee3f22628060184558b14513;hp=2321f40c47795addf552a1e885551d96f67af083;hpb=c02bd245d624e980e5bc6601b2ca9050727d3e19;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 2321f40c47..5de3966f8d 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 @@ -38,10 +38,6 @@ include ./packages.mak export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH) export PKG_CONFIG_PATH export PKG_CONFIG_LIBDIR = $(PREFIX)/lib/pkgconfig -export DYLD_LIBRARY_PATH = $(PREFIX)/lib -# following is required for configure scripts that check dyld libraries -# by building and running a test app -export DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(PREFIX)/vlc-lib export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET) export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH) export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) @@ -105,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 @@ -119,7 +115,7 @@ endif # ifdef HAVE_WIN32 HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-dependency-tracking -FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --disable-debug +FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686 --disable-debug endif ifdef HAVE_WINCE @@ -136,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 @@ -155,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 @@ -261,6 +259,47 @@ 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: +# cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake + +.cmake: cmake + (cd $<; ./configure --prefix=$(PREFIX) && make && make install) + touch $@ + +CLEAN_FILE += .cmake +CLEAN_PKG += cmake + # *************************************************************************** # libtool # *************************************************************************** @@ -351,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 @@ -426,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) @@ -435,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 @@ -548,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) @@ -558,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 # *************************************************************************** @@ -660,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 @@ -722,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 @@ -1002,7 +1067,8 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ifdef SVN ffmpeg: - $(SVN) co $(FFMPEG_SVN) ffmpeg + $(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920 + (cd $@; patch -p0 < ../Patches/ffmpeg-pkg-config.patch) ifeq ($(HOST),i586-pc-beos) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif @@ -1014,16 +1080,17 @@ 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 - + (cd $@; patch -p0 < Patches/ffmpeg-svn-configure.patch ) else ffmpeg-$(FFMPEG_VERSION).tar.gz: echo "ffmpeg snapshot is too old, you MUST use subversion !" @@ -1043,7 +1110,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 @@ -1054,7 +1122,7 @@ SOURCE += ffmpeg-source endif CLEAN_FILE += .ffmpeg -CLEAN_PKG += ffmpeg ffmpeg.cvs +CLEAN_PKG += ffmpeg DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz # *************************************************************************** @@ -1184,6 +1252,14 @@ else endif endif endif + cp $ $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib) +.qt4_win32: qt4_win32 + (cd qt4_win32;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib) ifeq ($(BUILD),i686-pc-cygwin) - (cd qt4;cp bin/*.exe $(PREFIX)/bin) + (cd qt4_win32;cp bin/*.exe $(PREFIX)/bin) else - (cd qt4;cp bin/* $(PREFIX)/bin) + (cd qt4_win32;cp bin/* $(PREFIX)/bin) endif touch $@ -CLEAN_FILE += .qt4 -CLEAN_PKG += qt4 -DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz +CLEAN_FILE += .qt4_win32 +CLEAN_PKG += qt4_win32 +DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.bz2 # *************************************************************************** # qt4 (trolltech binaries) @@ -1470,7 +1558,7 @@ DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz qt-win-opensource-$(QT4T_VERSION)-mingw.exe: wget $(QT4T_URL) -Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe +Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe mkdir Qt 7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib \$$OUTDIR/bin\ /translations mv Qt/\$$OUTDIR/bin\ /* Qt/ && rmdir Qt/\$$OUTDIR/bin\ Qt/\$$OUTDIR @@ -1482,7 +1570,7 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe 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 +.Qt_win32: Qt_win32 mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig $(PREFIX)/share/qt4/translations cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin cp -r Qt/include/QtCore Qt/include/QtGui $(PREFIX)/include/qt4 @@ -1492,18 +1580,18 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe cp Qt/translations/* $(PREFIX)/share/qt4/translations touch $@ -CLEAN_FILE += .Qt -CLEAN_PKG += Qt +CLEAN_FILE += .Qt_win32 +CLEAN_PKG += Qt_win32 DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe # *************************************************************************** # qt4 (source-code compilation for Mac) # *************************************************************************** -qt-mac-opensource-src-$(QT4_VERSION).tar.gz: +qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz: $(WGET) $(QT4_MAC_URL) -qt4_mac: qt-mac-opensource-src-$(QT4_VERSION).tar.gz +qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz $(EXTRACT_GZ) .qt4_mac: qt4_mac @@ -1512,7 +1600,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_VERSION).tar.gz CLEAN_FILE += .qt4_mac CLEAN_PKG += qt4_mac -DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_VERSION).tar.gz +DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz # *************************************************************************** # zlib @@ -1578,9 +1666,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) @@ -1760,7 +1848,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 $@ @@ -1779,14 +1867,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 $@ @@ -1795,6 +1882,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 # *************************************************************************** @@ -1806,14 +1911,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 $@ @@ -2160,27 +2265,22 @@ CLEAN_PKG += clinkcc DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz # *************************************************************************** -# NASM assembler +# YASM assembler # *************************************************************************** -nasm-$(NASM_VERSION).tar.bz2: - $(WGET) $(NASM_URL) +yasm-$(YASM_VERSION).tar.gz: + $(WGET) $(YASM_URL) -nasm: nasm-$(NASM_VERSION).tar.bz2 - $(EXTRACT_BZ2) - -#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 @@ -2222,12 +2322,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