summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Lynch <rusty.lynch@intel.com>2008-10-22 09:57:13 -0700
committerRusty Lynch <rusty.lynch@intel.com>2008-10-22 09:57:13 -0700
commitbe2ad3b90c064aeac043f3ce86af1d2c3b9a0e18 (patch)
tree9d79ec441d835bce5fcc085d5dec821bf327d692
parentd4f444a667cde1dac505610f7294f7e440dc66b1 (diff)
downloadopenembedded-core-contrib-be2ad3b90c064aeac043f3ce86af1d2c3b9a0e18.tar.gz
* Fixing the helix-player.pc to include a -lstdc++
* Adding clutter-helix recipe
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc1
-rw-r--r--meta/packages/clutter/clutter-helix.inc17
-rw-r--r--meta/packages/clutter/clutter-helix_svn.bb8
-rw-r--r--meta/packages/helix/helix-libs/helix-player.pc2
4 files changed, 27 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 8b047a87df..936b07f62f 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -27,6 +27,7 @@ SRCREV_pn-clutter-cairo ?= "3313"
SRCREV_pn-clutter-gst-0.6 ?= "2961"
SRCREV_pn-clutter-gst-0.8 ?= "3351"
SRCREV_pn-clutter-gst ?= "3349"
+SRCREV_pn-clutter-helix ?= "3390"
SRCREV_pn-clutter-gtk-0.6 ?= "2961"
SRCREV_pn-clutter-gtk-0.8 ?= "3350"
SRCREV_pn-clutter-gtk ?= "3349"
diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/packages/clutter/clutter-helix.inc
new file mode 100644
index 0000000000..6e0612ad3a
--- /dev/null
+++ b/meta/packages/clutter/clutter-helix.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Clutter Helix"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "helix-libs"
+
+FILESPATH = "${FILE_DIRNAME}/clutter-helix"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
+
+inherit autotools pkgconfig gtk-doc
+
+do_stage () {
+ autotools_stage_all
+}
+
diff --git a/meta/packages/clutter/clutter-helix_svn.bb b/meta/packages/clutter/clutter-helix_svn.bb
new file mode 100644
index 0000000000..36206685e4
--- /dev/null
+++ b/meta/packages/clutter/clutter-helix_svn.bb
@@ -0,0 +1,8 @@
+require clutter-helix.inc
+
+PV = "0.8.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
diff --git a/meta/packages/helix/helix-libs/helix-player.pc b/meta/packages/helix/helix-libs/helix-player.pc
index bac67fc5c9..5d2994809e 100644
--- a/meta/packages/helix/helix-libs/helix-player.pc
+++ b/meta/packages/helix/helix-libs/helix-player.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
Name: helix-player
Description: Helix Player Interface
Version: 4.1.0
-Libs: -L${libdir} -lhelix-player
+Libs: -L${libdir} -lhelix-player -lstdc++
Cflags: -I/opt/helix/include -D_UNIX
Requires: