summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
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
parent1357d222387b19a84431ae3a24fcb3a18e20faa8 (diff)
downloadpoky-551174c7896ae715ba76159ab56382e588f5b51c.tar.gz
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')
-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
-rw-r--r--meta/recipes-graphics/tasks/task-poky-clutter.bb6
5 files changed, 23 insertions, 7 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 47eb800c7c..f8ba3e7fac 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 @@
1require clutter-gst.inc 1require clutter-gst.inc
2 2
3PV = "0.11.0+git${SRCPV}" 3PV = "1.3.4+git${SRCPV}"
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
6 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" 6 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
7 7
8DEPENDS += "clutter-1.4" 8DEPENDS += "clutter-1.4"
9 9
10SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master" 10SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master \
11 file://enable_tests.patch"
11 12
12S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
13 14
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index 104ba56e33..614c62d525 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"
7FILESPATH = "${FILE_DIRNAME}/clutter-gst" 7FILESPATH = "${FILE_DIRNAME}/clutter-gst"
8 8
9PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" 10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
11 11
12inherit autotools pkgconfig gtk-doc 12inherit autotools pkgconfig gtk-doc
13 13
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 0000000000..210b9492c6
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
@@ -0,0 +1,15 @@
1Install example binary needed for poky-image-clutter
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4Index: git/examples/Makefile.am
5===================================================================
6--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800
7+++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800
8@@ -1,6 +1,6 @@
9 NULL = #
10
11-noinst_PROGRAMS = video-player video-sink
12+bin_PROGRAMS = video-player video-sink
13
14 INCLUDES = -I$(top_srcdir) \
15 $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/table.inc b/meta/recipes-graphics/clutter/table.inc
index b645514835..937ad56b9c 100644
--- a/meta/recipes-graphics/clutter/table.inc
+++ b/meta/recipes-graphics/clutter/table.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Table Clutter Demo"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1 & GPLv2" 3LICENSE = "LGPLv2.1 & GPLv2"
4 4
5DEPENDS = "clutter-gst-1.0 gnome-vfs" 5DEPENDS = "clutter-gst-1.4 gnome-vfs"
6 6
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8 8
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index c5d829d071..5fe23b92f0 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"
7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9 9
10PR = "r3" 10PR = "r4"
11 11
12PACKAGES = "\ 12PACKAGES = "\
13 task-poky-clutter-core \ 13 task-poky-clutter-core \
@@ -25,11 +25,11 @@ ALLOW_EMPTY = "1"
25 25
26RDEPENDS_task-poky-clutter-core = "\ 26RDEPENDS_task-poky-clutter-core = "\
27 clutter-1.4 \ 27 clutter-1.4 \
28 clutter-gst-1.0 \ 28 clutter-gst-1.4 \
29 clutter-gtk-1.4" 29 clutter-gtk-1.4"
30 30
31RDEPENDS_task-poky-clutter-tests = "\ 31RDEPENDS_task-poky-clutter-tests = "\
32 clutter-gst-1.0-examples \ 32 clutter-gst-1.4-examples \
33 clutter-gtk-1.4-examples" 33 clutter-gtk-1.4-examples"
34 34
35#RDEPENDS_task-poky-clutter-apps = "\ 35#RDEPENDS_task-poky-clutter-apps = "\