* Updated speex to 1.1.10

* Updated theora to alpha5
* Added libshout

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 216069b312f396761a48b0a2055894915d1431c4..cbbc0119ce8b2cb74008580af63b62fc2837381e 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -56,7 +56,7 @@ case $HOST in
 # ENVP defines the oldest environment on which the program will be able to run
 # SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
             echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak
-           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.0.sdk" >> config.mak
 #          echo "EXTRA_CFLAGS = -D\${ENVP} -isysroot \${MACOSX_SDK}" >> config.mak
            echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
 #          echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 47b6592e971bce092971277bab1480e04cf8db22..b7ac2b0d5270bb92d16eb3ac6a44e5b6740640cc 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -84,7 +84,7 @@ endif
 ifdef HAVE_DARWIN_OS
  all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .x264 .theora \
-       .FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .openslp \
+       .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
        .png .gpg-error .gcrypt .gnutls .daap .cddb .cdio .vcdimager .SDL_image \
        .aclocal
@@ -530,7 +530,6 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p 0 < Patches/theora.patch
 
 .theora: libtheora
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -541,6 +540,25 @@ CLEAN_FILE += .theora
 CLEAN_PKG += libtheora
 DISTCLEAN_PKG += libtheora-$(THEORA_VERSION).tar.bz2
 
+# ***************************************************************************
+# shout
+# ***************************************************************************
+
+libshout-$(SHOUT_VERSION).tar.gz:
+       $(WGET) $(SHOUT_URL)
+
+libshout: libshout-$(SHOUT_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.shout: libshout
+       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .shout
+CLEAN_PKG += libshout
+DISTCLEAN_PKG += libshout-$(SHOUT_VERSION).tar.gz
+
 # ***************************************************************************
 # flac
 # ***************************************************************************
@@ -569,7 +587,6 @@ speex-$(SPEEX_VERSION).tar.gz:
 
 speex: speex-$(SPEEX_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p 0 < Patches/speex.patch
 
 .speex: speex
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install)

diff --git a/extras/contrib/src/Patches/speex.patch b/extras/contrib/src/Patches/speex.patch
deleted file mode 100644 (file)
index 067dcd4..0000000
--- a/extras/contrib/src/Patches/speex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru speex-original/libspeex/preprocess.c speex/libspeex/preprocess.c
---- speex-original/libspeex/preprocess.c       Sat Apr 10 00:21:49 2004
-+++ speex/libspeex/preprocess.c        Fri Jul 23 10:11:10 2004
-@@ -970,8 +970,8 @@
- int speex_preprocess_ctl(SpeexPreprocessState *state, int request, void *ptr)
- {
-    SpeexPreprocessState *st;
--   st=(SpeexPreprocessState*)state;
-    int i;
-+   st=(SpeexPreprocessState*)state;
-    switch(request)
-    {
-    case SPEEX_PREPROCESS_SET_DENOISE:

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index b64b4594d9c32b1a008364db1eae7ba4030823ad..192b91c31fd8c1d4e93f14082a19b1148c2f5471 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -56,17 +56,19 @@ LIBID3TAG_VERSION=0.15.1b
 LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
 LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz
-OGG_VERSION=1.1
-OGG_URL=http://www.vorbis.com/files/1.0.1/unix/libogg-$(OGG_VERSION).tar.gz
+OGG_VERSION=1.1.2
+OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
-VORBIS_VERSION=1.0
-VORBIS_URL=http://us.xiph.org/ogg/vorbis/download/libvorbis-$(VORBIS_VERSION).tar.gz
-THEORA_VERSION=1.0alpha4
+VORBIS_VERSION=1.1.1
+VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
+THEORA_VERSION=1.0alpha5
 THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.1.2
 FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
-SPEEX_VERSION=1.1.5
-SPEEX_URL=http://us.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
+SPEEX_VERSION=1.1.10
+SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
+SHOUT_VERSION=2.1
+SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
 FAAD2_VERSION=20040923
 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac