From: jstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Sat, 23 Oct 2010 18:23:54 +0000 (+0000)
Subject: add bootstrap step to vorbis configure and patch document generation problem
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=3c0f1727085acd09690f11f4bcdb0fcfe603fb7b;p=handbrake-jp%2Fhandbrake-jp-git.git

add bootstrap step to vorbis configure and patch document generation problem
mingw64 doesn't work with the aclocal.m4 packaged with libvorbis, so we
need to regenerate it. There's also a bug in the build config for
documents that gets tickled by mingw64.


git-svn-id: svn://localhost/HandBrake/trunk@3615 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/contrib/libvorbis/A01-docs.patch b/contrib/libvorbis/A01-docs.patch
new file mode 100644
index 00000000..81734570
--- /dev/null
+++ b/contrib/libvorbis/A01-docs.patch
@@ -0,0 +1,34 @@
+--- 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/module.defs b/contrib/libvorbis/module.defs
index df7339c7..d3795dfd 100644
--- a/contrib/libvorbis/module.defs
+++ b/contrib/libvorbis/module.defs
@@ -5,3 +5,5 @@ LIBVORBIS.FETCH.url = http://download.m0k.org/handbrake/contrib/libvorbis-aotuv_
 LIBVORBIS.EXTRACT.tarbase = libvorbis
 
 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;