summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/clutter
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-01-30 14:19:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 23:59:39 +0000
commit551174c7896ae715ba76159ab56382e588f5b51c (patch)
treec18f786820ef7592266a8e853efc898bc622e806 /meta/recipes-graphics/clutter
parent1357d222387b19a84431ae3a24fcb3a18e20faa8 (diff)
downloadopenembedded-core-551174c7896ae715ba76159ab56382e588f5b51c.tar.gz
openembedded-core-551174c7896ae715ba76159ab56382e588f5b51c.tar.bz2
openembedded-core-551174c7896ae715ba76159ab56382e588f5b51c.tar.xz
openembedded-core-551174c7896ae715ba76159ab56382e588f5b51c.zip
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>
Diffstat (limited to 'meta/recipes-graphics/clutter')
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb (renamed from meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb)5
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch15
-rw-r--r--meta/recipes-graphics/clutter/table.inc2
4 files changed, 20 insertions, 4 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
index 47eb800c7..f8ba3e7fa 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
@@ -1,13 +1,14 @@
require clutter-gst.inc
-PV = "0.11.0+git${SRCPV}"
+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"
+SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master \
+ file://enable_tests.patch"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index 104ba56e3..614c62d52 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 000000000..210b9492c
--- /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 b64551483..937ad56b9 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