X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=2e80d5a8d1158e499da95975f98893bd9fe2ed71;hb=8faa8a8fc0fedeb05517e8ff9d86e4d1649605e7;hp=f2210b032e973b8982ed55be4e66ef6e0449f946;hpb=435bc6686ad62d7651c0179d7be4a67103dd4ba8;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index f2210b032e..2e80d5a8d1 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -125,7 +125,7 @@ endif ifdef HAVE_WINCE HOSTCONF+= --without-pic --disable-shared -FFMPEGCONF+= --arch=armv4l --cpu=armv4t --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 +FFMPEGCONF+= --target-os=mingw32ce --arch=armv4l --cpu=armv4t --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 @@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree endif ifdef HAVE_LINUX +FFMPEGCONF+= --target-os=linux ifdef HAVE_MAEMO ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),) FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 @@ -376,9 +377,6 @@ gettext-$(GETTEXT_VERSION).tar.gz: gettext: gettext-$(GETTEXT_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WIN32 - patch -p0 < Patches/gettext-win32.patch -endif ifdef HAVE_DARWIN_OS patch -p0 < Patches/gettext-macosx.patch endif @@ -392,18 +390,18 @@ endif ifneq ($(HOST),$(BUILD)) ifndef HAVE_CYGWIN # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap - ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install ) + ( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install ) else # We are compiling for MinGW on Cygwin -- build the full current gettext - ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install ) + ( cd $< && make && make install ) endif else # Build and install the whole gettext - ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install ) + ( cd $< && make && make install ) endif # Work around another non-sense of autoconf. ifdef HAVE_WIN32 - (cd $(PREFIX)/include; sed -i.orig '311 c #if 0' libintl.h) + (cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h) endif $(INSTALL_NAME) touch $@ @@ -475,7 +473,7 @@ endif .fontconfig: fontconfig .xml .freetype ifdef HAVE_WIN32 ifdef HAVE_CYGWIN - (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) + (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 --disable-docs && make && make install) endif @@ -575,29 +573,6 @@ CLEAN_FILE += .mpeg2 CLEAN_PKG += libmpeg2 DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz -# *************************************************************************** -# libid3tag -# *************************************************************************** - -libid3tag-$(LIBID3TAG_VERSION).tar.gz: - $(WGET) $(LIBID3TAG_URL) - -libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz - $(EXTRACT_GZ) - patch -d libid3tag -p0 < Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch -ifdef HAVE_DARWIN_OS - ( cd $@; sed -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig configure ) -endif - -.id3tag: libid3tag - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) - $(INSTALL_NAME) - touch $@ - -CLEAN_FILE += .id3tag -CLEAN_PKG += libid3tag -DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz - # *************************************************************************** # pcre # *************************************************************************** @@ -693,7 +668,7 @@ libogg-$(OGG_VERSION).tar.gz: libogg: libogg-$(OGG_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/ogg.patch + patch -p0 < Patches/libogg-inttypes.patch patch -p0 < Patches/libogg-1.1.patch ifdef HAVE_WINCE patch -p0 < Patches/libogg-wince.patch @@ -909,24 +884,6 @@ CLEAN_FILE += .faad CLEAN_PKG += faad2 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz -# *************************************************************************** -# lame -# *************************************************************************** - -lame-$(LAME_VERSION).tar.gz: - $(WGET) $(LAME_URL) - -lame: lame-$(LAME_VERSION).tar.gz - $(EXTRACT_GZ) - -.lame: lame - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) - touch $@ - -CLEAN_FILE += .lame -CLEAN_PKG += lame -DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz - # *************************************************************************** # libebml # *************************************************************************** @@ -936,16 +893,10 @@ libebml-$(LIBEBML_VERSION).tar.bz2: libebml: libebml-$(LIBEBML_VERSION).tar.bz2 $(EXTRACT_BZ2) -ifdef HAVE_WIN32 - (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch) -endif -ifdef HAVE_WIN64 - patch -p0 < Patches/libebml-win64.patch -endif .ebml: libebml ifdef HAVE_WIN32 - (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2)) + (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC)) else (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) $(RANLIB) $(PREFIX)/lib/libebml.a @@ -965,16 +916,12 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p0 < ./Patches/libmatroska-kaxblock.patch -ifdef HAVE_WIN32 - (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch) -endif .matroska: libmatroska .ebml ifdef HAVE_WIN32 - (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2)) + (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC)) else - (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) + (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) $(RANLIB) $(PREFIX)/lib/libmatroska.a endif touch $@ @@ -984,6 +931,66 @@ CLEAN_FILE += .matroska CLEAN_PKG += libmatroska DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 + +# *************************************************************************** +# libvp8 +# *************************************************************************** + +#ibvpx-$(VPX_VERSION).tar.bz2: +#$(WGET) $(VPX_URL) + +libvpx: + $(GIT) clone git://review.webmproject.org/libvpx.git + +ifdef HAVE_WIN32 +VPX_TARGET=x86-win32-gcc +CROSS= +else +ifdef HAVE_DARWIN_OS +ifdef HAVE_DARWIN_64 +VPX_TARGET=x86_64-darwin9-gcc +else +ifdef HAVE_DARWIN_OS_ON_INTEL +VPX_TARGET=x86-darwin9-gcc +else +VPX_TARGET=ppc32-darwin9-gcc +endif +endif +else +VPX_TARGET=FIXME +endif +endif + +.libvpx: libvpx + (cd $<; CROSS=$(HOST)- ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make install) + (rm -rf $(PREFIX)/include/vpx/ && mkdir $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install? + rm $(PREFIX)/include/vpx/config.h + (cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install? + touch $@ + +CLEAN_FILE += .libvpx +CLEAN_PKG += libvpx +#DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2 + +# *************************************************************************** +# lame +# *************************************************************************** + +lame-$(LAME_VERSION).tar.gz: + $(WGET) $(LAME_URL) + +lame: lame-$(LAME_VERSION).tar.gz + $(EXTRACT_GZ) + +.lame: lame + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) + touch $@ + +CLEAN_FILE += .lame +CLEAN_PKG += lame +DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz + + # *************************************************************************** # libamrnb # *************************************************************************** @@ -1030,17 +1037,23 @@ ifdef SVN ifdef HAVE_WIN32 ffmpeg: .dshow_headers else -ffmpeg: +ffmpeg: endif $(SVN) co $(FFMPEG_SVN) ffmpeg ifdef HAVE_ISA_THUMB patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch endif +ifdef HAVE_WIN64 + (cd ffmpeg/libswscale; patch -p0 < ../../Patches/ffmpeg-win64.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 +ifdef HAVE_WIN32 + sed -i "s/std=c99/std=gnu99/" ffmpeg/configure +endif else ffmpeg-$(FFMPEG_VERSION).tar.gz: echo "ffmpeg snapshot is too old, you MUST use subversion !" @@ -1055,21 +1068,23 @@ FFMPEGCONF += \ --disable-debug \ --enable-gpl \ --enable-postproc \ + --disable-ffprobe \ --disable-ffserver \ --disable-ffmpeg \ --disable-ffplay \ --disable-devices \ --disable-protocols \ - --disable-filters \ + --disable-avfilter \ --disable-network ifdef HAVE_WIN64 -FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs +FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs else ifdef HAVE_WIN32 -FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs +FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs --enable-libvpx else -FFMPEGCONFG += --enable-pthreads +FFMPEGCONF += --enable-pthreads endif +FFMPEG_CFLAGS += --std=gnu99 endif ifdef HAVE_WINCE @@ -1078,10 +1093,14 @@ else ifdef HAVE_UCLIBC .ffmpeg: ffmpeg else -.ffmpeg: ffmpeg .lame .gsm +ifeq ($(ARCH),armel) +.ffmpeg: ffmpeg .lame .gsm .zlib +else +.ffmpeg: ffmpeg .lame .gsm .libvpx .zlib endif endif - (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers) +endif + (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers) touch $@ ifdef SVN @@ -1127,15 +1146,6 @@ CLEAN_FILE += .dvdcss CLEAN_PKG += libdvdcss DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2 -# *************************************************************************** -# dummy dvdread to trigger the INSTALL_NAME script -# *************************************************************************** -# .dvdread: .dvdnav -# $(INSTALL_NAME) -# touch $@ -# -# CLEAN_FILE += .dvdread - # *************************************************************************** # libdvdread: We use dvdnav's dvdread # *************************************************************************** @@ -1191,14 +1201,30 @@ CLEAN_FILE += .dvdnav CLEAN_PKG += libdvdnav DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 +# *************************************************************************** +# libbluray +# *************************************************************************** + +libbluray: + $(GIT) clone git://git.videolan.org/libbluray.git + +.libbluray: libbluray + (cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + $(INSTALL_NAME) + touch $@ + +CLEAN_FILE += .libbluray +CLEAN_PKG += libbluray + + # *************************************************************************** # libdvbpsi # *************************************************************************** -libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz: +libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz: $(WGET) $(LIBDVBPSI_URL) -libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz +libdvbpsi: libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz $(EXTRACT_GZ) .dvbpsi: libdvbpsi @@ -1208,7 +1234,7 @@ libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz CLEAN_FILE += .dvbpsi CLEAN_PKG += libdvbpsi -DISTCLEAN_PKG += libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz +DISTCLEAN_PKG += libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz # *************************************************************************** # live @@ -1220,9 +1246,15 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz: live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/live-uselocale.patch + patch -p0 < Patches/live-inet_ntop.patch ifdef HAVE_WIN64 patch -p0 < Patches/live-win64.patch endif +ifndef HAVE_WIN32 +ifndef HAVE_WINCE + patch -p0 < Patches/live-getaddrinfo.patch +endif +endif .live: live ifdef HAVE_WIN32 @@ -1278,7 +1310,7 @@ goom$(GOOM2k4_VERSION).tar.gz: goom: goom$(GOOM2k4_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_WIN32 - (cd $@; dos2unix configure.in) + (cd $@; fromdos configure.in) patch -p0 < Patches/goom2k4-0-win32.patch else patch -p0 < Patches/goom2k4-0-mmx.patch @@ -1304,17 +1336,20 @@ libcaca-$(LIBCACA_VERSION).tar.gz: libcaca: libcaca-$(LIBCACA_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/libcaca-static.patch ifdef HAVE_DARWIN_OS patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig configure) endif +ifdef HAVE_WIN32 + patch -p0 < Patches/libcaca-win32-static.patch +endif + .caca: libcaca -ifdef HAVE_WIN32 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install) +ifdef HAVE_DARWIN_OS + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx --disable-x11 && cd caca && make && make install) else - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install) endif touch $@ @@ -1357,19 +1392,11 @@ x264: ifdef HAVE_WIN32 (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) endif - else +x264: + echo "x264 snapshot is too old, you MUST use Git !" + exit -1 -x264: x264-$(X264_VERSION).tar.gz - $(EXTRACT_GZ) -ifdef HAVE_WIN32 - ifndef HAVE_CYGWIN - (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch) - endif -else - patch -p0 < Patches/x264.patch - rm x264/x264.c -endif endif ifdef HAVE_WIN32 @@ -1411,10 +1438,6 @@ libmodplug-$(MODPLUG_VERSION).tar.gz: libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WIN32 - patch -p0 < Patches/libmodplug-win32.patch - (cd $@; autoreconf -ivf ) -endif .mod: libmodplug (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) @@ -1559,10 +1582,10 @@ DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe # qt4 (source-code compilation for Mac) # *************************************************************************** -qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz: +qt-everywhere-opensource-src-$(QT4_MAC_VERSION).tar.gz: $(WGET) $(QT4_MAC_URL) -qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz +qt4_mac: qt-everywhere-opensource-src-$(QT4_MAC_VERSION).tar.gz $(EXTRACT_GZ) .qt4_mac: qt4_mac @@ -1582,10 +1605,11 @@ zlib-$(ZLIB_VERSION).tar.gz: zlib: zlib-$(ZLIB_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/zlib.patch + patch -p0 < Patches/zlib-wince.patch + patch -p0 < Patches/zlib-static.patch .zlib: zlib - (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install) + (cd zlib; $(HOSTCC) ./configure --prefix=$(PREFIX) --static && make install) $(INSTALL_NAME) touch $@ @@ -1682,9 +1706,6 @@ 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) -ifdef HAVE_DARWIN_OS_ON_INTEL - (patch -p0 < Patches/libpng-darwin-mactel.patch) -endif .png: libpng .zlib ifdef HAVE_DARWIN_OS @@ -1789,6 +1810,10 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2: libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 $(EXTRACT_BZ2) +ifdef HAVE_WIN32 +# patch -p 0 < Patches/libgpg-error-win32.patch +# (cd $@; ./autogen.sh) +endif .gpg-error: libgpg-error ifdef HAVE_DARWIN_OS_ON_INTEL @@ -1893,55 +1918,12 @@ CLEAN_FILE += .opendaap CLEAN_PKG += libopendaap DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2 -# *************************************************************************** -# glib -# *************************************************************************** - -glib-$(GLIB_VERSION).tar.bz2: - $(WGET) $(GLIB_URL) - -glib: glib-$(GLIB_VERSION).tar.bz2 - $(EXTRACT_BZ2) - (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch) -ifdef HAVE_DARWIN_64 - (cd $@; patch -p0 < ../Patches/glib-Darwin64.patch) -endif - -.glib: glib - (cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install) - touch $@ - -CLEAN_FILE += .glib -CLEAN_PKG += glib -DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz - -# *************************************************************************** -# libIDL -# *************************************************************************** - -libIDL-$(LIBIDL_VERSION).tar.bz2: - $(WGET) $(LIBIDL_URL) - -libIDL: libIDL-$(LIBIDL_VERSION).tar.bz2 - $(EXTRACT_BZ2) - -.IDL: libIDL - (cd $<; ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install ) - touch $@ - -CLEAN_FILE += .IDL -CLEAN_PKG += libIDL -DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz - # *************************************************************************** # Gecko SDK # *************************************************************************** -gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz: - $(WGET) $(GECKO_SDK_MAC_URL) - -gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz - $(EXTRACT_GZ) +gecko-sdk: + $(SVN) co $(NPAPI_HEADERS_SVN_URL) -r $(NPAPI_HEADERS_SVN_REVISION) gecko-sdk/include .gecko: gecko-sdk rm -rf $(PREFIX)/gecko-sdk @@ -1952,60 +1934,7 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz CLEAN_FILE += .gecko CLEAN_PKG += gecko-sdk -DISTCLEAN_PKG += gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz - -# *************************************************************************** -# Gecko SDK win32 -# *************************************************************************** - -xulrunner-1.9.2.en-US.win32.sdk.zip: - $(WGET) $(GECKO_SDK_WIN32_URL) - -libIDL-0.6.3-win32-bin.zip: - $(WGET) $(LIBIDL_WIN32_BIN_URL) - -glib-19990228.zip: - $(WGET) $(GLIB_WIN32_BIN_URL) - -.gecko-win32: xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip - unzip xulrunner-1.9.2.en-US.win32.sdk.zip - rm -rf $(PREFIX)/gecko-sdk - mv xulrunner-sdk $(PREFIX)/gecko-sdk - unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d $(PREFIX)/gecko-sdk/bin - unzip glib-19990228.zip glib-1.2.dll -d $(PREFIX)/gecko-sdk/bin - chmod a+x $(PREFIX)/gecko-sdk/bin/* - touch $@ - -CLEAN_FILE += .gecko-win32 -CLEAN_PKG += gecko-sdk-win32 -DISTCLEAN_PKG += xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip - -# *************************************************************************** -# mozilla-macosx -# -# Note that this dependency needs to be compiled against the 10.4u SDK using -# using GCC-4.0. Using newer releases of one of these won't lead to a -# successful compilation! Adapt the respective variables in ../config.mak! -# *************************************************************************** - -firefox-$(MOZILLA_VERSION)-source.tar.bz2: - $(WGET) $(MOZILLA_URL) - -mozilla: firefox-$(MOZILLA_VERSION)-source.tar.bz2 - $(EXTRACT_BZ2) - (cd $@; patch -p0 < ../Patches/firefox-darwin.patch) - -.mozilla-macosx: mozilla .glib .IDL - ifneq($(SDK_TARGET),"10.4") - echo "Compiling the mozilla target requires the 10.4 SDK!" - exit -1 - endif - (cd $<; ./configure --prefix=$(PREFIX)/gecko-sdk-new --enable-default-toolkit=cairo-cocoa --enable-standalone-modules=xpcom,plugin --enable-application=xulrunner && make && make install) - touch $@ - -CLEAN_FILE += .mozilla-macosx -CLEAN_PKG += mozilla -DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2 +DISTCLEAN_PKG += gecko-sdk # *************************************************************************** # libjpeg @@ -2180,8 +2109,12 @@ dshow-headers.tgz: dxva2api.h: $(WGET) $(DXVA2_URL) -.dshow_headers: dshow-headers.tgz dxva2api.h +d2d_headers.tar.gz: + $(WGET) $(D2D_URL) -O $@ + +.dshow_headers: dshow-headers.tgz dxva2api.h d2d_headers.tar.gz tar xzf $< -C $(PREFIX)/include + tar xzf d2d_headers.tar.gz -C $(PREFIX)/include cp dxva2api.h $(PREFIX)/include touch $@ @@ -2209,31 +2142,6 @@ CLEAN_FILE += .expat CLEAN_PKG += expat DISTCLEAN_PKG += expat-$(EXPAT_VERSION).tar.gz -# *************************************************************************** -# CyberLink C++ UPnP library -# *************************************************************************** - -clinkcc$(CLINKCC_VERSION).tar.gz: - $(WGET) $(CLINKCC_URL) - -clinkcc: clinkcc$(CLINKCC_VERSION).tar.gz - tar xzf $< - mv $(patsubst %.tar.gz,Cyberlink,$(patsubst %.tgz,Cyberlink,$(notdir $<))) $@ || true - touch $@ - patch -p0 < Patches/clinkcc.patch -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/clinkcc_osx.patch -endif - (cd $@; ./bootstrap) - -.clinkcc: clinkcc - (cd $<;./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install ) - touch $@ - -CLEAN_FILE += .clinkcc -CLEAN_PKG += clinkcc -DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz - # *************************************************************************** # YASM assembler # *************************************************************************** @@ -2319,7 +2227,7 @@ ifdef HAVE_CYGWIN endif .tag: taglib - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-mp4 --enable-asf --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -2337,7 +2245,9 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz: pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz $(EXTRACT_GZ) (cd $@; patch -p0 < ../Patches/pthreads-detach.patch) +ifdef HAVE_WIN64 (patch -p0 < Patches/pthreads-win64.patch) +endif .pthreads: pthreads (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a *.dll $(PREFIX)/lib/) @@ -2386,11 +2296,13 @@ endif --disable-ladspa \ --disable-oss-support \ --disable-alsa-support \ + --disable-pulse-support \ --disable-midishare \ --disable-jack-support \ --disable-coreaudio \ --disable-lash \ --disable-ladcca \ + --disable-portaudio-support \ --without-readline cd $< && make cd $< && make install @@ -2404,28 +2316,24 @@ DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz # liboil # *************************************************************************** -liboil-$(OIL_VERSION).tar.gz: - $(WGET) $(OIL_URL) +orc-$(ORC_VERSION).tar.gz: + $(WGET) $(ORC_URL) -liboil: liboil-$(OIL_VERSION).tar.gz +orc: orc-$(ORC_VERSION).tar.gz $(EXTRACT_GZ) - patch -d liboil -p1 < Patches/liboil-noshared.patch - patch -d liboil -p1 < Patches/liboil-win64.patch - patch -d liboil -p1 < Patches/liboil-Xcompile.patch - (cd $@; autoreconf) -.liboil: liboil +.orc: orc ifdef HAVE_DARWIN_OS (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)") else - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2") + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)) endif (cd $<; make && make install) touch $@ -CLEAN_FILE += .liboil -CLEAN_PKG += liboil -DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz +CLEAN_FILE += .orc +CLEAN_PKG += orc +DISTCLEAN_PKG += orc-$(ORC_VERSION).tar.gz # *************************************************************************** # Schroedinger library @@ -2439,8 +2347,14 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz patch -p0 < Patches/schroedinger-notests.patch (cd $@; autoreconf -iv) -.schroedinger: schroedinger .liboil - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install) +ifdef HAVE_WIN32 +ORCC="wine $(PREFIX)/bin/orcc.exe" +else +ORCC="orcc" +endif + +.schroedinger: schroedinger .orc + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make ORCC=$(ORCC) && make install) touch $@ CLEAN_FILE += .schroedinger @@ -2493,9 +2407,19 @@ libupnp-$(UPNP_VERSION).tar.bz2: libupnp: libupnp-$(UPNP_VERSION).tar.bz2 $(EXTRACT_BZ2) + patch -p0 < Patches/libupnp-mingw.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/libupnp-win32.patch + patch -p0 < Patches/libupnp-configure.patch + cd $@; libtoolize&& autoreconf +endif + +ifdef HAVE_WIN32 +LIBUPNP_ECFLAGS=-DPTW32_STATIC_LIB +endif .libupnp: libupnp - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-samples --without-documentation --disable-webserver CFLAGS="$(CFLAGS) -O3" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-samples --without-documentation --enable-static --disable-webserver CFLAGS="$(CFLAGS) -O3 -DUPNP_STATIC_LIB $(LIBUPNP_ECFLAGS)" && make && make install) touch $@ CLEAN_FILE += .libupnp @@ -2552,15 +2476,15 @@ DISTCLEAN_PKG += glew-$(GLEW_VERSION)-src.tgz # *************************************************************************** # projectM # *************************************************************************** -libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz: +projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz: $(WGET) $(LIBPROJECTM_URL) -libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz +libprojectM: projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz rm -rf $@ || true gunzip -c $< | tar xf - --exclude='[*?:<>\|]' mv projectM-$(LIBPROJECTM_VERSION)-Source $@ || true patch -p0 < Patches/libprojectM-win32.patch - cd $@; rm CMakeCache.txt + -cd $@; rm CMakeCache.txt .libprojectM: libprojectM .glew (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)