X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=54eef6a15f354f02d3d3decd6f5d335b59b0a7f4;hb=832ce82dac31f15dca7b734c7df7c943ea652bd6;hp=65ddd7d6d223d7909697adb38e982b06b7c09d18;hpb=5c3061c517f36ec9faa225053d0e51c0e0a526e8;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 65ddd7d6d2..54eef6a15f 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -133,7 +133,7 @@ endif FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99 else -FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-swscale +FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-libgsm endif ifdef HAVE_BEOS @@ -148,6 +148,9 @@ ifdef HAVE_DARWIN_OS X264CONF += --enable-pic FFMPEGCONF += --cc=$(CC) FFMPEGCONF += --arch=$(ARCH) +ifdef HAVE_DARWIN_10 +FFMPEGCONF += --cpu=core2 +endif ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF endif @@ -163,7 +166,7 @@ DATE=`date +%Y-%m-%d` # Standard rules # *************************************************************************** # Generated by ./bootstrap from default configuration in src/Distributions -# +# include ../distro.mak FORCE: @@ -174,14 +177,14 @@ FORCE: define EXTRACT_GZ rm -rf $@ || true - gunzip -c $< | tar xf - --exclude='[*?:<>\|]' + gunzip -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true touch $@ endef define EXTRACT_BZ2 rm -rf $@ || true - bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' + bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.bz2,%,$(notdir $<)) $@ || true touch $@ endef @@ -286,7 +289,7 @@ cmake-$(CMAKE_VERSION).tar.gz: cmake: cmake-$(CMAKE_VERSION).tar.gz $(EXTRACT_GZ) - + #cmake: # cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake @@ -651,7 +654,7 @@ ifdef HAVE_WIN32 ( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;) (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a) (cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig) -else +else (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX)) endif touch $@ @@ -669,6 +672,9 @@ libmad-$(LIBMAD_VERSION).tar.gz: libmad: libmad-$(LIBMAD_VERSION).tar.gz $(EXTRACT_GZ) +ifdef HAVE_DARWIN_OS + ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig configure ) +endif .mad: libmad (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install) @@ -743,7 +749,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz # *************************************************************************** ifdef SVN -tremor: +tremor: $(SVN) co http://svn.xiph.org/trunk/Tremor tremor (cd $@ && patch -p0 < ../Patches/tremor.patch) (cd $@; rm -f ogg.h && echo "#include " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) @@ -824,7 +830,7 @@ ifdef HAVE_WIN32 patch -p0 < Patches/libshout-win32.patch (cd $@; autoreconf && automake) endif - + .shout: libshout .theora .ogg .speex .vorbis (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install ) $(INSTALL_NAME) @@ -849,7 +855,7 @@ endif FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs -.flac: flac .ogg +.flac: flac .ogg ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) else @@ -973,13 +979,13 @@ ifdef HAVE_WIN32 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 -endif +endif touch $@ ## No reasons to use SVN anymore #ifdef SVN #libebml-source: libebml # tar cfvz libebml-$(DATE).tar.gz libebml -#SOURCE += libebml-source +#SOURCE += libebml-source #endif CLEAN_FILE += .ebml @@ -1000,7 +1006,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: #else libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) -#endif +#endif patch -p0 < ./Patches/libmatroska-kaxblock.patch ifdef HAVE_WIN32 (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch) @@ -1083,6 +1089,8 @@ ifdef HAVE_BEOS endif ifdef HAVE_DARWIN_OS_ON_INTEL (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) +else + (cd $@; patch -p0 < ../Patches/ffmpeg-swscale-ppc.patch) endif ifdef HAVE_UCLIBC patch -p0 < Patches/ffmpeg-svn-uclibc.patch @@ -1106,7 +1114,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz $(EXTRACT_GZ) endif -FFMPEGCONF += --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --enable-swscale +FFMPEGCONF += --enable-gpl --enable-postproc --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network ifdef HAVE_WIN32 FFMPEGCONF += --disable-bzlib --disable-decoder=dca endif @@ -1117,7 +1125,7 @@ else ifdef HAVE_UCLIBC .ffmpeg: ffmpeg else -.ffmpeg: ffmpeg .faac .lame +.ffmpeg: ffmpeg .faac .lame .gsm endif endif (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers) @@ -1142,7 +1150,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: $(WGET) $(LIBDVDCSS_URL) ifdef SVN -libdvdcss: +libdvdcss: $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss cd $@ && sh bootstrap else @@ -1172,7 +1180,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # .dvdread: .dvdnav # $(INSTALL_NAME) # touch $@ -# +# # CLEAN_FILE += .dvdread # *************************************************************************** @@ -1180,7 +1188,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** -libdvdread: +libdvdread: $(SVN) co $(LIBDVDREAD_SVN) libdvdread (cd $@; patch -p 0 < ../Patches/libdvdread.patch) ifdef HAVE_WIN32 @@ -1220,7 +1228,7 @@ endif endif .dvdnav: libdvdnav .libdvdread -ifdef HAVE_WIN32 +ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install) @@ -1264,9 +1272,9 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz patch -p0 < Patches/live-uselocale.patch .live: live -ifdef HAVE_WIN32 - (cd $<;./genMakefiles mingw && make $(HOSTCC)) -else +ifdef HAVE_WIN32 + (cd $<;./genMakefiles mingw && make $(HOSTCC)) +else ifdef HAVE_DARWIN_OS (cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -i.orig config.macosx) (cd $<; ./genMakefiles macosx && make) @@ -1312,10 +1320,11 @@ ifdef HAVE_WIN32 (cd $@; dos2unix configure.in) patch -p0 < Patches/goom2k4-0-win32.patch else -ifneq ($(DARWIN_COMPILER),LLVMGCC) +ifndef HAVE_DARWIN_OS patch -p0 < Patches/goom2k4-0-mmx.patch endif endif + patch -p0 < Patches/goom2k4-0-memleaks.patch .goom2k4: goom ifdef HAVE_DARWIN_OS @@ -1423,7 +1432,7 @@ ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pthread && make && make install) endif else -ifdef HAVE_DARWIN_OS_ON_INTEL +ifdef HAVE_DARWIN_OS .x264: x264 .yasm (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) else @@ -1601,7 +1610,7 @@ Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe cp -r Qt/src/corelib Qt/src/gui $(PREFIX)/include/qt4/src cp Qt/lib/libQtCore4.a Qt/lib/libQtGui4.a $(PREFIX)/lib cp Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig - cp Qt/translations/* $(PREFIX)/share/qt4/translations + cp Qt/translations/* $(PREFIX)/share/qt4/translations touch $@ CLEAN_FILE += .Qt_win32 @@ -1647,7 +1656,7 @@ CLEAN_PKG += zlib DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz # *************************************************************************** -# PortAudio +# PortAudio # *************************************************************************** pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz: @@ -1659,7 +1668,7 @@ ifneq ($(HOST),$(BUILD)) (patch -p0 < Patches/portaudio-cross.patch;cd $@; autoconf) endif -.portaudio: portaudio +.portaudio: portaudio (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -1712,7 +1721,7 @@ ifdef HAVE_BEOS endif ifdef HAVE_WIN32 (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h") -endif +endif .twolame: twolame (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame && make && make install) @@ -1823,7 +1832,7 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) 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 @@ -1855,13 +1864,13 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz patch -p1 < ../Patches/libdc1394-noexamples.patch && \ make && make DESTDIR=$(PREFIX) install) touch $@ - + CLEAN_FILE += .dc1394 CLEAN_PKG += libdc1394 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz # *************************************************************************** -# gpg-error +# gpg-error # *************************************************************************** libgpg-error-$(GPGERROR_VERSION).tar.bz2: @@ -1893,7 +1902,7 @@ 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 +CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa .gcrypt: libgcrypt .gpg-error ifdef HAVE_WIN32 @@ -1915,7 +1924,7 @@ DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.bz2 opencdk-$(OPENCDK_VERSION).tar.bz2: $(WGET) $(OPENCDK_URL) -opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2 +opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2 $(EXTRACT_BZ2) .opencdk: opencdk @@ -1941,7 +1950,7 @@ ifdef HAVE_WIN32 (cd $@; autoconf) endif -.gnutls: gnutls .gcrypt .gpg-error +.gnutls: gnutls .gcrypt .gpg-error ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make && cd ../lib &&make && make install && cd ../includes && make install) else @@ -2083,7 +2092,7 @@ DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2 jpeg-$(JPEG_VERSION).tar.gz: $(WGET) $(JPEG_URL) -jpeg: jpeg-$(JPEG_VERSION).tar.gz +jpeg: jpeg-$(JPEG_VERSION).tar.gz $(EXTRACT_GZ) .jpeg: jpeg @@ -2102,7 +2111,7 @@ DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz tiff-$(TIFF_VERSION).tar.gz: $(WGET) $(TIFF_URL) -tiff: tiff-$(TIFF_VERSION).tar.gz +tiff: tiff-$(TIFF_VERSION).tar.gz $(EXTRACT_GZ) .tiff: tiff @@ -2126,10 +2135,10 @@ ifndef HAVE_DARWIN_OS SDL-$(SDL_VERSION).tar.gz: $(WGET) $(SDL_URL) -SDL: SDL-$(SDL_VERSION).tar.gz +SDL: SDL-$(SDL_VERSION).tar.gz $(EXTRACT_GZ) else -SDL: +SDL: $(SVN) co http://svn.libsdl.org/trunk/SDL -r 4444 SDL (cd $@; sh autogen.sh) endif @@ -2150,7 +2159,7 @@ DISTCLEAN_PKG += SDL-$(SDL_VERSION).tar.gz SDL_image-$(SDL_IMAGE_VERSION).tar.gz: $(WGET) $(SDL_IMAGE_URL) -SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz +SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz $(EXTRACT_GZ) patch -p0 < Patches/SDL_image.patch patch -p0 < Patches/SDL_image-CVE-2006-4484.patch @@ -2171,13 +2180,13 @@ DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz libmpcdec-$(MUSE_VERSION).tar.bz2: $(WGET) $(MUSE_URL) -mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 +mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/mpcdec.patch (cd $@; autoreconf) .mpcdec: mpcdec -ifdef HAVE_WIN32 +ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS=-D_PTRDIFF_T=mpc_int32_t && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) @@ -2200,12 +2209,15 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) - patch -p1 -d dirac