contribs: fix theora patching

Run ./autogen.sh instead of autoconf, so that we don't need to patch
Makefile.in too (which was broken)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 23580d4f751335c75a0304979d7ef4afbe2b5b8e..c72f912bcef47d1e721360aa83df88c7ffa409b5 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -765,7 +765,7 @@ endif
 ifdef HAVE_WIN32
        patch -p0 < Patches/theora-doc.patch
 endif
-       (cd $@; autoconf)
+       (cd $@; ./autogen.sh)
 
 THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/theora-doc.patch b/extras/contrib/src/Patches/theora-doc.patch
index cf7e5f8b1d03f8dbe1fc5a50a0c3da4e1520effe..10dc8ab2bc9ebe837770328aae2631dc7bfd9bbd 100644 (file)
--- a/extras/contrib/src/Patches/theora-doc.patch
+++ b/extras/contrib/src/Patches/theora-doc.patch
@@ -39,16 +39,3 @@
  
  
  # we include the whole debian/ dir in EXTRA_DIST because there's a problem
---- libtheora/Makefile.in      2008-10-07 10:21:32.000000000 +0200
-+++ libtheora.new/Makefile.in  2008-10-07 10:21:05.000000000 +0200
-@@ -245,7 +245,9 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
- @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR =
- @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+@THEORA_ENABLE_DOCS_FALSE@DOC_DIR=
-+@THEORA_ENABLE_DOCS_TRUE@DOC_DIR=doc
-+SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
-# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
\ No newline at end of file