diff options
Diffstat (limited to 'audio/libvorbis/patches')
-rw-r--r-- | audio/libvorbis/patches/patch-aa | 34 | ||||
-rw-r--r-- | audio/libvorbis/patches/patch-ab | 22 | ||||
-rw-r--r-- | audio/libvorbis/patches/patch-ac | 19 | ||||
-rw-r--r-- | audio/libvorbis/patches/patch-ad | 19 |
4 files changed, 0 insertions, 94 deletions
diff --git a/audio/libvorbis/patches/patch-aa b/audio/libvorbis/patches/patch-aa deleted file mode 100644 index 68a94ca9833..00000000000 --- a/audio/libvorbis/patches/patch-aa +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2008/05/14 16:36:18 drochner Exp $ - ---- ./lib/res0.c.orig 2007-07-24 02:09:47.000000000 +0200 -+++ ./lib/res0.c -@@ -223,6 +223,20 @@ vorbis_info_residue *res0_unpack(vorbis_ - 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 @@ vorbis_look_residue *res0_look(vorbis_ds - } - } - -- 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/audio/libvorbis/patches/patch-ab b/audio/libvorbis/patches/patch-ab deleted file mode 100644 index 43a4f0c7eb4..00000000000 --- a/audio/libvorbis/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2008/05/14 16:36:18 drochner Exp $ - ---- ./lib/codebook.c.orig 2008-05-14 18:17:20.000000000 +0200 -+++ ./lib/codebook.c -@@ -159,6 +159,8 @@ int vorbis_staticbook_unpack(oggpack_buf - 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: -@@ -225,7 +227,7 @@ int vorbis_staticbook_unpack(oggpack_buf - 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/audio/libvorbis/patches/patch-ac b/audio/libvorbis/patches/patch-ac deleted file mode 100644 index 73502154928..00000000000 --- a/audio/libvorbis/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2009/05/18 04:42:44 dholland Exp $ - -gcc no longer supports -mv8 on solaris (PR 37177) - ---- configure.in.orig 2009-05-18 00:39:36.000000000 -0400 -+++ configure.in 2009-05-18 00:39:58.000000000 -0400 -@@ -156,9 +156,9 @@ - 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" -- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; -+ DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;; - *-*-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" diff --git a/audio/libvorbis/patches/patch-ad b/audio/libvorbis/patches/patch-ad deleted file mode 100644 index 142629f1d7c..00000000000 --- a/audio/libvorbis/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2009/05/18 04:42:44 dholland Exp $ - -gcc no longer supports -mv8 on solaris (PR 37177) - ---- configure.orig 2009-05-18 00:39:40.000000000 -0400 -+++ configure 2009-05-18 00:40:13.000000000 -0400 -@@ -19472,9 +19472,9 @@ - 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" -- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; -+ DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;; - *-*-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" |