Contribs: Vorbis bump version to 1.2.0. Security fixes and various fixes.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e1a27625b0f18e34b247b977e1a3936d9cf6b753..95491627aef98ab41931035abb036be5a9393d5c 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -654,7 +654,7 @@ libvorbis-$(VORBIS_VERSION).tar.gz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/libvorbis-1.1.patch
+       patch -p0 < Patches/libvorbis.patch
        (cd $@; autoconf)
 
 .vorbis: libvorbis .ogg

diff --git a/extras/contrib/src/Patches/libvorbis-1.1.patch b/extras/contrib/src/Patches/libvorbis.patch
similarity index 100%
rename from extras/contrib/src/Patches/libvorbis-1.1.patch
rename to extras/contrib/src/Patches/libvorbis.patch

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index b4a0215c5d35483542ae7c90dea83015a4b55169..dcc647bbabbe67baab1c2e0d79f09add9d541dd8 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -62,9 +62,9 @@ OGG_VERSION=1.1.3
 #OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
 OGG_URL=$(VIDEOLAN)/testing/contrib/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
-VORBIS_VERSION=1.1.2
-#VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
-VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
+VORBIS_VERSION=1.2.0
+VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
+#VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
 THEORA_VERSION=1.0alpha7
 #THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2