X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=faa05e634f3ba005b277d85cbf49e0b00305f1cb;hb=8f77cb70b92aa2ffc78d21aafcf0d8022b6ebac4;hp=d2c57a8f836dbb144d80bf4a5a968c504b103e5a;hpb=3bf4e344cd0b39bfa424ec7f568c72ed740dc1ab;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index d2c57a8f83..faa05e634f 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1,15 +1,16 @@ -# *************************************************************************** +#*************************************************************************** # 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 # Derk-Jan Hartman # Eric Petit # Felix Kühne -# Christophe Mutricy +# Christophe Mutricy # Gildas Bazin +# Damien Fouilleul # # 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 @@ -35,6 +36,7 @@ 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 @@ -81,15 +83,30 @@ else HOSTCC2=$(HOSTCC) endif +# For ffmpeg if not cross compiling +ifneq ($(CC),) + FFMPEGCONF=--cc="$(CC)" +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)) -# We are cross compiling -HOSTCONF=--host=$(HOST) --build=$(BUILD) -FFMPEGCONF=--cross-prefix=$(HOST)- -X264CONF=--crosscompile=$(HOST) -else - ifneq ($(CC),) - FFMPEGCONF=--cc="$(CC)" - endif + # + # Compiling for MinGW under Cygwin could be deemed as cross compiling + # unfortunately there isn't a complete separate GCC toolchain for MinGW under Cygwin + # + ifeq ($(findstring cygwin,$(BUILD)),) + # We are REALLY cross compiling + FFMPEGCONF=--cross-prefix=$(HOST)- + X264CONF=--crosscompile=$(HOST) + PTHREADSCONF="CROSS=$(HOST)-" + else + # We are compiling for MinGW on Cygwin + PTHREADSCONF=$(HOSTCC) + endif endif # @@ -108,12 +125,18 @@ FFMPEGCONF+= --enable-mp3lame --enable-faac endif ifdef HAVE_BEOS -FFMPEGCONF+= --cpu=x86 +FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos endif ifeq ($(HOST),i686-apple-darwin8) FFMPEGCONF += --enable-memalign-hack -X264CONF += --enable-pic +endif + +ifdef HAVE_DARWIN_OS +X264CONF += --enable-pic --enable-debug +ifneq ($(HOST),i686-apple-darwin8) +FFMPEG_CFLAGS += -DHAVE_LRINTF +endif endif # *************************************************************************** @@ -122,18 +145,15 @@ endif 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 .x264 .caca .mod \ - .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \ - .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \ - .libdca + .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 \ + .libdca .tag .x264 .goom2k4 .aclocal # .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 -ifneq ($(HOST),i686-apple-darwin8) -all: .goom2k4 -endif else ifdef HAVE_BEOS @@ -143,14 +163,16 @@ else .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 .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \ + .FLAC .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \ .dvdnav .dvbpsi .aclocal .libdca endif + #.speex else ifdef HAVE_WIN32 @@ -160,24 +182,26 @@ else .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .live .goom2k4 .caca .mod .x264 .xml .twolame \ .png .gpg-error .gcrypt .gnutls .mpcdec \ - .gnutls .dvdnav .dvbpsi .wxwidgets .dirac \ - .dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca + .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 + 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\ - .gnutls .dvdnav .dvbpsi .wxwidgets .dirac \ - .aclocal .libdca + .live .goom2k4 .caca .mod .x264 .xml .twolame \ + .png .gpg-error .gcrypt .gnutls .mpcdec \ + .dvdnav .dvbpsi .wxwidgets .dirac \ + .aclocal .libdca .libraw1394 .libdc1394 +# .png .gpg-error .gcrypt .gnutls .mpcdec\ # .SDL_image .daap .cddb .cdio .vcdimager endif endif @@ -191,17 +215,26 @@ FORCE: # *************************************************************************** define EXTRACT_GZ - tar xzf $< + rm -rf $@ || true + tar xzf $< --exclude='[*?:<>\|]' mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true touch $@ endef define EXTRACT_BZ2 - bunzip2 -c $< | tar xf - + rm -rf $@ || true + bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.bz2,%,$(notdir $<)) $@ || true touch $@ endef +define EXTRACT_ZIP + rm -rf $@ || true + unzip $< + mv $(patsubst %.zip,%,$(notdir $<)) $@ || true + touch $@ +endef + ### Darwin-specific ### # These macros prepare the dynamic libraries for inclusion in the Mac OS X # bundle. For instance if you're building a library named libtoto.dylib, @@ -283,11 +316,11 @@ endif # autoconf # *************************************************************************** -autoconf-$(AUTOCONF_VERSION).tar.gz: +autoconf-$(AUTOCONF_VERSION).tar.bz2: $(WGET) $(AUTOCONF_URL) -autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz - $(EXTRACT_GZ) +autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2 + $(EXTRACT_BZ2) .autoconf: autoconf (cd $<; ./configure --prefix=$(PREFIX) && make && make install) @@ -295,7 +328,7 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz CLEAN_FILE += .autoconf CLEAN_PKG += autoconf -DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz +DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2 # *************************************************************************** # libtool @@ -353,15 +386,16 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz # pkgconfig # *************************************************************************** -pkgconfig-$(PKGCFG_VERSION).tar.gz: +pkg-config-$(PKGCFG_VERSION).tar.gz: $(WGET) $(PKGCFG_URL) -pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz +pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz $(EXTRACT_GZ) patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch + patch -d pkgconfig -p0 < Patches/pkgcfg.patch .pkgcfg: pkgconfig - (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) + (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) touch $@ CLEAN_FILE += .pkgcfg @@ -378,15 +412,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 - (cd $@; ./autogen.sh) + 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)) + ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java) else - ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) ) + ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java) endif ifeq ($(BUILD),i586-pc-beos) # The ugliest kludge ever - so libtool correctly links shared libraries @@ -402,7 +438,7 @@ else endif # Work around another non-sense of autoconf. ifdef HAVE_WIN32 - (cd ../include; sed -i.orig '283 c #if !1' libintl.h) + (cd ../include; sed -i.orig '311 c #if !1' libintl.h) endif $(INSTALL_NAME) touch $@ @@ -421,7 +457,7 @@ 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 ifdef HAVE_DARWIN_OS @@ -429,7 +465,7 @@ ifdef HAVE_DARWIN_OS touch $@ else .iconv: libiconv - (cd libiconv; CPPFLAGS="-Dssize_t=long" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) + (cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) $(INSTALL_NAME) touch $@ endif @@ -466,9 +502,9 @@ fribidi-$(FRIBIDI_VERSION).tar.gz: fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/fribidi.patch.real + patch -p0 < Patches/fribidi.patch.real ifdef HAVE_WIN32 - patch -p 0 ./ffmpeg.cvs - CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg + $(SVN) co $(FFMPEG_SVN) ffmpeg ifeq ($(HOST),i586-pc-beos) - (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch) -endif -ifdef HAVE_WIN32 - patch -p 0 < Patches/ffmpeg-cvs-win32.patch + (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif ifdef HAVE_WINCE - patch -p 1 < Patches/ffmpeg-cvs-wince.patch + patch -p1 < Patches/ffmpeg-svn-wince.patch endif -ifeq ($(HOST),i686-apple-darwin8) - (cd $@;patch -p 0 < ../Patches/ffmpeg-cvs-mactel.patch) +ifdef HAVE_WIN32 + (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch) +endif +ifdef HAVE_BEOS + (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch) endif ffmpeg-$(FFMPEG_VERSION).tar.gz: @@ -908,14 +949,14 @@ 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 .ffmpeg: ffmpeg .faac .lame endif - (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(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) + (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 --enable-swscaler && make install-libs install-headers) touch $@ CLEAN_FILE += .ffmpeg @@ -963,7 +1004,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 @@ -994,8 +1035,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 @@ -1039,9 +1080,9 @@ 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 + patch -p0 < Patches/livedotcom-win32.patch + patch -p0 < Patches/live-osx.patch .live: live ifdef HAVE_WIN32 @@ -1054,7 +1095,8 @@ ifdef HAVE_DARWIN_OS (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx) (cd $<; ./genMakefiles macosx && make) else - (cd $<;./genMakefiles linux && make $(HOSTCC)) + (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head) + (cd $<; ./genMakefiles linux && make $(HOSTCC)) endif endif endif @@ -1093,11 +1135,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 $(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) + touch $@ + +CLEAN_FILE += .qt4 +CLEAN_PKG += qt4 +DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz + # *************************************************************************** # zlib # *************************************************************************** @@ -1310,10 +1375,10 @@ 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) + (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install) $(INSTALL_NAME) touch $@ @@ -1332,7 +1397,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 @@ -1355,12 +1420,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 .xml: xml - (cd xml; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --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 && make && make install) ifndef HAVE_DARWIN_OS $(INSTALL_NAME) endif @@ -1380,9 +1445,18 @@ twolame-$(TWOLAME_VERSION).tar.gz: twolame: twolame-$(TWOLAME_VERSION).tar.gz $(EXTRACT_GZ) +ifdef HAVE_BEOS + patch -p0 < Patches/twolame-BeOS.patch +endif +ifdef HAVE_DARWIN_OS + patch -p0 < Patches/twolame-osx.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) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame && make && make install) $(INSTALL_NAME) touch $@ @@ -1404,6 +1478,10 @@ 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 -p0 < Patches/libpng-makefile.patch) +ifeq ($(HOST),i686-apple-darwin8) + (patch -p0 < Patches/libpng-darwin-mactel.patch) +endif .png: libpng ifdef HAVE_DARWIN_OS @@ -1411,8 +1489,12 @@ ifdef HAVE_DARWIN_OS else ifdef HAVE_WIN32 (cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install-static) +else +ifeq ($(PNG_VERSION),1.2.8) + (cd $<; PREFIX=$(PREFIX) DESTDIR=$(PREFIX) cp scripts/makefile.linux Makefile && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) +endif endif $(INSTALL_NAME) endif @@ -1444,11 +1526,77 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 # gpg-error # *************************************************************************** +# libraw1394 +# *************************************************************************** + +#ifdef SVN +#libraw1394: +# $(SVN) co -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) + +libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz + $(EXTRACT_GZ) +#endif + +.libraw1394: libraw1394 + (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install) + touch $@ + +CLEAN_file += .libraw1394 +CLEAN_PKG += libraw1394 +DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION) + +# *************************************************************************** +# libdc1394 +# *************************************************************************** + +#ifdef SVN +#libdc1394: +# $(SVN) co -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 + +.libdc1394: libdc1394 + (cd $<; ./configure --prefix=$(PREFIX) && \ + patch -p1 < ../Patches/libdc1394-noexamples.patch && \ + make && make DESTDIR=$(PRFIX) install) + touch $@ + +CLEAN_file += .libdc1394 +CLEAN_PKG += libdc1394 +DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION) + +# *************************************************************************** libgpg-error-$(GPGERROR_VERSION).tar.gz: $(WGET) $(GPGERROR_URL) libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz $(EXTRACT_GZ) + patch -p0 < Patches/libgpg-error.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/libgpg-error-win32.patch +endif .gpg-error: libgpg-error ifeq ($(HOST),i686-apple-darwin8) @@ -1471,14 +1619,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)" && 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 $<; ./autogen.sh) + (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 @@ -1498,11 +1646,13 @@ gnutls-$(GNUTLS_VERSION).tar.bz2: gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 $(EXTRACT_BZ2) +ifdef HAVE_WIN32 patch -p0 < Patches/gnutls-win32.patch +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 $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && 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) endif @@ -1522,7 +1672,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) @@ -1542,7 +1692,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) @@ -1657,21 +1807,17 @@ DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz tiff-$(TIFF_VERSION).tar.gz: $(WGET) $(TIFF_URL) - mv tiff-$(TIFF_VERSION)-tar.gz $@ tiff: tiff-$(TIFF_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/tiff.patch -ifneq ($(HOST),$(BUILD)) - patch -p 0 < Patches/tiff-cross.patch -endif .tiff: tiff ifdef HAVE_WIN32 - (cd $<; ./configure --noninteractive --target=$(HOST) --with-CC=$(HOST)-gcc --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install) + (cd $<; ./configure --target=i586-mingw32msvc --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) --host=$(HOST) &&make -C port && make -C libtiff && make -C libtiff install) else - (cd $<; ./configure --noninteractive --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install) + (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 @@ -1687,10 +1833,9 @@ SDL-$(SDL_VERSION).tar.gz: SDL: SDL-$(SDL_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/SDL.patch .SDL: SDL - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --enable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install) $(INSTALL_NAME) touch $@ @@ -1707,10 +1852,10 @@ 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) --enable-tif CFLAGS="$(CFLAGS)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install) $(INSTALL_NAME) touch $@ @@ -1727,7 +1872,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/mpcdec.patch + patch -p0 < Patches/mpcdec.patch ifdef HAVE_WIN32 (cd $@; ./autogen.sh) endif @@ -1757,10 +1902,10 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_DARWIN_OS - patch -p 0