Contrib: Theora 1.1.0 is out

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 405ed0d9b51ce08e6458fea668a6e46deb517acc..5a8baeb4c15a9faf9b42f70283af57032c853041 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -761,14 +761,8 @@ else
 endif
 endif
        patch -p0 < Patches/libtheora-includes.patch
-ifdef HAVE_WIN32
-       patch -p0 < Patches/theora-doc.patch
-endif
 
 THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
-ifdef HAVE_WIN32
-THEORACONF += --disable-docs
-endif
 
 ifdef HAVE_DARWIN_64
 THEORACONF += --disable-asm

diff --git a/extras/contrib/src/Patches/theora-doc.patch b/extras/contrib/src/Patches/theora-doc.patch
deleted file mode 100644 (file)
index 10dc8ab..0000000
--- a/extras/contrib/src/Patches/theora-doc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- libtheora/configure.ac     2008-04-16 22:25:55.000000000 +0200
-+++ libtheora.new/configure.ac 2008-10-07 10:06:22.000000000 +0200
-@@ -351,6 +351,12 @@ AC_ARG_ENABLE(examples,
-      [ ac_enable_examples=$enableval ], [ ac_enable_examples=yes] )
- AM_CONDITIONAL(THEORA_ENABLE_EXAMPLES, [test "x${ac_enable_examples}" != xno])
- 
-+ac_enable_docs=yes
-+AC_ARG_ENABLE(docs,
-+     [  --disable-docs            disable docs ],
-+     [ ac_enable_docs=$enableval ], [ac_enable_docs=yes ] )
-+AM_CONDITIONAL(THEORA_ENABLE_DOCS, [test "x${ac_enable_docs}" != xno])
-+
- dnl --------------------------------------------------
- dnl Check for headers
- dnl --------------------------------------------------
-@@ -410,7 +416,7 @@ AS_AC_EXPAND(INCLUDEDIR, ${includedir})
- AS_AC_EXPAND(BINDIR, ${bindir})
- AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
- 
--if test $HAVE_DOXYGEN = "false"; then
-+if test $HAVE_DOXYGEN = "false" -o "x${ac_enable_docs}" = xno; then
-   doc_build="no"
- else
-   doc_build="yes"
---- libtheora/Makefile.am.orig 2008-10-07 10:01:12.000000000 +0200
-+++ libtheora/Makefile.am      2008-10-07 10:00:36.000000000 +0200
-@@ -8,7 +8,13 @@ else
- EXAMPLES_DIR =
- endif
- 
--SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+if THEORA_ENABLE_DOCS
-+DOC_DIR = doc
-+else
-+DOC_DIR =
-+endif
-+
-+SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
- 
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index c39cf7d8e3300c50f8b9b79e159c5a252d3f3259..2ace083861ffbedd3402e3f51e492c1bbb7bbb09 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -72,7 +72,7 @@ OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
 VORBIS_VERSION=1.2.3
 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
 #VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
-THEORA_VERSION=1.1beta3
+THEORA_VERSION=1.1.0
 THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 #THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.2.1