diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 1 | ||||
-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.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch | 15 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/table.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/tasks/task-poky-clutter.bb | 6 |
6 files changed, 24 insertions, 7 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 544c2d3c7..f192d5c5a 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -19,6 +19,7 @@ SRCREV_pn-clutter-gst-0.6 ??= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd" SRCREV_pn-clutter-gst-0.8 ??= "7a60a435fb0930d911e26158928ab53bda090f3e" SRCREV_pn-clutter-gst-0.10 ??= "8a087fabc888a6a4a939760c392109dbb610adbf" SRCREV_pn-clutter-gst-1.0 ??= "d48c6fc67b48304f90e51b520631c1ecc10410af" +SRCREV_pn-clutter-gst-1.4 ??= "855826ce1111d9a2439b14b61abdbfae72c47132" SRCREV_pn-clutter-helix ??= "b4514a7bae2a059f4e63de64245238a246ed10bd" SRCREV_pn-clutter-gtk-0.6 ??= "2ba362a1a223c2b28541030a80aa11191615340a" SRCREV_pn-clutter-gtk-0.8 ??= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" 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 diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb index c5d829d07..5fe23b92f 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 = "\ |