mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-13 17:10:01 +00:00
Code Issues Projects Releases Wiki Activity

- This adds clutter-{gst,gtk,cairo}-0.8 recipes and clutter-{gst,gtk,cairo}-0.6 recipes.

Browse Source 
- It removes the 0.4 recipes.
- It renames things so that the major.minor revision is now part of the package name.
  This lets us correctly specify SRCREVs for each branch, and allows parallell install.
- All the SRCREVs have been updated to the heads of their corresponding branches


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5384 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Robert Bragg
2008-10-02 17:11:36 +00:00
parent dfffc404ac
commit c856d8bde2
29 changed files with 193 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/clutter/aaina.inc
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "Aaina Clutter Demo"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "GPL"
DEPENDS = "clutter libxml2 gtk+ neon"
DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
inherit autotools pkgconfig
meta/packages/clutter/clutter_0.6svn.bb → meta/packages/clutter/clutter-0.6_svn.bb
View File
meta/packages/clutter/clutter-0.8_svn.bb
+11
View File
@@ -0,0 +1,11 @@
require clutter.inc
PE = "1"
PR = "r0"
PV = "0.8.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http \
file://enable_tests-0.8.patch;patch=1 "
S = "${WORKDIR}/clutter-0-8"
meta/packages/clutter/clutter-box2d.inc
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "GPLv2"
DEPENDS = "clutter"
DEPENDS = "clutter-0.8"
# The main clutter lib is machine specific so we need to be too
PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/packages/clutter/clutter-cairo-0.6_svn.bb
+12
View File
@@ -0,0 +1,12 @@
require clutter-cairo.inc
PV = "0.8.0+svnr${SRCREV}"
DEPENDS += "clutter-0.6"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \
file://enable_examples.patch;patch=1"
S = "${WORKDIR}/${PN}"
meta/packages/clutter/clutter-cairo-0.8_svn.bb
+12
View File
@@ -0,0 +1,12 @@
require clutter-cairo.inc
PV = "0.8.0+svnr${SRCREV}"
DEPENDS += "clutter-0.8"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \
file://enable_examples.patch;patch=1"
S = "${WORKDIR}/${PN}"
meta/packages/clutter/clutter-cairo.inc
+3 -1
View File
@@ -2,7 +2,9 @@ DESCRIPTION = "Clutter Cairo"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPL"
DEPENDS = "clutter cairo"
DEPENDS = "cairo"
FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
PACKAGES =+ "${PN}-examples"
FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
meta/packages/clutter/clutter-cairo_svn.bb
+1
View File
@@ -1,6 +1,7 @@
require clutter-cairo.inc
PV = "0.8.0+svnr${SRCREV}"
PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
file://enable_examples.patch;patch=1"
meta/packages/clutter/clutter-gst-0.6_svn.bb
+10
View File
@@ -0,0 +1,10 @@
require clutter-gst.inc
PV = "0.6.0+svnr${SRCREV}"
DEPENDS += "clutter-0.6"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-6;proto=http"
S = "${WORKDIR}/clutter-gst-0-6"
meta/packages/clutter/clutter-gst-0.8_svn.bb
+10
View File
@@ -0,0 +1,10 @@
require clutter-gst.inc
PV = "0.8.0+svnr${SRCREV}"
DEPENDS += "clutter-0.8"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-8;proto=http"
S = "${WORKDIR}/clutter-gst-0-8"
meta/packages/clutter/clutter-gst.inc
+4 -6
View File
@@ -2,16 +2,14 @@ DESCRIPTION = "Clutter GStreamer"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPL"
DEPENDS = "clutter gstreamer gst-plugins-base"
DEPENDS = "gstreamer gst-plugins-base"
FILESPATH = "${FILE_DIRNAME}/clutter-gst"
PACKAGES =+ "${PN}-examples"
FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
inherit autotools pkgconfig
do_configure_prepend() {
touch ${S}/gtk-doc.make
}
inherit autotools pkgconfig gtk-doc
do_stage () {
autotools_stage_all
meta/packages/clutter/clutter-gst_0.4svn.bb
-9
View File
@@ -1,9 +0,0 @@
require clutter-gst.inc
PV = "0.4.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \
file://autofoo-0.4.patch;patch=1"
S = "${WORKDIR}/clutter-gst-0-4"
meta/packages/clutter/clutter-gst_svn.bb
+1
View File
@@ -1,6 +1,7 @@
require clutter-gst.inc
PV = "0.8.0+svnr${SRCREV}"
PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
file://autofoo.patch;patch=1"
meta/packages/clutter/clutter-gtk-0.6_svn.bb
+10
View File
@@ -0,0 +1,10 @@
require clutter-gtk.inc
PV = "0.6.0+svnr${SRCREV}"
DEPENDS += "clutter-0.6"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-6;proto=http"
S = "${WORKDIR}/clutter-gtk-0-6"
meta/packages/clutter/clutter-gtk-0.8_svn.bb
+10
View File
@@ -0,0 +1,10 @@
require clutter-gtk.inc
PV = "0.8.0+svnr${SRCREV}"
DEPENDS += "clutter-0.8"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-8;proto=http"
S = "${WORKDIR}/clutter-gtk-0-8"
meta/packages/clutter/clutter-gtk.inc
+17
View File
@@ -0,0 +1,17 @@
DESCRIPTION = "Clutter GTK+"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPL"
DEPENDS = "gtk+"
FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
PACKAGES =+ "${PN}-examples"
FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"
inherit autotools pkgconfig gtk-doc
do_stage () {
autotools_stage_all
}
meta/packages/clutter/clutter-gtk_svn.bb
+9
View File
@@ -0,0 +1,9 @@
require clutter-gst.inc
PV = "0.8.0+svnr${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/${PN}"
meta/packages/clutter/clutter.inc
+2
View File
@@ -39,6 +39,8 @@ DEPENDS_eee901 = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
EXTRA_OECONF_eee901 = "${BASE_CONF} --with-flavour=glx"
PACKAGE_ARCH_eee901 = "${MACHINE_ARCH}"
FILESPATH = "${FILE_DIRNAME}/clutter"
inherit autotools pkgconfig gtk-doc
PACKAGES =+ "clutter-examples"
meta/packages/clutter/clutter/enable_tests-0.4.patch
-52
View File
@@ -1,52 +0,0 @@
---
tests/Makefile.am | 7 ++++++-
tests/test-actors.c | 2 +-
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
Index: clutter-0-4/tests/Makefile.am
===================================================================
--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000
+++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
test-actors test-behave test-text test-entry test-project \
test-boxes test-perspective test-rotate test-depth \
test-threads test-timeline
@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c
test_threads_SOURCES = test-threads.c
test_timeline_SOURCES = test-timeline.c
+test_textdir = $(pkgdatadir)
+test_text_DATA = test-text.c
+test_actorsdir = $(pkgdatadir)
+test_actors_DATA = redhand.png
+
EXTRA_DIST = redhand.png
Index: clutter-0-4/tests/test-actors.c
===================================================================
--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000
+++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
stage = clutter_stage_get_default ();
clutter_actor_set_size (stage, 800, 600);
- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
if (!pixbuf)
g_error("pixbuf load failed");
Index: clutter-0-4/tests/test-text.c
===================================================================
--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000
+++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
stage = clutter_stage_get_default ();
- if (!g_file_get_contents ("test-text.c", &text, &size, NULL))
+ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL))
g_error("g_file_get_contents() of test-text.c failed");
clutter_actor_set_size (stage, 800, 600);
meta/packages/clutter/clutter/enable_tests-0.8.patch
+50
View File
@@ -0,0 +1,50 @@
---
tests/Makefile.am | 7 ++++++-
tests/test-actors.c | 2 +-
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
Index: clutter/tests/Makefile.am
===================================================================
--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
+++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
test-actors test-behave test-text test-entry test-project \
test-perspective test-rotate test-depth \
test-threads test-timeline test-timeline-dup-frames \
@@ -17,8 +17,8 @@
test-invariants
if X11_TESTS
-noinst_PROGRAMS += test-pixmap
-noinst_PROGRAMS += test-devices
+bin_PROGRAMS += test-pixmap
+bin_PROGRAMS += test-devices
endif
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
@@ -73,4 +73,9 @@
test_invariants_SOURCES = test-invariants.c
test_devices_SOURCES = test-devices.c
+test_textdir = $(pkgdatadir)
+test_text_DATA = test-text.c
+test_actorsdir = $(pkgdatadir)
+test_actors_DATA = redhand.png
+
EXTRA_DIST = redhand.png test-script.json
Index: clutter/tests/test-actors.c
===================================================================
--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100
+++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100
@@ -195,7 +195,7 @@
/* Create a texture from file, then clone in to same resources */
if (i == 0)
{
- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
&error)) == NULL)
{
g_error ("image load failed: %s", error->message);
meta/packages/clutter/clutter_0.4svn.bb
-13
View File
@@ -1,13 +0,0 @@
require clutter.inc
PV = "0.4.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \
file://enable_tests-0.4.patch;patch=1 "
S = "${WORKDIR}/clutter-0-4"
do_stage () {
cp ${S}/clutter.pc ${S}/clutter-0.4.pc
autotools_stage_all
}
meta/packages/clutter/clutter_svn.bb
+1 -1
View File
@@ -1,7 +1,7 @@
require clutter.inc
PV = "0.8.0+svnr${SRCREV}"
PR = "r0"
PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
file://enable_tests.patch;patch=1;maxrev=2989 \
meta/packages/clutter/table.inc
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "Table Clutter Demo"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPL"
DEPENDS = "clutter-gst gnome-vfs"
DEPENDS = "clutter-gst-0.6 gnome-vfs"
inherit autotools pkgconfig
meta/packages/clutter/table_svn.bb
+1
View File
@@ -1,6 +1,7 @@
require table.inc
PV = "0.3.0+svnr${SRCREV}"
PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \
file://fixes.patch;patch=1"
meta/packages/clutter/tidy.inc
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPL"
STDDEPENDS = "clutter"
STDDEPENDS = "clutter-0.8"
BASE_CONF = "--disable-gtk-doc"
DEPENDS = "${STDDEPENDS}"
meta/packages/clutter/tidy_svn.bb
+1 -1
View File
@@ -1,7 +1,7 @@
require tidy.inc
PV = "0.1.0+svnr${SRCREV}"
PR = "6"
PR = "r7"
SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \
file://tidy-enable-tests.patch;patch=1"