Update libvorbis to 1.2.2

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 58ddd311b4c444e48efcaeef645cd9c177c0fe50..aee5088afad55ec8e3e2620f27988bb642654bea 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -734,11 +734,6 @@ libvorbis-$(VORBIS_VERSION).tar.gz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/libvorbis.patch
-       patch -d libvorbis -p0 < Patches/libvorbis-r14598-CVE-2008-1420.patch
-       patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1419.patch
-       patch -d libvorbis -p0 < Patches/libvorbis-r14602-CVE-2008-1423.patch
-       (cd $@; sh autogen.sh)
 
 .vorbis: libvorbis .ogg
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)

diff --git a/extras/contrib/src/Patches/libvorbis-r14598-CVE-2008-1420.patch b/extras/contrib/src/Patches/libvorbis-r14598-CVE-2008-1420.patch
deleted file mode 100644 (file)
index 819cbf0..0000000
--- a/extras/contrib/src/Patches/libvorbis-r14598-CVE-2008-1420.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: lib/res0.c
-===================================================================
---- lib/res0.c (revision 14597)
-+++ lib/res0.c (revision 14598)
-@@ -223,6 +223,20 @@
-   for(j=0;j<acc;j++)
-     if(info->booklist[j]>=ci->books)goto errout;
- 
-+  /* verify the phrasebook is not specifying an impossible or
-+     inconsistent partitioning scheme. */
-+  {
-+    int entries = ci->book_param[info->groupbook]->entries;
-+    int dim = ci->book_param[info->groupbook]->dim;
-+    int partvals = 1;
-+    while(dim>0){
-+      partvals *= info->partitions;
-+      if(partvals > entries) goto errout;
-+      dim--;
-+    }
-+    if(partvals != entries) goto errout;
-+  }
-+
-   return(info);
-  errout:
-   res0_free_info(info);
-@@ -263,7 +277,7 @@
-     }
-   }
- 
--  look->partvals=rint(pow((float)look->parts,(float)dim));
-+  look->partvals=look->phrasebook->entries;
-   look->stages=maxstage;
-   look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap));
-   for(j=0;j<look->partvals;j++){

diff --git a/extras/contrib/src/Patches/libvorbis-r14602-CVE-2008-1419.patch b/extras/contrib/src/Patches/libvorbis-r14602-CVE-2008-1419.patch
deleted file mode 100644 (file)
index fd73f23..0000000
--- a/extras/contrib/src/Patches/libvorbis-r14602-CVE-2008-1419.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/codebook.c
-===================================================================
---- lib/codebook.c     (revision 14601)
-+++ lib/codebook.c     (revision 14602)
-@@ -225,7 +225,7 @@
-       int quantvals=0;
-       switch(s->maptype){
-       case 1:
--      quantvals=_book_maptype1_quantvals(s);
-+      quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));
-       break;
-       case 2:
-       quantvals=s->entries*s->dim;

diff --git a/extras/contrib/src/Patches/libvorbis-r14602-CVE-2008-1423.patch b/extras/contrib/src/Patches/libvorbis-r14602-CVE-2008-1423.patch
deleted file mode 100644 (file)
index 8c7c479..0000000
--- a/extras/contrib/src/Patches/libvorbis-r14602-CVE-2008-1423.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/codebook.c
-===================================================================
---- lib/codebook.c     (revision 14603)
-+++ lib/codebook.c     (revision 14604)
-@@ -159,6 +159,8 @@
-   s->entries=oggpack_read(opb,24);
-   if(s->entries==-1)goto _eofout;
- 
-+  if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout;
-+
-   /* codeword ordering.... length ordered or unordered? */
-   switch((int)oggpack_read(opb,1)){
-   case 0:

diff --git a/extras/contrib/src/Patches/libvorbis.patch b/extras/contrib/src/Patches/libvorbis.patch
deleted file mode 100644 (file)
index 2bc8d6a..0000000
--- a/extras/contrib/src/Patches/libvorbis.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
---- libvorbis-1.1.1/configure.in       2005-06-21 15:47:45.000000000 +0200
-+++ libvorbis/configure.in     2005-11-14 22:40:18.000000000 +0100
-@@ -86,15 +86,15 @@
-                       CC=cc
-               fi
-               DEBUG="-g -signed" 
--              CFLAGS="-O2 -w -signed"
-+              EXTRA_CFLAGS="-O2 -w -signed"
-               PROFILE="-p -g3 -O2 -signed" ;;
-       sparc-sun-solaris*)
-               DEBUG="-v -g"
--              CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-+              EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-               PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
-       *)
-               DEBUG="-g"
--              CFLAGS="-O"
-+              EXTRA_CFLAGS="-O"
-               PROFILE="-g -p" ;;
-         esac
- else
-@@ -102,7 +102,7 @@
-       case $host in 
-       *86-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+              EXTRA_CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
- #                     PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
-               PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
- 
-@@ -142,33 +142,33 @@
-  AC_MSG_WARN([********************************************************])
-  AC_MSG_WARN([                                                        ])
- 
--              CFLAGS=${OPT}" -D__NO_MATH_INLINES"
-+              EXTRA_CFLAGS=${OPT}" -D__NO_MATH_INLINES"
-               PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
-               fi;;
-       powerpc-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
--              CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
-+              EXTRA_CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
-               PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
-       *-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
-+              EXTRA_CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
-               PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-       sparc-sun-*)
-               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
--              CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
-+              EXTRA_CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
-               PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-       *-*-darwin*)
-               DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--              CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-+              EXTRA_CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-               PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-       *)
-               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-+              EXTRA_CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-               PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-         esac
- fi
--CFLAGS="$CFLAGS $cflags_save"
-+CFLAGS="$EXTRA_CFLAGS $cflags_save"
- 
- dnl --------------------------------------------------
- dnl Check for headers

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 36eb02e6c36e03bc230a3bd29f72e358056924cb..c464dc6d2b8ccb8a10c333bc7effbd7da05ab52d 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -70,7 +70,7 @@ 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.2.0
+VORBIS_VERSION=1.2.2
 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.0