Skip to content

V
vlc-2-2
Commit e7c220f4 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Updated speex to 1.1.10 

* Updated theora to alpha5
* Added libshout
parent bf18873e
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 24 deletions
extras/contrib/bootstrap
View file @ e7c220f4
...@@ -56,7 +56,7 @@ case $HOST in ...@@ -56,7 +56,7 @@ case $HOST in
# ENVP defines the oldest environment on which the program will be able to run # 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) # SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak 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_CFLAGS = -D\${ENVP} -isysroot \${MACOSX_SDK}" >> config.mak
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
# echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak # echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak
......
extras/contrib/src/Makefile
View file @ e7c220f4
...@@ -84,7 +84,7 @@ endif ...@@ -84,7 +84,7 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .x264 .theora \ .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 \ .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
.png .gpg-error .gcrypt .gnutls .daap .cddb .cdio .vcdimager .SDL_image \ .png .gpg-error .gcrypt .gnutls .daap .cddb .cdio .vcdimager .SDL_image \
.aclocal .aclocal
...@@ -530,7 +530,6 @@ libtheora-$(THEORA_VERSION).tar.bz2: ...@@ -530,7 +530,6 @@ libtheora-$(THEORA_VERSION).tar.bz2:
libtheora: libtheora-$(THEORA_VERSION).tar.bz2 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
patch -p 0 < Patches/theora.patch
.theora: libtheora .theora: libtheora
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
...@@ -541,6 +540,25 @@ CLEAN_FILE += .theora ...@@ -541,6 +540,25 @@ CLEAN_FILE += .theora
CLEAN_PKG += libtheora CLEAN_PKG += libtheora
DISTCLEAN_PKG += libtheora-$(THEORA_VERSION).tar.bz2 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 # flac
# *************************************************************************** # ***************************************************************************
...@@ -569,7 +587,6 @@ speex-$(SPEEX_VERSION).tar.gz: ...@@ -569,7 +587,6 @@ speex-$(SPEEX_VERSION).tar.gz:
speex: speex-$(SPEEX_VERSION).tar.gz speex: speex-$(SPEEX_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p 0 < Patches/speex.patch
.speex: speex .speex: speex
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install) (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install)
......
extras/contrib/src/Patches/speex.patch deleted 100644 → 0
View file @ bf18873e
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:
extras/contrib/src/packages.mak
View file @ e7c220f4
...@@ -56,17 +56,19 @@ LIBID3TAG_VERSION=0.15.1b ...@@ -56,17 +56,19 @@ LIBID3TAG_VERSION=0.15.1b
LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz
LIBMAD_VERSION=0.15.1b LIBMAD_VERSION=0.15.1b
LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=1.1 OGG_VERSION=1.1.2
OGG_URL=http://www.vorbis.com/files/1.0.1/unix/libogg-$(OGG_VERSION).tar.gz OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
VORBIS_VERSION=1.0 VORBIS_VERSION=1.1.1
VORBIS_URL=http://us.xiph.org/ogg/vorbis/download/libvorbis-$(VORBIS_VERSION).tar.gz VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
THEORA_VERSION=1.0alpha4 THEORA_VERSION=1.0alpha5
THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2 THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
FLAC_VERSION=1.1.2 FLAC_VERSION=1.1.2
FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
SPEEX_VERSION=1.1.5 SPEEX_VERSION=1.1.10
SPEEX_URL=http://us.speex.org/download/speex-$(SPEEX_VERSION).tar.gz 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_VERSION=20040923
FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment