X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=26d5be0f9a5497b885146cd4700ba06c7240a844;hb=2c2f5641c87b844c474783cc313a0d2f2b305a37;hp=f3693d8304607882031e6b78a22658dc930e68c5;hpb=713c078f0bdeba9a2dab71c33bf83611437b8164;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f3693d8304..26d5be0f9a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -132,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-swscale
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-swscale
 endif
 
 ifdef HAVE_BEOS
@@ -151,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
 
@@ -257,17 +259,39 @@ 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-$(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:
+#	cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
 
 .cmake: cmake
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
@@ -474,7 +498,6 @@ freetype-$(FREETYPE2_VERSION).tar.gz:
 
 freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p0 < Patches/freetype-cross.patch
 
 .freetype: freetype2
 ifdef HAVE_CYGWIN
@@ -566,6 +589,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)
@@ -696,6 +720,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
@@ -758,6 +785,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
@@ -905,6 +933,7 @@ lame-$(LAME_VERSION).tar.gz:
 
 lame: lame-$(LAME_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p0 < Patches/libmp3lame-mingw32.patch
 
 .lame: lame
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install)
@@ -1038,7 +1067,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg
+	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 14080
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1048,9 +1077,12 @@ endif
 ifdef HAVE_BEOS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
-ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
+ifdef HAVE_DARWIN_OS
+	(cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
+endif
 ifdef NO_TEXT_RELOCATION
 	(cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
 endif
@@ -1059,7 +1091,6 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
-
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1080,7 +1111,7 @@ else
 endif
 endif
 
-	(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)
+	(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 --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 
 ifdef SVN
@@ -1129,11 +1160,33 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 # dummy dvdread to trigger the INSTALL_NAME script
 # ***************************************************************************
-.dvdread: .dvdnav
+# .dvdread: .dvdnav
+# 	$(INSTALL_NAME)
+# 	touch $@
+# 
+# CLEAN_FILE += .dvdread
+
+# ***************************************************************************
+# libdvdread: We use dvdnav's dvdread
+# ***************************************************************************
+
+
+libdvdread: 
+	$(SVN) co $(LIBDVDREAD_SVN)  libdvdread
+	(cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
+#ifdef HAVE_WIN32
+	(cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
+#endif
+	(cd $@; sh autogen.sh noconfig)
+
+.libdvdread: libdvdread .dvdcss
+	(cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
-CLEAN_FILE += .dvdread
+CLEAN_FILE += .libdvdread
+CLEAN_PKG += libdvdread
+#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 
 # ***************************************************************************
 # libdvdnav
@@ -1142,10 +1195,7 @@ CLEAN_FILE += .dvdread
 ifdef SVN
 libdvdnav:
 	$(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
-	patch -p0 < Patches/libdvdnav.patch
-ifdef HAVE_WIN32
-	patch -p0 < Patches/libdvdnav-win32.patch
-endif
+	patch -d libdvdnav -p0 < Patches/libdvdnav.patch
 	(cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
@@ -1160,11 +1210,11 @@ endif
 	(cd $@; ./autogen.sh noconfig)
 endif
 
-.dvdnav: libdvdnav .dvdcss
+.dvdnav: libdvdnav .libdvdread
 ifdef HAVE_WIN32	
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@
@@ -1202,6 +1252,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/live-noapps.patch
+	patch -p0 < Patches/live-uselocale.patch
 
 .live: live
 ifdef HAVE_WIN32  
@@ -1374,8 +1425,13 @@ ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
   endif
 else
-.x264: x264
+ifdef HAVE_DARWIN_OS_ON_INTEL
+  .x264: x264 .yasm
+	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+else
+  .x264: x264
 	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+endif
 endif
 	touch $@
 
@@ -1559,7 +1615,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
-	(cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -sdk $(MACOSX_SDK) -no-framework && make && make install)
+	(cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework && make && make install)
 	touch $@
 
 CLEAN_FILE += .qt4_mac
@@ -1724,9 +1780,9 @@ else
 .zvbi: zvbi
 endif
 ifdef HAVE_DARWIN_OS
-	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
 else
-	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@
@@ -1835,7 +1891,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && 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
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
 endif
@@ -1875,12 +1931,12 @@ 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 .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 --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install)
 endif
@@ -2131,12 +2187,12 @@ dirac-$(DIRAC_VERSION).tar.gz:
 
 dirac: dirac-$(DIRAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p0 <Patches/dirac-cross.patch
+	patch -p1 -d dirac <Patches/dirac-cross.patch
 ifdef HAVE_CYGWIN
 	# incorrect compile warning with cygwin compiler 3.4.4
 	patch -p0 <Patches/dirac-cygwin.patch
 endif
-	(cd $@; aclocal && autoconf && automake)
+	(cd $@; aclocal -I m4 && autoconf && automake)
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 
@@ -2229,27 +2285,22 @@ CLEAN_PKG += clinkcc
 DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
 
 # ***************************************************************************
-# NASM assembler
+# YASM assembler
 # ***************************************************************************
 
-nasm-$(NASM_VERSION).tar.bz2:
-	$(WGET) $(NASM_URL)
-
-nasm: nasm-$(NASM_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
+yasm-$(YASM_VERSION).tar.gz:
+	$(WGET) $(YASM_URL)
 
-#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
@@ -2263,25 +2314,6 @@ DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
 
 CLEAN_FILE += .aclocal
 
-# ***************************************************************************
-# UNICOWS (Unicode support for WINME/98/95)
-# ***************************************************************************
-
-libunicows-$(UNICOWS_VERSION).tar.gz:
-	$(WGET) $(UNICOWS_URL)
-	mv libunicows-$(UNICOWS_VERSION)-src.tar.gz $@ || true
-
-libunicows: libunicows-$(UNICOWS_VERSION).tar.gz
-	$(EXTRACT_GZ)
-
-.unicows: libunicows
-	(cd $</src; make -f makefile.mingw32 PATHSEP='/' $(HOSTCC) && cp -f ../lib/mingw32/libunicows.a $(PREFIX)/lib)
-	touch $@
-
-CLEAN_FILE += .unicows
-CLEAN_PKG += libunicows
-DISTCLEAN_PKG += libunicows-$(UNICOWS_VERSION).tar.gz
-
 # ***************************************************************************
 # TagLib read and editing of tags of popular audio formats
 # ***************************************************************************
@@ -2291,12 +2323,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 <Patches/taglib-cygwin.patch
+	patch -p0 < Patches/taglib-cygwin.patch
 endif
 
 .tag: taglib
-	(cd $<; $(HOSTCC) CXXFLAGS="-DMAKE_TAGLIB_LIB" ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	(cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -2379,8 +2414,44 @@ fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz
 
 CLEAN_FILE += .fluid
 CLEAN_PKG += fluidsynth
-DISTCLEAN_PKG += fluidsynth-$(NCURSES_VERSION).tar.gz
+DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz
+
+# ***************************************************************************
+# liboil
+# ***************************************************************************
+
+liboil-$(OIL_VERSION).tar.gz:
+	$(WGET) $(OIL_URL)
+
+liboil: liboil-$(OIL_VERSION).tar.gz
+	$(EXTRACT_GZ)
+	patch -d liboil -p1 < Patches/liboil-noshared.patch
+
+.liboil: liboil
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	touch $@
+
+CLEAN_FILE += .liboil
+CLEAN_PKG += liboil
+DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz
+
+# ***************************************************************************
+# Schroedinger library
+# ***************************************************************************
+
+schroedinger-$(SCHROED_VERSION).tar.gz:
+	$(WGET) $(SCHROED_URL)
+
+schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
+	$(EXTRACT_GZ)
+
+.schroedinger: schroedinger .liboil
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+	touch $@
 
+CLEAN_FILE += .schroedinger
+CLEAN_PKG += schroedinger
+DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 
 # ***************************************************************************
 # Some cleaning
@@ -2396,7 +2467,7 @@ clean-src: clean
 	rm -rf $(DISTCLEAN_PKG)
 
 clean-svn:
-	rm -rf ffmpeg tremor x264 libdca
+	rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live	
 
 distclean: clean-src