deleted file mode 100644
@@ -1,42 +0,0 @@
-From 859e58b440e64aeec446ae0a923a638e4203f408 Mon Sep 17 00:00:00 2001
-From: Tim Terriberry <tterribe@xiph.org>
-Date: Fri, 20 May 2011 20:41:50 +0000
-Subject: [PATCH] Make autoreconf -i -f work.
-
-Patch from David Schleef.
-
-svn path=/trunk/theora/; revision=17990
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- Makefile.am | 2 ++
- configure.ac | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d833491..369978d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,8 @@
-
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-
-+ACLOCAL_AMFLAGS=-I m4
-+
- if THEORA_ENABLE_EXAMPLES
- EXAMPLES_DIR = examples
- else
-diff --git a/configure.ac b/configure.ac
-index 8260bdf..d4feb86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
-
- dnl Add parameters for aclocal
--AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-+AC_CONFIG_MACRO_DIR([m4])
-
- dnl Check for doxygen
- AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
similarity index 54%
rename from meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
rename to meta/recipes-multimedia/libtheora/libtheora/no-docs.patch
@@ -2,14 +2,14 @@ Upstream-Status: Inappropriate [configuration]
Index: libtheora-1.1.1/Makefile.am
===================================================================
---- libtheora-1.1.1.orig/Makefile.am 2009-11-25 22:01:53.593775926 +0100
-+++ libtheora-1.1.1/Makefile.am 2009-11-25 22:02:00.777524017 +0100
-@@ -8,7 +8,7 @@
+--- ./Makefile.am 2009-11-25 22:01:53.593775926 +0100
++++ ./Makefile.am 2009-11-25 22:02:00.777524017 +0100
+@@ -9,7 +9,7 @@
EXAMPLES_DIR =
endif
-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
+SUBDIRS = lib include tests m4 $(EXAMPLES_DIR)
-
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+ EXTRA_DIST = \
+ README.md CHANGES COPYING LICENSE \
similarity index 81%
rename from meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
rename to meta/recipes-multimedia/libtheora/libtheora_1.2.0.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cf91718f59eb6a83d06dc7bcaf411132"
DEPENDS = "libogg"
-SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \
- file://autoreconf.patch \
+SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.xz \
file://no-docs.patch"
-SRC_URI[sha256sum] = "b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
+SRC_URI[sha256sum] = "ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe2122ec"
UPSTREAM_CHECK_REGEX = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)"
Major changes: - New 'ptalarbvorm' encoder - New th_encode_ctl option for copying configuration from an existing setup header, useful for splicing streams. - Added support for RISC OS. - Improved ARM support. - Various speed, bug fixes and code quality improvements. See CHANGES file for full changelog. Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> --- .../libtheora-1.1.1/autoreconf.patch | 42 ------------------- .../no-docs.patch | 10 ++--- ...{libtheora_1.1.1.bb => libtheora_1.2.0.bb} | 5 +-- 3 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch rename meta/recipes-multimedia/libtheora/{libtheora-1.1.1 => libtheora}/no-docs.patch (54%) rename meta/recipes-multimedia/libtheora/{libtheora_1.1.1.bb => libtheora_1.2.0.bb} (81%)