live: fix unsafe use of setlocale()

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0ccbc6aabb90ee40a736ea052c9830b03cef533b..26d5be0f9a5497b885146cd4700ba06c7240a844 100644 (file)
--- 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
@@ -933,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)
@@ -1066,7 +1067,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-       $(SVN) co $(FFMPEG_SVN) ffmpeg -r 13752
+       $(SVN) co $(FFMPEG_SVN) ffmpeg -r 14080
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1076,8 +1077,10 @@ 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
@@ -1167,24 +1170,23 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # libdvdread: We use dvdnav's dvdread
 # ***************************************************************************
 
-libdvdread-$(LIBDVDREAD_VERSION).tar.gz:
-       $(WGET) $(LIBDVDREAD_URL)
 
-libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz
-       $(EXTRACT_GZ)
+libdvdread: 
+       $(SVN) co $(LIBDVDREAD_SVN)  libdvdread
+       (cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
 #ifdef HAVE_WIN32
-       patch  -p 0 < Patches/libdvdread-win32.patch
-       (cd $@; ./bootstrap )
+       (cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
 #endif
+       (cd $@; sh autogen.sh noconfig)
 
 .libdvdread: libdvdread .dvdcss
-       (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
 CLEAN_FILE += .libdvdread
 CLEAN_PKG += libdvdread
-DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
+#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 
 # ***************************************************************************
 # libdvdnav
@@ -1192,7 +1194,7 @@ DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 
 ifdef SVN
 libdvdnav:
-       $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav -r1100
+       $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -d libdvdnav -p0 < Patches/libdvdnav.patch
        (cd $@; ./autogen.sh noconfig)
 else
@@ -1208,11 +1210,11 @@ endif
        (cd $@; ./autogen.sh noconfig)
 endif
 
-.dvdnav: libdvdnav .libdvdread .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 $@
@@ -1250,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  
@@ -1612,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
@@ -1777,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 $@
@@ -2422,6 +2425,7 @@ liboil-$(OIL_VERSION).tar.gz:
 
 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)
@@ -2440,11 +2444,9 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -d schroedinger -p1 < Patches/libschroedinger-fix-build-OSX.patch
-       patch -d schroedinger -p1 < Patches/libschroedinger-fix-build-OSX-test.patch
 
-.schroedinger: .liboil schroedinger
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+.schroedinger: schroedinger .liboil
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .schroedinger