contrib_goom: patch goom library to fix a lot of memleaks.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d358d3921743192e192280411d0e168bddc6486b..adfd3050c544e67e2e60908a1e27714646adf98e 100644 (file)
--- 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
 endif
 
 ifdef HAVE_BEOS
@@ -723,7 +723,7 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
        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)
+       (cd $@; sh autogen.sh)
 
 .vorbis: libvorbis .ogg
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -902,7 +902,7 @@ faad2-$(FAAD2_VERSION).tar.gz:
 
 faad2: faad2-$(FAAD2_VERSION).tar.gz
        $(EXTRACT_GZ)
-       (cd $@; ./bootstrap)
+       (cd $@; sh ./bootstrap)
 
 .faad: faad2
        (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
@@ -1106,7 +1106,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
@@ -1316,6 +1316,7 @@ ifneq ($(DARWIN_COMPILER),LLVMGCC)
        patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 endif
+patch -p0 < Patches/goom2k4-0-memleaks.patch
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
@@ -2119,14 +2120,20 @@ CLEAN_PKG += tiff
 DISTCLEAN_PKG += tiff-$(TIFF_VERSION).tar.gz
 
 # ***************************************************************************
-# SDL
+# LibSDL
 # ***************************************************************************
 
+ifndef HAVE_DARWIN_OS
 SDL-$(SDL_VERSION).tar.gz:
        $(WGET) $(SDL_URL)
 
 SDL: SDL-$(SDL_VERSION).tar.gz 
        $(EXTRACT_GZ)
+else
+SDL: 
+       $(SVN) co http://svn.libsdl.org/trunk/SDL -r 4444 SDL
+       (cd $@; sh autogen.sh)
+endif
 
 .SDL: SDL
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --enable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
@@ -2321,8 +2328,7 @@ libkate: libkate-$(KATE_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .kate: libkate .ogg
-       (cd $<; patch -p1) < Patches/libkate-nodocs.patch
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind --disable-doc && make && make install)
        $(INSTALL_NAME)
        touch $@