]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
GNUTls fixed the vasprintf bug. No need to delete the files.
[vlc] / extras / contrib / src / Makefile
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 67f213089d8cf1674632f4ea6f7a556b8ecfa0ae..f83e905c6acee7d93906f90cd3628830187194a1 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -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)
@@ -566,6 +590,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 +721,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 +786,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
@@ -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 12920
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1050,6 +1079,7 @@ ifdef HAVE_BEOS
 endif
 ifdef HAVE_DARWIN_OS
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
+       (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
 endif
 ifdef NO_TEXT_RELOCATION
        (cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
@@ -1374,8 +1404,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 $@
 
@@ -1835,7 +1870,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 +1910,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 --disable-cxx && 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
@@ -2229,27 +2264,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
@@ -2291,12 +2321,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 $@
 
@@ -2396,7 +2429,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
 
Unnamed repository; edit this file 'description' to name the repository.