From 551174c7896ae715ba76159ab56382e588f5b51c Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Sun, 30 Jan 2011 14:19:18 +0800
Subject: clutter-gst-1.0: Upgrade to 1.3.4 (clutter 1.4 series)

Install the example binary needed for poky-image-clutter.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb   | 17 -----------------
 meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb   | 18 ++++++++++++++++++
 meta/recipes-graphics/clutter/clutter-gst.inc          |  2 +-
 .../clutter/clutter-gst/enable_tests.patch             | 15 +++++++++++++++
 meta/recipes-graphics/clutter/table.inc                |  2 +-
 meta/recipes-graphics/tasks/task-poky-clutter.bb       |  6 +++---
 6 files changed, 38 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch

(limited to 'meta/recipes-graphics')

diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
deleted file mode 100644
index 47eb800..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.11.0+git${SRCPV}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
-                    file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
-
-DEPENDS += "clutter-1.4"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-       # Disable DOLT
-       sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
new file mode 100644
index 0000000..f8ba3e7
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
@@ -0,0 +1,18 @@
+require clutter-gst.inc
+
+PV = "1.3.4+git${SRCPV}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
+                    file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+DEPENDS += "clutter-1.4"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master \
+           file://enable_tests.patch"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index 104ba56..614c62d 100644
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst.inc
@@ -7,7 +7,7 @@ DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
 FILESPATH = "${FILE_DIRNAME}/clutter-gst"
 
 PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
+FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
 
 inherit autotools pkgconfig gtk-doc
 
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
new file mode 100644
index 0000000..210b949
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
@@ -0,0 +1,15 @@
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: git/examples/Makefile.am
+===================================================================
+--- git.orig/examples/Makefile.am	2011-01-31 10:14:23.000000000 +0800
++++ git/examples/Makefile.am	2011-01-31 10:14:34.000000000 +0800
+@@ -1,6 +1,6 @@
+ NULL = #
+ 
+-noinst_PROGRAMS = video-player video-sink
++bin_PROGRAMS = video-player video-sink
+ 
+ INCLUDES = -I$(top_srcdir) \
+ 	   $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/table.inc b/meta/recipes-graphics/clutter/table.inc
index b645514..937ad56 100644
--- a/meta/recipes-graphics/clutter/table.inc
+++ b/meta/recipes-graphics/clutter/table.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Table Clutter Demo"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2.1 & GPLv2"
 
-DEPENDS = "clutter-gst-1.0 gnome-vfs"
+DEPENDS = "clutter-gst-1.4 gnome-vfs"
 
 inherit autotools pkgconfig
 
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index c5d829d..5fe23b9 100644
--- a/meta/recipes-graphics/tasks/task-poky-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-poky-clutter.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r3"
+PR = "r4"
 
 PACKAGES = "\
     task-poky-clutter-core \
@@ -25,11 +25,11 @@ ALLOW_EMPTY = "1"
 
 RDEPENDS_task-poky-clutter-core = "\
     clutter-1.4 \
-    clutter-gst-1.0 \
+    clutter-gst-1.4 \
     clutter-gtk-1.4"
 
 RDEPENDS_task-poky-clutter-tests = "\
-    clutter-gst-1.0-examples \
+    clutter-gst-1.4-examples \
     clutter-gtk-1.4-examples"
 
 #RDEPENDS_task-poky-clutter-apps = "\
-- 
cgit v1.1