diff options
| -rw-r--r-- | contrib/libvorbis/A00-disable-examples.patch | 12 | ||||
| -rw-r--r-- | contrib/libvorbis/A01-docs.patch | 34 | ||||
| -rw-r--r-- | contrib/libvorbis/P00-darwin-O4.patch | 23 | ||||
| -rw-r--r-- | contrib/libvorbis/P01-darwin-automake.patch | 9 | ||||
| -rw-r--r-- | contrib/libvorbis/module.defs | 6 | ||||
| -rw-r--r-- | libhb/internal.h | 2 |
6 files changed, 28 insertions, 58 deletions
diff --git a/contrib/libvorbis/A00-disable-examples.patch b/contrib/libvorbis/A00-disable-examples.patch deleted file mode 100644 index 7c163a8be..000000000 --- a/contrib/libvorbis/A00-disable-examples.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libvorbis.orig/Makefile.in libvorbis/Makefile.in ---- libvorbis.orig/Makefile.in 2007-09-14 02:02:10.000000000 -0400 -+++ libvorbis/Makefile.in 2009-03-04 21:20:22.000000000 -0500 -@@ -223,7 +223,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = foreign dist-zip --SUBDIRS = lib include doc examples vq -+SUBDIRS = lib include doc vq - m4datadir = $(datadir)/aclocal - m4data_DATA = vorbis.m4 - pkgconfigdir = $(libdir)/pkgconfig diff --git a/contrib/libvorbis/A01-docs.patch b/contrib/libvorbis/A01-docs.patch deleted file mode 100644 index 817345706..000000000 --- a/contrib/libvorbis/A01-docs.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- libvorbis/doc/Makefile.am 2005-11-27 21:43:22.000000000 -0800 -+++ xxx/doc/Makefile.am 2010-09-11 09:29:32.849597873 -0700 -@@ -30,7 +30,18 @@ - vorbisword2.png \ - wait.png \ - white-ogg.png \ -- white-xifish.png -+ components.png \ -+ floor1-1.png \ -+ floor1-2.png \ -+ floor1-3.png \ -+ floor1-4.png \ -+ hufftree.png \ -+ hufftree-under.png \ -+ residue-pack.png \ -+ residue2.png \ -+ white-xifish.png \ -+ window1.png \ -+ window2.png - - ### FIXME: bits needed by the spec which lives in xml - SPEC_PNG = \ -@@ -55,9 +66,9 @@ - - # conditionally make the generated documentation - if BUILD_DOCS --doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs) -+doc_DATA = $(static_docs) $(built_docs) - else --doc_DATA = $(static_docs) $(SPEC_PNG) -+doc_DATA = $(static_docs) - endif - - EXTRA_DIST = $(static_docs) $(doc_sources) \ diff --git a/contrib/libvorbis/P00-darwin-O4.patch b/contrib/libvorbis/P00-darwin-O4.patch index c213556d9..a8aba933c 100644 --- a/contrib/libvorbis/P00-darwin-O4.patch +++ b/contrib/libvorbis/P00-darwin-O4.patch @@ -1,14 +1,21 @@ -diff -ur libvorbis.orig/configure.in libvorbis/configure.in ---- libvorbis.orig/configure.in 2005-11-28 00:43:26.000000000 -0500 -+++ libvorbis/configure.in 2011-08-19 23:18:50.000000000 -0400 -@@ -161,8 +161,8 @@ - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; +--- aotuv-b6.03_20110424.orig/configure.ac 2010-11-01 12:27:12.000000000 -0700 ++++ aotuv-b6.03_20110424/configure.ac 2011-10-19 16:58:27.295806257 -0700 +@@ -7,6 +7,7 @@ + + AC_INIT([libvorbis],[1.3.2],[[email protected]]) + ++AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([lib/mdct.c]) + + AC_CANONICAL_TARGET([]) +@@ -199,8 +200,8 @@ + PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;; *-*-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" - PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; + CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char" + PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";; - *) - DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" + *-*-os2*) + # Use -W instead of -Wextra because gcc on OS/2 is an old version. + DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" diff --git a/contrib/libvorbis/P01-darwin-automake.patch b/contrib/libvorbis/P01-darwin-automake.patch new file mode 100644 index 000000000..4626fcd45 --- /dev/null +++ b/contrib/libvorbis/P01-darwin-automake.patch @@ -0,0 +1,9 @@ +--- aotuv-b6.03_20110424.orig/Makefile.am 2010-03-25 18:56:26.000000000 -0700 ++++ aotuv-b6.03_20110424/Makefile.am 2011-10-19 16:59:21.274432667 -0700 +@@ -1,5 +1,6 @@ + ## Process this file with automake to produce Makefile.in + ++ACLOCAL_AMFLAGS= -I m4 + AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2 + + SUBDIRS = m4 include vq lib test doc diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs index 51e7a9ec4..84d018fc8 100644 --- a/contrib/libvorbis/module.defs +++ b/contrib/libvorbis/module.defs @@ -1,9 +1,9 @@ $(eval $(call import.MODULE.defs,LIBVORBIS,libvorbis,LIBOGG)) $(eval $(call import.CONTRIB.defs,LIBVORBIS)) -LIBVORBIS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b5.tar.gz -LIBVORBIS.EXTRACT.tarbase = libvorbis +LIBVORBIS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2 +LIBVORBIS.EXTRACT.tarbase = aotuv-b6.03_20110424 LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no" -LIBVORBIS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv; +LIBVORBIS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv; diff --git a/libhb/internal.h b/libhb/internal.h index be9144821..ee6bdccb2 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -279,7 +279,7 @@ hb_buffer_t * hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt ); /*********************************************************************** * Work objects **********************************************************************/ -#define HB_CONFIG_MAX_SIZE 8192 +#define HB_CONFIG_MAX_SIZE (2*8192) union hb_esconfig_u { |