X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=c0741185b0a096b6e1c8f016a6de1213c44ac17c;hb=f81c081cfd02817ad08b2527cee6452cbe25fd57;hp=4551d3cda1cfabcd4d44aa0f2b1fd3b445813bdb;hpb=77205605be2747f4bc58777da00b93904addb4d4;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 4551d3cda1..c0741185b0 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -129,11 +129,11 @@ endif ifdef HAVE_UCLIBC ifdef HAVE_BIGENDIAN -FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-small --enable-iwmmxt +FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt else FFMPEGCONF+= --arch=armv4l endif -FFMPEGCONF+= --enable-small --disable-debug --disable-encoders --disable-muxers --disable-demuxer=mpegts --disable-v4l --disable-v4l2 --disable-bktr --disable-dv1394 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols --disable-encoders +FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99 else FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler @@ -147,6 +147,10 @@ ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m endif +ifdef NO_TEXT_RELOCATION +FFMPEGCONF += --disable-mmx +endif + ifdef HAVE_DARWIN_OS X264CONF += --enable-pic ifdef HAVE_DARWIN_OS_ON_INTEL @@ -511,13 +515,7 @@ fribidi-$(FRIBIDI_VERSION).tar.gz: fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/fribidi.patch.real -ifdef HAVE_WIN32 - patch -p0 " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) else @@ -772,7 +763,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2 ifdef HAVE_BEOS (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) else - ifdef HAVE_DARWIN_9 + ifdef NO_TEXT_RELOCATION (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) else (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install) @@ -871,13 +862,6 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz # faad2 # *************************************************************************** -#faad2: -# @echo "*** Please type return here : ***" -# cvs -d $(FAAD2_CVSROOT) login -# cvs -d $(FAAD2_CVSROOT) co faad2 -# (cd $@; patch -p1 < ../Patches/faad2.patch) -# (cd $@; sh ./bootstrap) - faad2-$(FAAD2_VERSION).tar.gz: $(WGET) $(FAAD2_URL) @@ -939,7 +923,7 @@ libebml-$(LIBEBML_VERSION).tar.bz2: ## No reasons to use SVN anymore #ifdef SVN #libebml: -# $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml +# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml #else libebml: libebml-$(LIBEBML_VERSION).tar.bz2 $(EXTRACT_BZ2) @@ -978,7 +962,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: ## No reasons to use SVN anymore #if SVN #libmatroska: -# $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska +# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska #else libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 $(EXTRACT_BZ2) @@ -1053,8 +1037,8 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ifdef SVN ffmpeg: - $(SVN) export $(FFMPEG_SVN) ffmpeg - (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch) + $(SVN) co $(FFMPEG_SVN) ffmpeg + (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch) ifeq ($(HOST),i586-pc-beos) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch) endif @@ -1067,10 +1051,13 @@ endif ifdef HAVE_DARWIN_OS (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) endif +ifdef NO_TEXT_RELOCATION + (cd $@; patch -p0 < ../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-grab.patch + patch -p0 < Patches/ffmpeg-svn-libavformat.patch endif else @@ -1115,7 +1102,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: ifdef SVN libdvdcss: - $(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss + $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss cd $@ && sh bootstrap else libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz @@ -1156,16 +1143,22 @@ CLEAN_FILE += .dvdread ifdef SVN libdvdnav: - $(SVN) export $(LIBDVDNAV_SVN) libdvdnav + $(SVN) co $(LIBDVDNAV_SVN) libdvdnav patch -p0 < Patches/libdvdnav.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/libdvdnav-win32.patch +endif (cd $@; ./autogen.sh noconfig) else -libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: +libdvdnav-$(LIBDVDNAV_VERSION).tar.gz: $(WGET) $(LIBDVDNAV_URL) -libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 - $(EXTRACT_BZ2) +libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz + $(EXTRACT_GZ) patch -p0 < Patches/libdvdnav.patch +ifdef HAVE_WIN32 + patch -p0 < Patches/libdvdnav-win32.patch +endif (cd $@; ./autogen.sh noconfig) endif @@ -1210,26 +1203,12 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz: live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/live.patch -ifdef HAVE_WIN32 - patch -p0 < Patches/livedotcom-win32.patch -endif -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/live-osx.patch -endif - patch -p0 < Patches/live-starttime.patch - (cd live/liveMedia/include; \ - mv liveMedia_version.hh liveMedia_version.hh.bak; \ - sed -e 's/.*LIVEMEDIA_LIBRARY_VERSION_INT.*/#define LIVEMEDIA_LIBRARY_VERSION_INT 9999999999/' liveMedia_version.hh.bak > liveMedia_version.hh ) - patch -Np0 < Patches/live-config.patch -ifdef HAVE_UCLIBC patch -p0 < Patches/live-noapps.patch -endif .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%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx) (cd $<; ./genMakefiles macosx && make) @@ -1308,12 +1287,20 @@ libcaca-$(LIBCACA_VERSION).tar.gz: libcaca: libcaca-$(LIBCACA_VERSION).tar.gz $(EXTRACT_GZ) +ifdef HAVE_DARWIN_OS + #remove me at next libcaca upgrade + patch -p0 < Patches/caca_driver_cocoa.diff + patch -p0 < Patches/caca_macosx.diff +ifndef HAVE_DARWIN_OS_ON_INTEL + patch -p0 < Patches/caca-osx-ppc.patch +endif +endif .caca: libcaca ifdef HAVE_WIN32 - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install) else - (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install) endif touch $@ @@ -1349,10 +1336,13 @@ x264-$(X264_VERSION).tar.gz: ifdef SVN x264: - $(SVN) export svn://svn.videolan.org/x264/trunk/ x264 + $(SVN) co svn://svn.videolan.org/x264/trunk/ x264 ifdef HAVE_WIN32 (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) endif +ifdef HAVE_DARWIN_OS + (cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch ) +endif else x264: x264-$(X264_VERSION).tar.gz @@ -1479,7 +1469,6 @@ wxWidgets-$(WXWIDGETS_VERSION).tar.gz: wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz $(EXTRACT_GZ) (cd wxwidgets; patch -p0 < ../Patches/wxwidgets_uri.patch) -# (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch) .wxwidgets: wxwidgets (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install) @@ -1721,7 +1710,7 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 #ifdef SVN #libraw1394: -# $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394 +# $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394 # (cd $<; libtoolize --copy --force; \ # autopoint -f; \ # aclocal -I extras/contrib/share/aclocal; \ @@ -1752,7 +1741,7 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz #ifdef SVN #libdc1394: -# $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394 +# $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394 # (cd $<; libtoolize --copy --force; \ # autopoint -f; \ # aclocal -I extras/contrib/share/aclocal; \