vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Nov 4 00:03:06 2010 +0100| [4b6e13d37fbac845c07c61236f3c765fae665d90] | committer: Jean-Baptiste Kempf
Contribs: libogg and libvorbis upgrade > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4b6e13d37fbac845c07c61236f3c765fae665d90 --- extras/contrib/src/Patches/libogg-1.1.patch | 30 ++++++++------------------ extras/contrib/src/contrib-src.mak | 1 - extras/contrib/src/packages.mak | 4 +- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/extras/contrib/src/Patches/libogg-1.1.patch b/extras/contrib/src/Patches/libogg-1.1.patch index 6e4f4c9..150d6d2 100644 --- a/extras/contrib/src/Patches/libogg-1.1.patch +++ b/extras/contrib/src/Patches/libogg-1.1.patch @@ -1,5 +1,5 @@ ---- libogg/configure.in 2009-07-08 18:56:26.000000000 +0200 -+++ libogg.new/configure.in 2009-07-08 18:55:50.000000000 +0200 +--- libogg/configure.in 2010-11-01 21:13:42.000000000 +0100 ++++ libogg.new/configure.in 2010-11-03 23:59:54.267733114 +0100 @@ -28,17 +28,17 @@ case $host in *-*-irix*) @@ -21,31 +21,19 @@ PROFILE="-g -p" ;; esac -@@ -46,36 +46,36 @@ +@@ -46,27 +46,27 @@ case $host in *-*-linux*) DEBUG="-g -Wall -fsigned-char" -- CFLAGS="-O20 -ffast-math -fsigned-char" -+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char" +- CFLAGS="-O20 -Wall -ffast-math -fsigned-char" ++ EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char" PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" ;; sparc-sun-*) - sparc_cpu="" - AC_MSG_CHECKING([if gcc supports -mv8]) -- old_cflags="$CFLAGS" -- CFLAGS="$CFLAGS -mv8" -+ old_EXTRA_CFLAGS="$CFLAGS" -+ EXTRA_CFLAGS="$CFLAGS -mv8" - AC_TRY_COMPILE(, [return 0;], [ - AC_MSG_RESULT([yes]) - sparc_cpu="-mv8" - ]) -- CFLAGS="$old_cflags" -+ EXTRA_CFLAGS="$old_cflags" - DEBUG="-g -Wall -fsigned-char $sparc_cpu" -- CFLAGS="-O20 -ffast-math -fsigned-char $sparc_cpu" -+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char $sparc_cpu" - PROFILE="-pg -g -O20 -fsigned-char $sparc_cpu" + DEBUG="-g -Wall -fsigned-char" +- CFLAGS="-O20 -ffast-math -fsigned-char" ++ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char" + PROFILE="-pg -g -O20 -fsigned-char" ;; *-*-darwin*) DEBUG="-fno-common -g -Wall -fsigned-char" diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index b0bca4d..2b6895c 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -653,7 +653,6 @@ libogg-$(OGG_VERSION).tar.gz: libogg: libogg-$(OGG_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/libogg-inttypes.patch patch -p0 < Patches/libogg-1.1.patch ifdef HAVE_WINCE patch -p0 < Patches/libogg-wince.patch diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index c55fb33..56c02ad 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -64,11 +64,11 @@ LIBMPEG2_VERSION=0.5.1 LIBMPEG2_URL=http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz LIBMAD_VERSION=0.15.1b LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz -OGG_VERSION=1.2.0 +OGG_VERSION=1.2.1 OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz #GG_URL=$(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.gz OGG_CVSROOT=:pserver:[email protected]:/usr/local/cvsroot -VORBIS_VERSION=1.3.1 +VORBIS_VERSION=1.3.2 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz #VORBIS_URL=$(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz THEORA_VERSION=1.1.1 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
