OS X build system fixes

- updated version of speex, theora, libebml, libmatroska

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 579c68f1f39323fbfb3b3265c9d6d2779a0fb360..ee034f169d6caaa4c00511204913fbff082a4ff9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -378,11 +378,11 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz
 # theora
 # ***************************************************************************
 
-libtheora-$(THEORA_VERSION).tar.gz:
+libtheora-$(THEORA_VERSION).tar.bz2:
        $(WGET) $(THEORA_URL)
 
-libtheora: libtheora-$(THEORA_VERSION).tar.gz
-       $(EXTRACT_GZ)
+libtheora: libtheora-$(THEORA_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p 0 < Patches/theora.patch
 
 .theora: libtheora
@@ -391,7 +391,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.gz
 
 CLEAN_FILE += .theora
 CLEAN_PKG += libtheora
-DISTCLEAN_PKG += libtheora-$(THEORA_VERSION).tar.gz
+DISTCLEAN_PKG += libtheora-$(THEORA_VERSION).tar.bz2
 
 # ***************************************************************************
 # flac

diff --git a/extras/contrib/src/Patches/theora.patch b/extras/contrib/src/Patches/theora.patch
index 492b5b1d2939676c385d3704e0d820adf55c7c84..d6944f5eb5848fc36ca9a4d05af85e562db1b6c3 100644 (file)
--- a/extras/contrib/src/Patches/theora.patch
+++ b/extras/contrib/src/Patches/theora.patch
@@ -5,7 +5,7 @@ diff -ru libtheora.old/Makefile.am libtheora/Makefile.am
  
  AUTOMAKE_OPTIONS = foreign dist-zip
  
--SUBDIRS = lib include examples debian
+-SUBDIRS = lib include doc examples debian
 +SUBDIRS = lib include
  
  EXTRA_DIST = COPYING autogen.sh 
@@ -17,7 +17,7 @@ diff -ru libtheora.old/Makefile.in libtheora/Makefile.in
  
  AUTOMAKE_OPTIONS = foreign dist-zip
  
--SUBDIRS = lib include examples debian
+-SUBDIRS = lib include doc examples debian
 +SUBDIRS = lib include
  
  EXTRA_DIST = COPYING autogen.sh 

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 823af4d37149b31bc749c238b554bfff52736c2f..a8c95ce6b682986e4359227e8f6619091c04f319 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -54,21 +54,21 @@ OGG_URL=http://www.vorbis.com/files/1.0.1/unix/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
 VORBIS_VERSION=1.0
 VORBIS_URL=http://www.xiph.org/ogg/vorbis/download/libvorbis-$(VORBIS_VERSION).tar.gz
-THEORA_VERSION=1.0alpha2
-THEORA_URL=http://www.theora.org/files/libtheora-$(THEORA_VERSION).tar.gz
+THEORA_VERSION=1.0alpha3
+THEORA_URL=http://www.theora.org/files/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.1.0
 FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
-SPEEX_VERSION=1.1.4
+SPEEX_VERSION=1.1.5
 SPEEX_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
 FAAD2_VERSION=2.0
 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
 LAME_VERSION=3.93.1
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.6.4
-LIBEBML_URL=http://matroska.free.fr/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.gz
-LIBMATROSKA_VERSION=0.6.3
-LIBMATROSKA_URL=http://matroska.free.fr/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.gz
+LIBEBML_VERSION=0.7.0
+LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.gz
+LIBMATROSKA_VERSION=0.7.0
+LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.gz
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_CVSROOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg