>From bfce18ac13b6fe40a26aec110c26441f9350ed28 Mon Sep 17 00:00:00 2001 From: Andreas Mueller <[email protected]> Date: Thu, 26 Aug 2010 14:38:30 +0200 Subject: [PATCH] clutter*: Remove obsolete recipes / files
Signed-off-by: Andreas Mueller <[email protected]> --- recipes/clutter/clutter-0.9_git.bb | 23 ----- recipes/clutter/clutter-1.0_1.0.10.bb | 22 ---- recipes/clutter/clutter-box2d/introspection.diff | 31 ------ recipes/clutter/clutter-box2d_0.10.0.bb | 9 -- recipes/clutter/clutter-cairo.inc | 11 -- .../clutter/clutter-cairo/enable_examples.patch | 28 ------ recipes/clutter/clutter-cairo_svn.bb | 11 -- recipes/clutter/clutter-fpu.inc | 6 - recipes/clutter/clutter-glx_svn.bb | 10 -- recipes/clutter/clutter-gst-0.9_git.bb | 13 --- recipes/clutter/clutter-gst/autofoo-0.4.patch | 15 --- recipes/clutter/clutter-gst/autofoo.patch | 25 ----- recipes/clutter/clutter-gst_0.4svn.bb | 9 -- recipes/clutter/clutter-gst_svn.bb | 9 -- recipes/clutter/clutter-gtk-0.6_git.bb | 10 -- recipes/clutter/clutter-gtk-0.8_git.bb | 10 -- recipes/clutter/clutter/enable-tests-r2990.patch | 50 ---------- recipes/clutter/clutter/enable_tests-0.4.patch | 52 ---------- recipes/clutter/clutter/enable_tests-0.6.patch | 40 -------- recipes/clutter/clutter/enable_tests.patch | 48 --------- recipes/clutter/clutter_0.4svn.bb | 15 --- recipes/clutter/clutter_0.6svn.bb | 10 -- recipes/clutter/clutter_0.8+git.bb | 15 --- recipes/clutter/clutter_svn.bb | 15 --- ...st-videosink-guard-GL-calls-with-ifdef-CL.patch | 102 -------------------- recipes/clutter/files/enable_tests.patch | 32 ------ 26 files changed, 0 insertions(+), 621 deletions(-) delete mode 100644 recipes/clutter/clutter-0.9_git.bb delete mode 100644 recipes/clutter/clutter-1.0_1.0.10.bb delete mode 100644 recipes/clutter/clutter-box2d/introspection.diff delete mode 100644 recipes/clutter/clutter-box2d_0.10.0.bb delete mode 100644 recipes/clutter/clutter-cairo.inc delete mode 100644 recipes/clutter/clutter-cairo/enable_examples.patch delete mode 100644 recipes/clutter/clutter-cairo_svn.bb delete mode 100644 recipes/clutter/clutter-fpu.inc delete mode 100644 recipes/clutter/clutter-glx_svn.bb delete mode 100644 recipes/clutter/clutter-gst-0.9_git.bb delete mode 100644 recipes/clutter/clutter-gst/autofoo-0.4.patch delete mode 100644 recipes/clutter/clutter-gst/autofoo.patch delete mode 100644 recipes/clutter/clutter-gst_0.4svn.bb delete mode 100644 recipes/clutter/clutter-gst_svn.bb delete mode 100644 recipes/clutter/clutter-gtk-0.6_git.bb delete mode 100644 recipes/clutter/clutter-gtk-0.8_git.bb delete mode 100644 recipes/clutter/clutter/enable-tests-r2990.patch delete mode 100644 recipes/clutter/clutter/enable_tests-0.4.patch delete mode 100644 recipes/clutter/clutter/enable_tests-0.6.patch delete mode 100644 recipes/clutter/clutter/enable_tests.patch delete mode 100644 recipes/clutter/clutter_0.4svn.bb delete mode 100644 recipes/clutter/clutter_0.6svn.bb delete mode 100644 recipes/clutter/clutter_0.8+git.bb delete mode 100644 recipes/clutter/clutter_svn.bb delete mode 100644 recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch delete mode 100644 recipes/clutter/files/enable_tests.patch diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb deleted file mode 100644 index 5bbd8a8..0000000 --- a/recipes/clutter/clutter-0.9_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -require clutter.inc - -SRCREV = "13e055a351f83c56b895b131566a6e842d24ed2a" - -PV = "1.1.0" -PR = "${INC_PR}.0" -PR_append = "+git${SRCREV}" - -SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \ - file://enable_tests.patch " -S = "${WORKDIR}/git" - -BASE_CONF += "--disable-introspection" - -PARALLEL_MAKE = "" - -do_compile_prepend() { - for i in $(find ${S} -name Makefile) ; do - sed -i -e s:-Werror::g $i - done - ( cd clutter/cogl/gles ; for i in *.glsl ; do sh stringify.sh -h $i ; done ) -} - diff --git a/recipes/clutter/clutter-1.0_1.0.10.bb b/recipes/clutter/clutter-1.0_1.0.10.bb deleted file mode 100644 index 93fb893..0000000 --- a/recipes/clutter/clutter-1.0_1.0.10.bb +++ /dev/null @@ -1,22 +0,0 @@ -require clutter.inc - -PR = "${INC_PR}.0" - -SRC_URI = "http://source.clutter-project.org/sources/clutter/1.0/clutter-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "bf48e85291cba33f3f149f4eefe759f0" -SRC_URI[sha256sum] = "6fb98dc4d16a3a98be734cf0a6cc4f8d8179800603c3e41011c414eeaf1f456b" - -S = "${WORKDIR}/clutter-${PV}" - -BASE_CONF += "--disable-introspection" - -PARALLEL_MAKE = "" - -do_compile_prepend() { - for i in $(find ${S} -name Makefile) ; do - sed -i -e s:-Werror::g $i - done - ( cd clutter/cogl/gles ; for i in *.glsl ; do sh stringify.sh -h $i ; done ) -} - diff --git a/recipes/clutter/clutter-box2d/introspection.diff b/recipes/clutter/clutter-box2d/introspection.diff deleted file mode 100644 index e38b837..0000000 --- a/recipes/clutter/clutter-box2d/introspection.diff +++ /dev/null @@ -1,31 +0,0 @@ -From dae84a82efe22b284cba8ca1985ce14bb4e86c99 Mon Sep 17 00:00:00 2001 -From: Damien Lespiau <[email protected]> -Date: Mon, 03 Aug 2009 10:47:41 +0000 -Subject: [build] Don't build introspection stuff when configure said we can't - -Surround the instrospection file generation with if HAVE_INTROSPECTION / -endif ---- -diff --git a/clutter-box2d/Makefile.am b/clutter-box2d/Makefile.am -index 8da23a7..6db8aae 100644 ---- a/clutter-box2d/Makefile.am -+++ b/clutter-box2d/Makefile.am -@@ -39,6 +39,8 @@ DISTCLEANFILES = $(MARSHALFILES) - EXTRA_DIST = \ - clutter-box2d-marshal.list - -+if HAVE_INTROSPECTION -+ - BUILT_GIRSOURCES = - - clutterbox...@[email protected]: $(INTROSPECTION_SCANNER) libclutter-box...@[email protected] -@@ -68,5 +70,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) - %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F) - -+endif # HAVE_INTROSPECTION -+ - CLEANFILES= - CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) --- -cgit v0.8.3.1-30-gff3a diff --git a/recipes/clutter/clutter-box2d_0.10.0.bb b/recipes/clutter/clutter-box2d_0.10.0.bb deleted file mode 100644 index 5f3a063..0000000 --- a/recipes/clutter/clutter-box2d_0.10.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-box2d.inc - -SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \ - file://introspection.diff \ -" - -SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d" -SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f" - diff --git a/recipes/clutter/clutter-cairo.inc b/recipes/clutter/clutter-cairo.inc deleted file mode 100644 index 5c6d7e7..0000000 --- a/recipes/clutter/clutter-cairo.inc +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Clutter Cairo" -HOMEPAGE = "http://www.clutter-project.org/"; -LICENSE = "LGPL" - -DEPENDS = "clutter cairo" - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" - -inherit autotools pkgconfig - diff --git a/recipes/clutter/clutter-cairo/enable_examples.patch b/recipes/clutter/clutter-cairo/enable_examples.patch deleted file mode 100644 index c5ed63f..0000000 --- a/recipes/clutter/clutter-cairo/enable_examples.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- - examples/Makefile.am | 2 +- - examples/flowers.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: clutter-cairo/examples/Makefile.am -=================================================================== ---- clutter-cairo.orig/examples/Makefile.am 2008-08-11 16:30:04.000000000 +0100 -+++ clutter-cairo/examples/Makefile.am 2008-08-11 16:30:24.000000000 +0100 -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = clock flowers bubbles -+bin_PROGRAMS = clock flowers bubbles - - INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@ - AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cai...@[email protected] -Index: clutter-cairo/examples/flowers.c -=================================================================== ---- clutter-cairo.orig/examples/flowers.c 2008-08-11 16:30:04.000000000 +0100 -+++ clutter-cairo/examples/flowers.c 2008-08-11 16:30:10.000000000 +0100 -@@ -11,7 +11,7 @@ - - #define PETAL_MIN 20 - #define PETAL_VAR 40 --#define N_FLOWERS 40 /* reduce if you have a small card */ -+#define N_FLOWERS 8 /* reduce if you have a small card */ - - typedef struct Flower - { diff --git a/recipes/clutter/clutter-cairo_svn.bb b/recipes/clutter/clutter-cairo_svn.bb deleted file mode 100644 index db270c1..0000000 --- a/recipes/clutter/clutter-cairo_svn.bb +++ /dev/null @@ -1,11 +0,0 @@ -require clutter-cairo.inc - -PV = "0.8.0+svnr${SRCPV}" -SRCREV = "3210" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ - file://enable_examples.patch" - -S = "${WORKDIR}/${PN}" - - diff --git a/recipes/clutter/clutter-fpu.inc b/recipes/clutter/clutter-fpu.inc deleted file mode 100644 index 21a16fe..0000000 --- a/recipes/clutter/clutter-fpu.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_clutter_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--without-fpu" - return "" - diff --git a/recipes/clutter/clutter-glx_svn.bb b/recipes/clutter/clutter-glx_svn.bb deleted file mode 100644 index 0590330..0000000 --- a/recipes/clutter/clutter-glx_svn.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter.inc - -PV = "0.3.1+svn${SRCDATE}" -PR = "${INC_PR}.0" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http" - -S = "${WORKDIR}/clutter" - - diff --git a/recipes/clutter/clutter-gst-0.9_git.bb b/recipes/clutter/clutter-gst-0.9_git.bb deleted file mode 100644 index 3bf7d48..0000000 --- a/recipes/clutter/clutter-gst-0.9_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require clutter-gst.inc - -DEPENDS = "clutter-0.9 gstreamer gst-plugins-base" - -SRCREV = "379b63b013af463210e54470693aedfa9009f4dc" -PV = "0.9.0" -PR = "r4" -PR_append = "+git${SRCREV}" - -SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \ - file://gtk-doc.make" - -S = "${WORKDIR}/git" diff --git a/recipes/clutter/clutter-gst/autofoo-0.4.patch b/recipes/clutter/clutter-gst/autofoo-0.4.patch deleted file mode 100644 index 54df63d..0000000 --- a/recipes/clutter/clutter-gst/autofoo-0.4.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - doc/reference/Makefile.am | 2 +- - examples/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: clutter-gst/examples/Makefile.am -=================================================================== ---- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 -+++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = video-player video-sink audio -+bin_PROGRAMS = video-player video-sink audio - - INCLUDES = -I$(top_srcdir)/ - diff --git a/recipes/clutter/clutter-gst/autofoo.patch b/recipes/clutter/clutter-gst/autofoo.patch deleted file mode 100644 index 569b0d8..0000000 --- a/recipes/clutter/clutter-gst/autofoo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- - doc/reference/Makefile.am | 2 +- - examples/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: clutter-gst/examples/Makefile.am -=================================================================== ---- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 -+++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = video-player video-sink audio -+bin_PROGRAMS = video-player video-sink audio - - INCLUDES = -I$(top_srcdir)/ - -Index: clutter-gst/doc/reference/Makefile.am -=================================================================== ---- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 -+++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 -@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += version.xml.in -+EXTRA_DIST = version.xml.in diff --git a/recipes/clutter/clutter-gst_0.4svn.bb b/recipes/clutter/clutter-gst_0.4svn.bb deleted file mode 100644 index 35f94c2..0000000 --- a/recipes/clutter/clutter-gst_0.4svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gst.inc - -PV = "0.4.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \ - file://autofoo-0.4.patch" - - -S = "${WORKDIR}/clutter-gst-0-4" diff --git a/recipes/clutter/clutter-gst_svn.bb b/recipes/clutter/clutter-gst_svn.bb deleted file mode 100644 index 42dc2d8..0000000 --- a/recipes/clutter/clutter-gst_svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gst.inc - -PV = "0.8.0+svnr${SRCPV}" -SRCREV = "3188" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ - file://autofoo.patch" - -S = "${WORKDIR}/${PN}" diff --git a/recipes/clutter/clutter-gtk-0.6_git.bb b/recipes/clutter/clutter-gtk-0.6_git.bb deleted file mode 100644 index e37c4c9..0000000 --- a/recipes/clutter/clutter-gtk-0.6_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter-gtk.inc - -SRCREV = "2ba362a1a223c2b28541030a80aa11191615340a" -PV = "0.6.0+git${SRCREV}" - -DEPENDS += "clutter-0.6" - -SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6" - -S = "${WORKDIR}/git" diff --git a/recipes/clutter/clutter-gtk-0.8_git.bb b/recipes/clutter/clutter-gtk-0.8_git.bb deleted file mode 100644 index b06e266..0000000 --- a/recipes/clutter/clutter-gtk-0.8_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter-gtk.inc - -SRCREV = "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" -PV = "0.8.0+git${SRCREV}" - -DEPENDS += "clutter" - -SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8" - -S = "${WORKDIR}/git" diff --git a/recipes/clutter/clutter/enable-tests-r2990.patch b/recipes/clutter/clutter/enable-tests-r2990.patch deleted file mode 100644 index 4f449b1..0000000 --- a/recipes/clutter/clutter/enable-tests-r2990.patch +++ /dev/null @@ -1,50 +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/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); diff --git a/recipes/clutter/clutter/enable_tests-0.4.patch b/recipes/clutter/clutter/enable_tests-0.4.patch deleted file mode 100644 index 3178a2c..0000000 --- a/recipes/clutter/clutter/enable_tests-0.4.patch +++ /dev/null @@ -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); diff --git a/recipes/clutter/clutter/enable_tests-0.6.patch b/recipes/clutter/clutter/enable_tests-0.6.patch deleted file mode 100644 index 544a7e5..0000000 --- a/recipes/clutter/clutter/enable_tests-0.6.patch +++ /dev/null @@ -1,40 +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-6/tests/Makefile.am -=================================================================== ---- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000 -+++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.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 test-score test-script -@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c - test_score_SOURCES = test-score.c - test_script_SOURCES = test-script.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-0-6/tests/test-actors.c -=================================================================== ---- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000 -+++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.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"); - diff --git a/recipes/clutter/clutter/enable_tests.patch b/recipes/clutter/clutter/enable_tests.patch deleted file mode 100644 index 4a99968..0000000 --- a/recipes/clutter/clutter/enable_tests.patch +++ /dev/null @@ -1,48 +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/tests/Makefile.am -=================================================================== ---- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100 -+++ clutter/tests/Makefile.am 2008-04-25 16:47:12.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 \ -@@ -14,7 +14,7 @@ - test-cogl-tex-polygon test-stage-read-pixels - - if X11_TESTS --noinst_PROGRAMS += test-pixmap -+bin_PROGRAMS += test-pixmap - endif - - INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter -@@ -61,4 +61,9 @@ - test_cogl_offscreen_SOURCES = test-cogl-offscreen.c - test_stage_read_pixels_SOURCES = test-stage-read-pixels.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-04-25 16:45:17.000000000 +0100 -+++ clutter/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100 -@@ -184,7 +184,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); diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb deleted file mode 100644 index 9399180..0000000 --- a/recipes/clutter/clutter_0.4svn.bb +++ /dev/null @@ -1,15 +0,0 @@ -require clutter.inc - -PV = "0.4.0+svnr${SRCPV}" -PR = "${INC_PR}.0" -SRCREV = "3240" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ - file://enable_tests-0.4.patch " - -S = "${WORKDIR}/clutter-0-4" - -do_stage () { - cp ${S}/clutter.pc ${S}/clutter-0.4.pc - autotools_stage_all -} diff --git a/recipes/clutter/clutter_0.6svn.bb b/recipes/clutter/clutter_0.6svn.bb deleted file mode 100644 index e86cbaf..0000000 --- a/recipes/clutter/clutter_0.6svn.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter.inc - -PV = "0.6.0+svnr${SRCPV}" -PR = "${INC_PR}.0" -SRCREV = "3240" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \ - file://enable_tests-0.6.patch " - -S = "${WORKDIR}/clutter-0-6" diff --git a/recipes/clutter/clutter_0.8+git.bb b/recipes/clutter/clutter_0.8+git.bb deleted file mode 100644 index 692154d..0000000 --- a/recipes/clutter/clutter_0.8+git.bb +++ /dev/null @@ -1,15 +0,0 @@ -require clutter.inc - -CLUTTER_REV = "af16378899699376fe7e84c7c11eb3bb5c4668cd" - -PV = "0.8.8" -PR = "${INC_PR}.0" -PR_append = "+gitr${CLUTTER_REV}" - -SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \ - file://enable-tests-r2990.patch" - -S = "${WORKDIR}/git" - - -ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb deleted file mode 100644 index f2cd50b..0000000 --- a/recipes/clutter/clutter_svn.bb +++ /dev/null @@ -1,15 +0,0 @@ -require clutter.inc - -DEFAULT_PREFERENCE = "-1" - -PV = "0.8.0+svnr${SRCPV}" -PR = "${INC_PR}.0" -SRCREV = "3240" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ - file://enable_tests.patch;maxrev=2989 \ - file://enable-tests-r2990.patch;minrev=2990" - -S = "${WORKDIR}/clutter" - - diff --git a/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch b/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch deleted file mode 100644 index e373bca..0000000 --- a/recipes/clutter/files/0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 0677f1e6b5221caf78d50d94d2d0611e7f4b0abc Mon Sep 17 00:00:00 2001 -From: Damien Lespiau <[email protected]> -Date: Sun, 14 Jun 2009 15:30:04 +0100 -Subject: [PATCH] Fix compilation with OpenGL ES backends - -* Don't try to compile ARB fp1.0 shaders on non GL platforms, -* Use CGL_MAX_COMBINED_TEXTURE_IMAGE_UNITS to query the number of - texture units one can use in a shader in a portable fashion. ---- - clutter-gst/clutter-gst-video-sink.c | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c -index d6eb6a3..516a42c 100644 ---- a/clutter-gst/clutter-gst-video-sink.c -+++ b/clutter-gst/clutter-gst-video-sink.c -@@ -236,6 +236,7 @@ _string_array_to_char_array (char *dst, - *dst = '\0'; - } - -+#ifdef CLUTTER_COGL_HAS_GL - static void - clutter_gst_video_sink_fp_paint (ClutterActor *actor, - ClutterGstVideoSink *sink) -@@ -274,6 +275,7 @@ clutter_gst_video_sink_set_fp_shader (ClutterGstVideoSink *sink, - priv->shaders_init = TRUE; - - } -+#endif - - static void - clutter_gst_video_sink_paint (ClutterActor *actor, -@@ -532,6 +534,7 @@ static ClutterGstRenderer yv12_glsl_renderer = - * 8 bit Y plane followed by 8 bit 2x2 subsampled V and U planes. - */ - -+#ifdef CLUTTER_COGL_HAS_GL - static void - clutter_gst_yv12_fp_init (ClutterActor *actor, - ClutterGstVideoSink *sink) -@@ -573,6 +576,7 @@ static ClutterGstRenderer yv12_fp_renderer = - clutter_gst_yv12_paint, - clutter_gst_yv12_fp_post_paint, - }; -+#endif - - /* - * I420 -@@ -620,6 +624,7 @@ static ClutterGstRenderer i420_glsl_renderer = - * Basically the same as YV12, but with the 2 chroma planes switched. - */ - -+#ifdef CLUTTER_COGL_HAS_GL - static void - clutter_gst_i420_fp_init (ClutterActor *actor, - ClutterGstVideoSink *sink) -@@ -646,6 +651,7 @@ static ClutterGstRenderer i420_fp_renderer = - clutter_gst_yv12_paint, - clutter_gst_yv12_fp_post_paint, - }; -+#endif - - /* - * AYUV -@@ -707,9 +713,11 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) - &rgb24_renderer, - &rgb32_renderer, - &yv12_glsl_renderer, -- &yv12_fp_renderer, - &i420_glsl_renderer, -+#ifdef CLUTTER_COGL_HAS_GL -+ &yv12_fp_renderer, - &i420_fp_renderer, -+#endif - &ayuv_glsl_renderer, - NULL - }; -@@ -717,11 +725,12 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) - /* get the features */ - gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS); - -- glGetIntegerv (GL_MAX_TEXTURE_UNITS, &nb_texture_units); -+ glGetIntegerv (CGL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &nb_texture_units); - - if (nb_texture_units >= 3) - features |= CLUTTER_GST_MULTI_TEXTURE; - -+#ifdef CLUTTER_COGL_HAS_GL - if (cogl_check_extension ("GL_ARB_fragment_program", gl_extensions)) - { - /* the shaders we'll feed to the GPU are simple enough, we don't need -@@ -741,6 +750,7 @@ clutter_gst_build_renderers_list (ClutterGstSymbols *syms) - features |= CLUTTER_GST_FP; - } - } -+#endif - - if (cogl_features_available (COGL_FEATURE_SHADERS_GLSL)) - features |= CLUTTER_GST_GLSL; --- -1.6.3 - diff --git a/recipes/clutter/files/enable_tests.patch b/recipes/clutter/files/enable_tests.patch deleted file mode 100644 index 953edf6..0000000 --- a/recipes/clutter/files/enable_tests.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- - tests/Makefile.am | 7 ++++++- - tests/test-actors.c | 2 +- - tests/test-text.c | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -Index: git/tests/interactive/Makefile.am -=================================================================== ---- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000 -+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000 -@@ -77,7 +77,7 @@ - AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) - AM_LDFLAGS = $(CLUTTER_LIBS) - --noinst_PROGRAMS = test-interactive -+bin_PROGRAMS = test-interactive - - test_interactive_SOURCES = \ - test-main.c \ -Index: git/tests/interactive/test-actors.c -=================================================================== ---- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000 -+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000 -@@ -182,7 +182,7 @@ - oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); - oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); - -- real_hand = clutter_texture_new_from_file ("redhand.png", &error); -+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error); - if (real_hand == NULL) - { - g_error ("image load failed: %s", error->message); -- 1.5.3.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
