[vlc-devel] commit: contribs: fix theora patching (Pierre Ynard )

[git version control]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Mon Aug 31 03:35:58 2009 +0200| [2c4fdc1bd2a709b20c055c5c5c6e0dfe975bd5bc] | committer: Pierre Ynard 

contribs: fix theora patching

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c4fdc1bd2a709b20c055c5c5c6e0dfe975bd5bc
---

 extras/contrib/src/Makefile                 |    2 +-
 extras/contrib/src/Patches/theora-doc.patch |   13 -------------
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 23580d4..c72f912 100644
--- 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 cf7e5f8..10dc8ab 100644
--- 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 at EXAMPLES_DIR =
- @THEORA_ENABLE_EXAMPLES_TRUE at EXAMPLES_DIR = examples
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+ at THEORA_ENABLE_DOCS_FALSE@DOC_DIR=
-+ at 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