From: Jean-Baptiste Kempf <jb@altair.videolan.org>
Date: Wed, 14 May 2008 17:48:50 +0000 (+0200)
Subject: Theora Beta3 and patch the includes...
X-Git-Tag: 0.9.0-test0~951
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ef626a5dee4e9324a14e4f6b20be7cd518bafffe;p=vlc

Theora Beta3 and patch the includes...
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 21159d6c99..57d1f92f56 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -760,6 +760,7 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/theora.patch
+	patch -p0 < Patches/libtheora-includes.patch
 	(cd $@; autoconf)
 
 .theora: libtheora .ogg
diff --git a/extras/contrib/src/Patches/libtheora-includes.patch b/extras/contrib/src/Patches/libtheora-includes.patch
new file mode 100644
index 0000000000..522babbcb3
--- /dev/null
+++ b/extras/contrib/src/Patches/libtheora-includes.patch
@@ -0,0 +1,31 @@
+--- libtheora/tests/comment.c	2008-04-16 22:25:49.000000000 +0200
++++ libtheora.old/tests/comment.c	2008-05-14 19:25:34.000000000 +0200
+@@ -15,11 +15,11 @@
+ 
+  ********************************************************************/
+ 
+-#include <theora/theoradec.h>
+-
+ #include <string.h>
+ #include "tests.h"
+ 
++#include <theora/theoradec.h>
++
+ #define ARTIST1 "Bug-eyed Fish"
+ #define ARTIST2 "VJ Fugu"
+ #define COPYRIGHT "Copyright (C) 2005. Some Rights Reserved."
+--- libtheora/tests/noop.c	2008-04-16 22:25:49.000000000 +0200
++++ libtheora.old/tests/noop.c	2008-05-14 19:22:44.000000000 +0200
+@@ -15,9 +15,11 @@
+ 
+  ********************************************************************/
+ 
++#include "tests.h"
+ #include <theora/theoraenc.h>
+ 
+-#include "tests.h"
++
++
+ 
+ static int
+ noop_test_encode ()
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 2d2d2b1c42..242ec1cb3b 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -76,7 +76,7 @@ OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
 VORBIS_VERSION=1.2.0
 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.0beta2
+THEORA_VERSION=1.0beta3
 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