libtheora: update to version 1.1.1

* put recipes into its own dir
* switch to INC_PR and newer oe autotools feature
* remove dependency on libvorbis libogg is enough
* add dependency for pkgconfig to find libogg
* bump PR

8 files changed, 46 insertions, 23 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a881d6bbe3..eab312b999 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -16330,6 +16330,10 @@ sha256=3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
 md5=55ee3c6db3e0927e7918309891a8f52b
 sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef
 
+[http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2]
+md5=292ab65cedd5021d6b7ddd117e07cd8e
+sha256=b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
+
 [http://downloads.sourceforge.net/tilp/libticables-3.9.2.tar.gz]
 md5=354675bfbd881082a9447efde9935226
 sha256=1c091859f09d5a38c76f0d64a93db46aa2b5d637c8a7370d348f21e7be324c37
diff --git a/recipes/libogg/libtheora_1.0.bb b/recipes/libogg/libtheora_1.0.bb
deleted file mode 100644
index 431ed39525..0000000000
--- a/recipes/libogg/libtheora_1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-DEPENDS = "libogg libvorbis"
-
-PR = "r3"
-
-SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \
-	   file://libtheora-1.0-no-docs.patch;patch=1"
-
-inherit autotools lib_package
-
-EXTRA_OECONF = "--disable-examples"
-
-LEAD_SONAME = "libtheora.so.0"
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i -e s:'-I/usr/include':-I${STAGING_INCDIR}:g
-}
-
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-
-do_stage() {
-         autotools_stage_all
-}
diff --git a/recipes/libogg/libtheora-1.0/libtheora-1.0-no-docs.patch b/recipes/libtheora/libtheora-1.0/libtheora-1.0-no-docs.patch
index ce1fa70940..ce1fa70940 100644
--- a/recipes/libogg/libtheora-1.0/libtheora-1.0-no-docs.patch
+++ b/recipes/libtheora/libtheora-1.0/libtheora-1.0-no-docs.patch
diff --git a/recipes/libtheora/libtheora-1.1.1/no-docs.patch b/recipes/libtheora/libtheora-1.1.1/no-docs.patch
new file mode 100644
index 0000000000..5734bce465
--- /dev/null
+++ b/recipes/libtheora/libtheora-1.1.1/no-docs.patch
@@ -0,0 +1,13 @@
+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 @@
+ 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
diff --git a/recipes/libtheora/libtheora.inc b/recipes/libtheora/libtheora.inc
new file mode 100644
index 0000000000..d288e7af06
--- /dev/null
+++ b/recipes/libtheora/libtheora.inc
@@ -0,0 +1,17 @@
+SECTION = "libs"
+DESCRIPTION = "theora  is a high-quality video codec \
+that is free of intellectual property restrictions"
+LICENSE = "BSD"
+
+DEPENDS = "pkgconfig libogg"
+
+INC_PR = "r3"
+
+SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2" 
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-examples"
+
+LEAD_SONAME = "libtheora.so.0"
+
diff --git a/recipes/libogg/libtheora_0.9+1.0alpha7.bb b/recipes/libtheora/libtheora_0.9+1.0alpha7.bb
index 5a372b65a1..5a372b65a1 100644
--- a/recipes/libogg/libtheora_0.9+1.0alpha7.bb
+++ b/recipes/libtheora/libtheora_0.9+1.0alpha7.bb
diff --git a/recipes/libtheora/libtheora_1.0.bb b/recipes/libtheora/libtheora_1.0.bb
new file mode 100644
index 0000000000..01de01d138
--- /dev/null
+++ b/recipes/libtheora/libtheora_1.0.bb
@@ -0,0 +1,6 @@
+require libtheora.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://libtheora-1.0-no-docs.patch;patch=1"
+
diff --git a/recipes/libtheora/libtheora_1.1.1.bb b/recipes/libtheora/libtheora_1.1.1.bb
new file mode 100644
index 0000000000..34bbb0bcbf
--- /dev/null
+++ b/recipes/libtheora/libtheora_1.1.1.bb
@@ -0,0 +1,6 @@
+require libtheora.inc
+
+PR = "${INC_PR}.0"
+ 
+SRC_URI += "file://no-docs.patch;patch=1"
+