* updates for cogl, clutter and mx
@ 2013-05-17 11:25 Tomas Frydrych
2013-05-17 11:25 ` [PATCH 1/7] Remove old clutter recipes Tomas Frydrych
` (8 more replies)
0 siblings, 9 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
The following set of patches updates clutter and friends; the recipes were
completely reworked and use PACKAGECONFIG to facilitate easy reconfiguration
to match distro / machine needs.
Clutter and Cogl packages are renamed to use a '-1.0' suffix instead of the
'-vmajor.vminor' suffix of the old recipes, in keeping up with the upstream
versioning policy, and to simplify dependency maintenance (note that dev files
for the 1.x series are not parallel installable anyway); the '-1.0' suffix is
with a view toward the '2.0' series which are on the horizon.
The Cogl recipe is moved into a subdirectory of its own, this seemed
appropriate as Cogl is now a seprate project in its own right.
The new versions are: cogl 1.4.0, clutter 1.14.4, clutter-gst 1.6.0,
clutter-gtk 1.4.2. The mx recipe is fixed up to build against the updated cogl
and clutter.
[PATCH 1/7] Remove old clutter recipes
[PATCH 2/7] clutter.bbclass: helper class for clutter and friends
[PATCH 3/7] New cogl recipe (1.14.0)
[PATCH 4/7] New clutter recipe (1.14.4)
[PATCH 5/7] New clutter gst recipe (1.6.0)
[PATCH 6/7] New clutter-gtk recipe (1.4.2)
[PATCH 7/7] Update mx recipe to build with clutter 1.14.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH 1/7] Remove old clutter recipes
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 11:25 ` [PATCH 2/7] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
` (7 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 23 -------
meta/recipes-graphics/clutter/clutter-1.8_git.bb | 20 ------
meta/recipes-graphics/clutter/clutter-fpu.inc | 6 --
.../clutter/clutter-gst-1.8_1.4.6.bb | 22 -------
meta/recipes-graphics/clutter/clutter-gst.inc | 13 ----
.../clutter/clutter-gst/enable_tests-1.4.patch | 18 ------
.../clutter/clutter-gst/enable_tests-1.8.patch | 17 -----
.../clutter/clutter-gst/enable_tests.patch | 18 ------
.../clutter/clutter-gtk-1.8_0.11.4.bb | 11 ----
meta/recipes-graphics/clutter/clutter-gtk.inc | 14 ----
.../clutter/clutter-gtk/disable_deprecated.patch | 21 ------
.../clutter/clutter-gtk/enable_tests.patch | 18 ------
meta/recipes-graphics/clutter/clutter-package.inc | 2 -
meta/recipes-graphics/clutter/clutter.inc | 23 -------
.../clutter/clutter/build-fix.patch | 18 ------
.../clutter/clutter/enable_tests-0.6.patch | 42 ------------
.../clutter/clutter/enable_tests-0.8.patch | 52 ---------------
.../clutter/clutter/enable_tests-1.0.patch | 34 ----------
.../clutter/clutter/enable_tests-1.4.patch | 15 -----
...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 34 ----------
.../clutter/clutter/enable_tests.patch | 34 ----------
.../clutter/clutter/symconflict.patch | 33 ----------
.../clutter/clutter/test-conformance-fix.patch | 68 --------------------
.../clutter/update_gettext_macro_version.patch | 32 ---------
meta/recipes-graphics/clutter/cogl.inc | 22 -------
.../clutter/cogl/build_for_armv4t.patch | 23 -------
.../clutter/cogl/macro-versions.patch | 28 --------
meta/recipes-graphics/clutter/cogl_1.8.2.bb | 12 ----
meta/recipes-graphics/clutter/cogl_git.bb | 16 -----
29 files changed, 689 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_git.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-fpu.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-package.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter/build-fix.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/symconflict.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
delete mode 100644 meta/recipes-graphics/clutter/cogl.inc
delete mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
delete mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch
delete mode 100644 meta/recipes-graphics/clutter/cogl_1.8.2.bb
delete mode 100644 meta/recipes-graphics/clutter/cogl_git.bb
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
deleted file mode 100644
index aceef96..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require recipes-graphics/clutter/clutter.inc
-require recipes-graphics/clutter/clutter-package.inc
-
-PR = "r2"
-
-# We're API/ABI compatible and this may make things easier for layers
-PROVIDES += "clutter-1.6"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.tar.bz2 \
- file://enable_tests-1.4.patch \
- file://update_gettext_macro_version.patch"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-# because we've namespaced PN to clutter-1.8
-S = "${WORKDIR}/clutter-${PV}"
-
-BASE_CONF += "--disable-introspection"
-
-SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
-SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91"
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
deleted file mode 100644
index 89d8026..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require clutter.inc
-require clutter-package.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-# the 1.8.4 tag
-SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
-PV = "1.8.4+git${SRCPV}"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \
- file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
- file://enable_tests.patch;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 "
-S = "${WORKDIR}/git"
-
-BASE_CONF += "--disable-introspection"
-
-AUTOTOOLS_AUXDIR = "${S}/build"
diff --git a/meta/recipes-graphics/clutter/clutter-fpu.inc b/meta/recipes-graphics/clutter/clutter-fpu.inc
deleted file mode 100644
index c541fe3..0000000
--- a/meta/recipes-graphics/clutter/clutter-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_clutter_fpu_setting(bb, d):
- if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
- return "--without-fpu"
- return ""
-
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
deleted file mode 100644
index facb0a1..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require recipes-graphics/clutter/clutter-gst.inc
-
-PR = "r0"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
- file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
-
-DEPENDS += "clutter-1.8 gstreamer"
-RDEPENDS_${PN} += "gst-meta-base"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \
- file://enable_tests-1.8.patch"
-
-S = "${WORKDIR}/clutter-gst-${PV}"
-
-SRC_URI[md5sum] = "98aeed6baa7b3a80f10e7733080eb088"
-SRC_URI[sha256sum] = "54e2966e507563bd3f123a4e25780c2487f854c6cc3df3bedc8c6b5eb45e9769"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
deleted file mode 100644
index 702424b..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Clutter GStreamer"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2+"
-
-DEPENDS = "gstreamer gst-plugins-base"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-gst"
-
-PACKAGES =+ "${PN}-examples"
-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-1.4.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
deleted file mode 100644
index 3fc1378..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install example binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/examples/Makefile.am
-===================================================================
---- git.orig/examples/Makefile.am 2011-05-04 14:07:21.000000000 -0700
-+++ git/examples/Makefile.am 2011-05-04 14:24:38.625984314 -0700
-@@ -1,6 +1,6 @@
- NULL = #
-
--noinst_PROGRAMS = video-player video-sink audio-player
-+bin_PROGRAMS = video-player video-sink audio-player
-
- INCLUDES = -I$(top_srcdir) \
- $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch
deleted file mode 100644
index de1dcc2..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Install example binary needed for poky-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-Index: clutter-gst-1.3.8/examples/Makefile.am
-===================================================================
---- clutter-gst-1.3.8.orig/examples/Makefile.am
-+++ clutter-gst-1.3.8/examples/Makefile.am
-@@ -1,6 +1,6 @@
- NULL = #
-
--noinst_PROGRAMS = video-player video-sink video-sink-navigation
-+bin_PROGRAMS = video-player video-sink video-sink-navigation
-
- INCLUDES = -I$(top_srcdir) \
- $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
deleted file mode 100644
index 6175a52..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install example binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-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/clutter-gtk-1.8_0.11.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
deleted file mode 100644
index 0885ce1..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require recipes-graphics/clutter/clutter-gtk.inc
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter-gtk/0.11/clutter-gtk-${PV}.tar.bz2"
-SRC_URI[md5sum] = "8b88cfcb0358ecfe3e9228efd55f7ebc"
-SRC_URI[sha256sum] = "58d5b027c4589ff442d820f624d7991e25cbeaab795b05f2df2e4c7bc1af2cf6"
-
-DEPENDS += "clutter-1.8"
-
-inherit gettext
-
-S = "${WORKDIR}/clutter-gtk-${PV}"
\ No newline at end of file
diff --git a/meta/recipes-graphics/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc
deleted file mode 100644
index e8d9e10..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Clutter GTK+"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-DEPENDS = "gtk+"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/*"
-
-inherit autotools pkgconfig gtk-doc
-
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
deleted file mode 100644
index f44755b..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable GTK_WIDGET macros
-
-This patch enables the macros that clutter-gtk is still using
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/clutter-gtk/Makefile.am
-===================================================================
---- git.orig/clutter-gtk/Makefile.am 2011-05-04 14:07:20.000000000 -0700
-+++ git/clutter-gtk/Makefile.am 2011-05-04 14:25:34.013984328 -0700
-@@ -8,8 +8,6 @@
- -DCLUTTER_GTK_COMPILATION \
- -DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
-- -DGDK_DISABLE_DEPRECATED \
-- -DGTK_DISABLE_DEPRECATED \
- -DCLUTTER_DISABLE_DEPRECATED
-
- AM_CPPFLAGS = \
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
deleted file mode 100644
index bedf80e..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install the test binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/examples/Makefile.am
-===================================================================
---- git.orig/examples/Makefile.am 2011-05-04 14:07:20.000000000 -0700
-+++ git/examples/Makefile.am 2011-05-04 14:38:29.785984519 -0700
-@@ -1,6 +1,6 @@
- NULL =
-
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- gtk-clutter-events \
- gtk-clutter-multistage \
- gtk-clutter-test \
diff --git a/meta/recipes-graphics/clutter/clutter-package.inc b/meta/recipes-graphics/clutter/clutter-package.inc
deleted file mode 100644
index 22993ff..0000000
--- a/meta/recipes-graphics/clutter/clutter-package.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-PACKAGES =+ "clutter-examples"
-FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
deleted file mode 100644
index 5a912af..0000000
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Clutter graphics library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1+"
-
-# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
-STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
-BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
-
-DEPENDS = "${STDDEPENDS} virtual/libgl libdrm"
-EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
-
-FILESPATH = "${FILE_DIRNAME}/clutter"
-
-inherit autotools pkgconfig gtk-doc gettext
-
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require clutter-fpu.inc
-
-#Fix up some weirdness in the docs
-do_configure_prepend() {
- sed -i s:doc/reference/Makefile::g ${S}/configure.ac
- sed -i s:doc::g ${S}/Makefile.am
-}
diff --git a/meta/recipes-graphics/clutter/clutter/build-fix.patch b/meta/recipes-graphics/clutter/clutter/build-fix.patch
deleted file mode 100644
index 08c1845..0000000
--- a/meta/recipes-graphics/clutter/clutter/build-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Installing the same file twice causes an error in Automake 1.11
-
-JL 19/03/10
-
-Upstream-Status: Pending
-
-Index: git/clutter/Makefile.am
-===================================================================
---- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000
-+++ git/clutter/Makefile.am 2010-03-19 11:50:46.744042007 +0000
-@@ -219,7 +219,6 @@
- $(source_h) \
- clutter-json.h \
- clutter-enum-types.h \
-- clutter-version.h \
- clutter.h
-
- DISTCLEANFILES = \
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
deleted file mode 100644
index 8cff0c5..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
deleted file mode 100644
index d3c196f..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.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(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
deleted file mode 100644
index 16460b1..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
deleted file mode 100644
index 2ff7697..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
-+++ git/tests/interactive/Makefile.am 2011-01-28 14:26:59.000000000 +0800
-@@ -107,7 +107,7 @@
-
- common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
-
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
-
- test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
- test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
deleted file mode 100644
index 16460b1..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests.patch b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
deleted file mode 100644
index 480b208..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
-+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
-@@ -88,7 +88,7 @@
-
- common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
-
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
-
- test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
- test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
-Index: git/tests/interactive/test-actors.c
-===================================================================
---- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
-+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
-@@ -178,7 +178,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);
-
-- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
-+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
- real_hand = clutter_texture_new_from_file (file, &error);
- if (real_hand == NULL)
- g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch
deleted file mode 100644
index 05f3d27..0000000
--- a/meta/recipes-graphics/clutter/clutter/symconflict.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/tests/test-depth.c
-===================================================================
---- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
-+++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
-@@ -11,13 +11,13 @@
- clutter_timeline_start (timeline);
- }
-
--static ClutterActor *raise[2];
-+static ClutterActor *clutterraise[2];
- static gboolean raise_no = 0;
-
- static gboolean
- raise_top (gpointer ignored)
- {
-- clutter_actor_raise_top (raise[raise_no]);
-+ clutter_actor_raise_top (clutterraise[raise_no]);
- raise_no = !raise_no;
- return TRUE;
- }
-@@ -202,8 +202,8 @@
-
- clutter_timeline_start (timeline);
-
-- raise[0] = rect;
-- raise[1] = hand;
-+ clutterraise[0] = rect;
-+ clutterraise[1] = hand;
- g_timeout_add (2000, raise_top, NULL);
-
- clutter_main ();
diff --git a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
deleted file mode 100644
index ccc6c2a..0000000
--- a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Compiling conformance test leads running test-conformance target binary, and
-gets failure in cross-compile environment. Introduce this commit from upstream
-to fix it.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-
-commit 7fd6273c25569fe4f37ad371532d93e5170e51f7
-Author: Neil Roberts <neil@linux.intel.com>
-Date: Mon Oct 11 16:16:45 2010 +0100
-
- tests: Generate the stub scripts using sed
-
- Instead of trying to run ./test-conformance with the -l option to
- generate a list of available tests it now runs sed on the
- test-conform-main.c file instead. Running the generated executable is
- a pain for cross-compiling so it would be nice to avoid it unless it's
- absolutely necessary. Although you could tell people who are cross
- compiling to just disable the conformance tests, this seems a shame
- because they could still be useful along with the wrappers for example
- if the cross compile is built to a shared network folder where the
- tests can be run on the actual device.
-
- The sed script is a little more ugly than it could be because it tries
- to avoid using the GNU extensions '\+' and '\|'.
-
- The script ends up placing restrictions on the format of the C file
- because the tests must all be listed on one line each. There is now a
- comment to explain this. Hopefully the trade off is worth it.
-
- http://bugzilla.clutter-project.org/show_bug.cgi?id=2363
-
-Upstream-Status: Backport
-
-diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
-index 3036639..1e723e7 100644
---- a/tests/conform/Makefile.am
-+++ b/tests/conform/Makefile.am
-@@ -89,9 +89,11 @@ test_conformance_SOURCES = $(common_sources) $(units_sources)
-
- wrappers: stamp-test-conformance
- @true
--stamp-test-conformance: Makefile test-conformance$(EXEEXT)
-+stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
- @mkdir -p wrappers
-- @( $(abs_builddir)/test-conformance$(EXEEXT) -l -m thorough | $(GREP) '^/' ) > unit-tests
-+ @sed -n -e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-+ -e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-+ $(srcdir)/test-conform-main.c > unit-tests
- @chmod +x test-launcher.sh
- @( echo "/stamp-test-conformance" ; \
- echo "/test-conformance" ; \
-diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
-index a8b3cf8..2ae7a04 100644
---- a/tests/conform/test-conform-main.c
-+++ b/tests/conform/test-conform-main.c
-@@ -92,6 +92,11 @@ main (int argc, char **argv)
- {
- clutter_test_init (&argc, &argv);
-
-+ /* This file is run through a sed script during the make step so the
-+ lines containing the tests need to be formatted on a single line
-+ each. To comment out a test use the SKIP or TODO macros. Using
-+ #if 0 would break the script. */
-+
- TEST_CONFORM_SIMPLE ("/timeline", test_timeline);
- TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_interpolate);
- TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_rewind);
diff --git a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
deleted file mode 100644
index 6671098..0000000
--- a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: clutter-1.6.14/build/autotools/po.m4
-===================================================================
---- clutter-1.6.14.orig/build/autotools/po.m4 2011-05-31 22:39:55.000000000 -0700
-+++ clutter-1.6.14/build/autotools/po.m4 2011-05-31 22:40:36.898833113 -0700
-@@ -29,7 +29,7 @@
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
-- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-Index: clutter-1.6.14/po/Makefile.in.in
-===================================================================
---- clutter-1.6.14.orig/po/Makefile.in.in 2011-05-31 22:40:05.000000000 -0700
-+++ clutter-1.6.14/po/Makefile.in.in 2011-05-31 22:40:21.030833109 -0700
-@@ -8,8 +8,8 @@
- # Please note that the actual code of GNU gettext is covered by the GNU
- # General Public License and is *not* in the public domain.
- #
--# Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+# Origin: gettext-0.18
-+GETTEXT_MACRO_VERSION = 0.18
-
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
deleted file mode 100644
index 26f7889..0000000
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
-HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
-LICENSE = "LGPLv2.1+"
-
-STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
-BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
-
-DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage libdrm"
-EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
-
-FILESPATH = "${FILE_DIRNAME}/cogl"
-
-inherit autotools pkgconfig gtk-doc gettext
-
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require clutter-fpu.inc
-
-#Fix up some weirdness in the docs
-do_configure_prepend() {
- sed -i s:doc/reference/Makefile::g ${S}/configure.ac
- sed -i s:doc::g ${S}/Makefile.am
-}
diff --git a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
deleted file mode 100644
index 003e9ff..0000000
--- a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we can
-check this to turn off the use of 'clz' instructions, which otherwise would
-cause compile errors like "selected processor does not support ARM mode
-`clz r3,r0'".
-
-Upstream-Status: Accepted (should be in the next cogl stable release)
-
-Signed-off-by: Wolfgang Denk <wd@denx.de>
-Signed-off-by: Joshua Lock <josh@linux.intel.com>
-
-Index: cogl-1.8.2/cogl/cogl-fixed.c
-===================================================================
---- cogl-1.8.2.orig/cogl/cogl-fixed.c
-+++ cogl-1.8.2/cogl/cogl-fixed.c
-@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x)
- /*
- * Find the highest bit set
- */
--#if defined (__arm__)
-+#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
- /* This actually requires at least arm v5, but gcc does not seem
- * to set the architecture defines correctly, and it is I think
- * very unlikely that anyone will want to use clutter on anything
diff --git a/meta/recipes-graphics/clutter/cogl/macro-versions.patch b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
deleted file mode 100644
index 2dcdd8e..0000000
--- a/meta/recipes-graphics/clutter/cogl/macro-versions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: cogl-1.8.0/configure.ac
-===================================================================
---- cogl-1.8.0.orig/configure.ac
-+++ cogl-1.8.0/configure.ac
-@@ -833,7 +833,7 @@ LT_INIT([disable-static])
- dnl ================================================================
- dnl I18n stuff.
- dnl ================================================================
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18])
- AM_GNU_GETTEXT([external])
-
- GETTEXT_PACKAGE="cogl"
-Index: cogl-1.8.0/po/Makefile.in.in
-===================================================================
---- cogl-1.8.0.orig/po/Makefile.in.in
-+++ cogl-1.8.0/po/Makefile.in.in
-@@ -9,7 +9,7 @@
- # General Public License and is *not* in the public domain.
- #
- # Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+GETTEXT_MACRO_VERSION = 0.18
-
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.2.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
deleted file mode 100644
index fe4266b..0000000
--- a/meta/recipes-graphics/clutter/cogl_1.8.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require cogl.inc
-
-PR = "r3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
- file://macro-versions.patch \
- file://build_for_armv4t.patch"
-
-SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f"
-SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73"
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
deleted file mode 100644
index 3fb70ae..0000000
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require cogl.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-# the 1.8.2 tag
-SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
-PV = "1.8.2+git${SRCPV}"
-PR = "r4"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
- file://build_for_armv4t.patch"
-S = "${WORKDIR}/git"
-
-AUTOTOOLS_AUXDIR = "${S}/build"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 2/7] clutter.bbclass: helper class for clutter and friends
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
2013-05-17 11:25 ` [PATCH 1/7] Remove old clutter recipes Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 11:25 ` [PATCH 3/7] New cogl recipe (1.14.0) Tomas Frydrych
` (6 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/classes/clutter.bbclass | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 meta/classes/clutter.bbclass
diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
new file mode 100644
index 0000000..184fb44
--- /dev/null
+++ b/meta/classes/clutter.bbclass
@@ -0,0 +1,28 @@
+
+def get_minor_dir(v):
+ import re
+ m = re.match("^([0-9]+)\.([0-9]+)", v)
+ return "%s.%s" % (m.group(1), m.group(2))
+
+def get_real_name(n):
+ import re
+ m = re.match("^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n)
+ return "%s" % (m.group(1))
+
+VERMINOR = "${@get_minor_dir("${PV}")}"
+REALNAME = "${@get_real_name("${BPN}")}"
+FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}"
+
+def get_fpu_setting(bb, d):
+ if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
+ return "--without-fpu"
+ return ""
+
+CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
+
+CLUTTER_SRC_GIT = "git://git.gnome.org/${REALNAME};protocol=git"
+
+SRC_URI = "${CLUTTER_SRC_FTP}"
+S = "${WORKDIR}/${REALNAME}-${PV}"
+
+inherit autotools pkgconfig gtk-doc gettext
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 3/7] New cogl recipe (1.14.0)
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
2013-05-17 11:25 ` [PATCH 1/7] Remove old clutter recipes Tomas Frydrych
2013-05-17 11:25 ` [PATCH 2/7] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 11:25 ` [PATCH 4/7] New clutter recipe (1.14.4) Tomas Frydrych
` (5 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping
up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0
pc file and headers and are backward compatible), and to simplify dependency
management (worth noting that since the 1.x development files are not parallel
installable, it is not possible to use two versions of cogl 1.x at the same
time anyway).
Package configuration is provided via PACKAGECONFIG options as follows:
GL flavour: 'gl' for big GL or 'gles2' for GLES2
(GLES1 is availabe in cogl, but not supporeted here at present.)
EGL platform: 'egl-null' -- PVR-style null platform
'egl-kms' -- kms platform provide by Mesa
'egl-x11' -- egl over xlib platform
(Additional EGL platforms, e.g., Wayland are supported by cogl,
but not supported here at present.)
GLX: 'glx' for the GLX extension support (implies 'gl')
Default configuration is 'glx'; typical configuration providing 'native' egl
on embedded HW would be 'gles2 egl-null'.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 58 +++++++++++++++++++++++++
meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb | 7 +++
2 files changed, 65 insertions(+)
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
new file mode 100644
index 0000000..17d8629
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -0,0 +1,58 @@
+DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
+HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+LICENSE = "LGPLv2.1+"
+
+inherit clutter
+
+DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+# Extra DEPENDS for PACKAGECONFIG
+EDEPENDS_GL = "virtual/libgl libdrm"
+EDEPENDS_GLES2 = "virtual/libgles2"
+EDEPENDS_KMS = "libdrm virtual/egl"
+EDEPENDS_EGL = "virtual/egl"
+EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi"
+
+# Extra RDEPENDS for PACKAGECONFIG
+# This has to be explictly listed, because cogl dlopens the backends
+ERDEPENDS_GL = "libgl"
+ERDEPENDS_GLES2 = "libgles2"
+
+EXTRA_OECONF += "--disable-introspection \
+ --disable-gtk-doc \
+ ${@get_fpu_setting(bb, d)} \
+ --enable-examples-install \
+ --enable-debug \
+ --disable-gl \
+ --disable-gles1 \
+ --disable-gles2 \
+ --disable-glx \
+ "
+
+# GL flavours
+PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}"
+PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
+
+# egl backends
+PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}"
+PACKAGECONFIG[egl-null] = "--enable-null-egl-platform"
+PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}"
+
+# glx
+PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}"
+
+# Default to GLX
+PACKAGECONFIG ??= "glx"
+
+#Fix up some weirdness in the docs
+do_configure_prepend() {
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
new file mode 100644
index 0000000..0f40c59
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
@@ -0,0 +1,7 @@
+
+require cogl-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "7eabaf4241c0b87cc9e3b0fa23fd0315"
+SRC_URI[archive.sha256sum] = "276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 4/7] New clutter recipe (1.14.4)
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
` (2 preceding siblings ...)
2013-05-17 11:25 ` [PATCH 3/7] New cogl recipe (1.14.0) Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 11:25 ` [PATCH 5/7] New clutter gst recipe (1.6.0) Tomas Frydrych
` (4 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor,
keeping up with the upstream versioning policy (all 1.x packages install
clutter-1.0 pc file and headers and are backward compatible), and to simplify
dependency management (worth noting that since the 1.x development files are
not parall installable, it is not possible to use two versions of clutter 1.x
at the same time anyway).
Package configuration is provided via PACKAGECONFIG options as follows:
'x11' : enable X11 backend,
'glx' : enable GLX backend,
'egl' : enable EGL backend,
'evdev': enable evdev input backend
Default configuration is 'glx'; typical configuration for embedded HW using
'native' EGL would be 'egl evdev'.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 56 ++++++++++++++++++++
.../recipes-graphics/clutter/clutter-1.0_1.14.4.bb | 7 +++
.../clutter/clutter-1.14/enable_tests.patch | 34 ++++++++++++
3 files changed, 97 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
new file mode 100644
index 0000000..6710776
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -0,0 +1,56 @@
+DESCRIPTION = "Clutter graphics library"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2.1+"
+
+inherit clutter
+
+SRC_URI += "file://enable_tests.patch"
+
+DEPENDS = "gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
+EDEPENDS_GLX = "virtual/libgl"
+EDEPENDS_EGL = "virtual/egl"
+
+EDEPENDS_EVDEV = "libxkbcommon"
+ERDEPENDS_EVDEV = "xkeyboard-config"
+
+# Disable pretty much everything, override in platform specific set up
+EXTRA_OECONF += "--disable-gtk-doc \
+ ${@get_fpu_setting(bb, d)} \
+ --disable-introspection \
+ --disable-egl-backend \
+ --disable-quartz-backend \
+ --disable-win32-backend \
+ --disable-x11-backend \
+ --disable-gdk-backend \
+ --disable-wayland-backend \
+ --disable-wayland-compositor \
+ --disable-cex100-backend \
+ --disable-tslib-input \
+ --disable-evdev-input \
+ "
+
+PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}"
+PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}"
+PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
+
+# Default configuration, distros might want to override
+PACKAGECONFIG ??= "glx"
+
+FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+do_configure_prepend() {
+ # Fix up some weirdness in the docs
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+
+ # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
+ touch -t 200001010000 po/clutter-1.0.pot
+
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
new file mode 100644
index 0000000..35824c6
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
@@ -0,0 +1,7 @@
+
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf"
+SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c"
diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
new file mode 100644
index 0000000..480b208
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
@@ -0,0 +1,34 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: git/tests/interactive/Makefile.am
+===================================================================
+--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
++++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
+@@ -88,7 +88,7 @@
+
+ common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
+
+-noinst_PROGRAMS = test-interactive
++bin_PROGRAMS = test-interactive
+
+ test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
+ test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+Index: git/tests/interactive/test-actors.c
+===================================================================
+--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
++++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
+@@ -178,7 +178,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);
+
+- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
++ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
+ real_hand = clutter_texture_new_from_file (file, &error);
+ if (real_hand == NULL)
+ g_error ("image load failed: %s", error->message);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 5/7] New clutter gst recipe (1.6.0)
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
` (3 preceding siblings ...)
2013-05-17 11:25 ` [PATCH 4/7] New clutter recipe (1.14.4) Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 11:25 ` [PATCH 6/7] New clutter-gtk recipe (1.4.2) Tomas Frydrych
` (3 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 23 ++++++++++
.../clutter/clutter-gst-1.0_1.6.0.bb | 9 ++++
.../clutter/clutter-gst-1.6/cogl-1.14.patch | 45 ++++++++++++++++++++
.../clutter/clutter-gst/enable-tests.patch | 17 ++++++++
4 files changed, 94 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
new file mode 100644
index 0000000..f79795c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Clutter GStreamer"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2+"
+
+inherit clutter
+
+SRC_URI += "file://enable-tests.patch"
+
+DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0"
+RDEPENDS_${PN} += "gst-meta-base"
+PACKAGES =+ "${PN}-examples"
+
+EXTRA_OECONF += "--disable-introspection"
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so"
+FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
+
+do_configure_prepend () {
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
new file mode 100644
index 0000000..dc5cc13
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
@@ -0,0 +1,9 @@
+require clutter-gst-1.0.inc
+
+SRC_URI += "file://cogl-1.14.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b"
+SRC_URI[archive.sha256sum] = "abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
new file mode 100644
index 0000000..7622f08
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
@@ -0,0 +1,45 @@
+From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001
+From: Tomas Frydrych <tomas@sleepfive.com>
+Date: Thu, 11 Oct 2012 08:53:03 +0100
+Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against
+ cogl-1.14
+
+Cogl 1.14 exposes various GL types through the public API but it does not
+pull in the GL type definitions through its public headers; specifically
+compilation will fail due to undefined GL_TEXTURE_2D. So include the headers
+the hard way.
+---
+ clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 9b4b53c..f092581 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -42,6 +42,23 @@
+ #include "config.h"
+ #endif
+
++/*
++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes.
++ */
++#include <cogl/cogl.h>
++
++#ifdef COGL_HAS_GLES1
++#include <GLES/gl.h>
++#include <GLES/glext.h>
++#elif COGL_HAS_GLES2
++#include <GLES2/gl2.h>
++#include <GLES2/gl2ext.h>
++#elif COGL_HAS_GL
++#include <GL/gl.h>
++#else
++#error Unknown cogl configuration
++#endif
++
+ #include "clutter-gst-video-sink.h"
+ #include "clutter-gst-util.h"
+ #include "clutter-gst-private.h"
+--
+1.7.10.4
+
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 0000000..de1dcc2
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: clutter-gst-1.3.8/examples/Makefile.am
+===================================================================
+--- clutter-gst-1.3.8.orig/examples/Makefile.am
++++ clutter-gst-1.3.8/examples/Makefile.am
+@@ -1,6 +1,6 @@
+ NULL = #
+
+-noinst_PROGRAMS = video-player video-sink video-sink-navigation
++bin_PROGRAMS = video-player video-sink video-sink-navigation
+
+ INCLUDES = -I$(top_srcdir) \
+ $(MAINTAINER_CFLAGS) \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 6/7] New clutter-gtk recipe (1.4.2)
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
` (4 preceding siblings ...)
2013-05-17 11:25 ` [PATCH 5/7] New clutter gst recipe (1.6.0) Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 11:25 ` [PATCH 7/7] Update mx recipe to build with clutter 1.14.4 Tomas Frydrych
` (2 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 ++++++++++++
meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb | 6 ++++++
2 files changed, 18 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
new file mode 100644
index 0000000..3717f48
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "ClutterGtk"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2+"
+
+inherit clutter
+
+DEPENDS = "clutter-1.0 gtk+3"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+EXTRA_OECONF += "--disable-introspection"
+
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
new file mode 100644
index 0000000..64eb70c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
@@ -0,0 +1,6 @@
+require clutter-gtk-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6"
+SRC_URI[archive.sha256sum] = "dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 7/7] Update mx recipe to build with clutter 1.14.4
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
` (5 preceding siblings ...)
2013-05-17 11:25 ` [PATCH 6/7] New clutter-gtk recipe (1.4.2) Tomas Frydrych
@ 2013-05-17 11:25 ` Tomas Frydrych
2013-05-17 20:16 ` updates for cogl, clutter and mx Saul Wold
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-17 11:25 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
.../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 43 ++++++++++++++++++++
meta/recipes-graphics/mx/mx.inc | 20 +++++++++
.../recipes-graphics/mx/mx/fix-test-includes.patch | 17 ++++++++
meta/recipes-graphics/mx/mx_1.4.7.bb | 26 +++++-------
4 files changed, 91 insertions(+), 15 deletions(-)
create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
create mode 100644 meta/recipes-graphics/mx/mx.inc
create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch
diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
new file mode 100644
index 0000000..667f526
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
@@ -0,0 +1,43 @@
+# Fixup for S != B
+# This patch is specific to version 1.4.x
+# Upstream-status: Pending
+Index: git/docs/reference/libmx-gtk/Makefile.am
+===================================================================
+--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
++++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
+@@ -1,3 +1,6 @@
++EXTRA_DIST=
++CLEANFILES=
++
+ ## Process this file with automake to produce Makefile.in
+
+ # We require automake 1.6 at least.
+@@ -77,7 +80,7 @@
+ GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++include $(top_builddir)/gtk-doc.make
+
+ # Other files to distribute
+ EXTRA_DIST += version.xml.in
+Index: git/docs/reference/libmx/Makefile.am
+===================================================================
+--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
++++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
+@@ -1,3 +1,6 @@
++EXTRA_DIST=
++CLEANFILES=
++
+ ## Process this file with automake to produce Makefile.in
+
+ # We require automake 1.6 at least.
+@@ -106,7 +109,7 @@
+ GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++include $(top_builddir)/gtk-doc.make
+
+ # Other files to distribute
+ EXTRA_DIST += version.xml.in
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc
new file mode 100644
index 0000000..a3b49bd
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Clutter based widget library"
+LICENSE = "LGPLv2.1"
+
+inherit clutter
+
+DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf"
+
+SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz"
+
+EXTRA_OECONF = "--disable-introspection \
+ --disable-gtk-doc \
+ --disable-gtk-widgets \
+ --with-dbus \
+ --with-winsys=none \
+ --without-clutter-imcontext \
+ --without-clutter-gesture \
+ --without-startup-notification \
+ --without-glade \
+ "
+
diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
new file mode 100644
index 0000000..eee62b6
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
@@ -0,0 +1,17 @@
+# Fix missing include directory
+# This patch is currently required for all versions of mx
+# Upstream-status: Pending
+Index: git/tests/Makefile.am
+===================================================================
+--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100
++++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100
+@@ -10,7 +10,8 @@
+
+ INCLUDES = \
+ -I$(top_srcdir) \
+- -I$(top_builddir)
++ -I$(top_builddir)\
++ -I$(top_builddir)/mx
+
+ noinst_PROGRAMS = \
+ test-deform-texture \
diff --git a/meta/recipes-graphics/mx/mx_1.4.7.bb b/meta/recipes-graphics/mx/mx_1.4.7.bb
index fd9189b..4c4c8eb 100644
--- a/meta/recipes-graphics/mx/mx_1.4.7.bb
+++ b/meta/recipes-graphics/mx/mx_1.4.7.bb
@@ -1,18 +1,14 @@
-DESCRIPTION = "Clutter based widget library"
-LICENSE = "LGPLv2.1"
+require mx.inc
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
- file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
-
-PR = "r0"
-
-DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification"
+# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix
+SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
+PV = "1.4.7+git${SRCPV}"
-inherit autotools gettext
+SRC_URI = "git://github.com/clutter-project/mx.git;protocol=git \
+ file://fix-build-dir.patch \
+ file://fix-test-includes.patch \
+ "
+S = "${WORKDIR}/git"
-SRC_URI = "https://github.com/downloads/clutter-project/${BPN}/${BP}.tar.xz"
-
-SRC_URI[md5sum] = "19b1e4918a5ae6d014fc0dab2bb3d0a1"
-SRC_URI[sha256sum] = "1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d"
-
-EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets --with-dbus"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
+ file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: updates for cogl, clutter and mx
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
` (6 preceding siblings ...)
2013-05-17 11:25 ` [PATCH 7/7] Update mx recipe to build with clutter 1.14.4 Tomas Frydrych
@ 2013-05-17 20:16 ` Saul Wold
2013-05-20 15:05 ` Tomas Frydrych
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
8 siblings, 1 reply; 36+ messages in thread
From: Saul Wold @ 2013-05-17 20:16 UTC (permalink / raw)
To: Tomas Frydrych; +Cc: openembedded-core
On 05/17/2013 02:25 PM, Tomas Frydrych wrote:
> The following set of patches updates clutter and friends; the recipes were
> completely reworked and use PACKAGECONFIG to facilitate easy reconfiguration
> to match distro / machine needs.
>
> Clutter and Cogl packages are renamed to use a '-1.0' suffix instead of the
> '-vmajor.vminor' suffix of the old recipes, in keeping up with the upstream
> versioning policy, and to simplify dependency maintenance (note that dev files
> for the 1.x series are not parallel installable anyway); the '-1.0' suffix is
> with a view toward the '2.0' series which are on the horizon.
>
> The Cogl recipe is moved into a subdirectory of its own, this seemed
> appropriate as Cogl is now a seprate project in its own right.
>
> The new versions are: cogl 1.4.0, clutter 1.14.4, clutter-gst 1.6.0,
> clutter-gtk 1.4.2. The mx recipe is fixed up to build against the updated cogl
> and clutter.
>
There are some issues with this patch set, some of the included patches
either do not have Upstream-Status or Signed-off-by tags, please review
that.
Also, I want to confirm that these are all new recipes and will not
cause backward PRs (ie do you need PE bumps to these)?
Finally, I think you need to update the packagegroup-core-clutter recipe.
Thanks
Sau!
> [PATCH 1/7] Remove old clutter recipes
> [PATCH 2/7] clutter.bbclass: helper class for clutter and friends
> [PATCH 3/7] New cogl recipe (1.14.0)
> [PATCH 4/7] New clutter recipe (1.14.4)
> [PATCH 5/7] New clutter gst recipe (1.6.0)
> [PATCH 6/7] New clutter-gtk recipe (1.4.2)
> [PATCH 7/7] Update mx recipe to build with clutter 1.14.4
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* updates for cogl, clutter and mx
2013-05-17 20:16 ` updates for cogl, clutter and mx Saul Wold
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 1/8] Remove old clutter recipes Tomas Frydrych
` (8 more replies)
0 siblings, 9 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
> There are some issues with this patch set, some of the included patches
> either do not have Upstream-Status or Signed-off-by tags, please review
> that.
Updated the various patch headers in v.2.
> Also, I want to confirm that these are all new recipes and will not cause
> backward PRs (ie do you need PE bumps to these)?
I renamed the mx recipe also to mx-1.0 for consistency, so yes, these are all
different packages now.
> Finally, I think you need to update the packagegroup-core-clutter recipe.
Done.
Tomas
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/8] Remove old clutter recipes
2013-05-20 15:05 ` Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
` (7 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 23 -------
meta/recipes-graphics/clutter/clutter-1.8_git.bb | 20 ------
meta/recipes-graphics/clutter/clutter-fpu.inc | 6 --
.../clutter/clutter-gst-1.8_1.4.6.bb | 22 -------
meta/recipes-graphics/clutter/clutter-gst.inc | 13 ----
.../clutter/clutter-gst/enable_tests-1.4.patch | 18 ------
.../clutter/clutter-gst/enable_tests-1.8.patch | 17 -----
.../clutter/clutter-gst/enable_tests.patch | 18 ------
.../clutter/clutter-gtk-1.8_0.11.4.bb | 11 ----
meta/recipes-graphics/clutter/clutter-gtk.inc | 14 ----
.../clutter/clutter-gtk/disable_deprecated.patch | 21 ------
.../clutter/clutter-gtk/enable_tests.patch | 18 ------
meta/recipes-graphics/clutter/clutter-package.inc | 2 -
meta/recipes-graphics/clutter/clutter.inc | 23 -------
.../clutter/clutter/build-fix.patch | 18 ------
.../clutter/clutter/enable_tests-0.6.patch | 42 ------------
.../clutter/clutter/enable_tests-0.8.patch | 52 ---------------
.../clutter/clutter/enable_tests-1.0.patch | 34 ----------
.../clutter/clutter/enable_tests-1.4.patch | 15 -----
...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 34 ----------
.../clutter/clutter/enable_tests.patch | 34 ----------
.../clutter/clutter/symconflict.patch | 33 ----------
.../clutter/clutter/test-conformance-fix.patch | 68 --------------------
.../clutter/update_gettext_macro_version.patch | 32 ---------
meta/recipes-graphics/clutter/cogl.inc | 22 -------
.../clutter/cogl/build_for_armv4t.patch | 23 -------
.../clutter/cogl/macro-versions.patch | 28 --------
meta/recipes-graphics/clutter/cogl_1.8.2.bb | 12 ----
meta/recipes-graphics/clutter/cogl_git.bb | 16 -----
29 files changed, 689 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_git.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-fpu.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-package.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter.inc
delete mode 100644 meta/recipes-graphics/clutter/clutter/build-fix.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/symconflict.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
delete mode 100644 meta/recipes-graphics/clutter/cogl.inc
delete mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
delete mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch
delete mode 100644 meta/recipes-graphics/clutter/cogl_1.8.2.bb
delete mode 100644 meta/recipes-graphics/clutter/cogl_git.bb
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
deleted file mode 100644
index aceef96..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require recipes-graphics/clutter/clutter.inc
-require recipes-graphics/clutter/clutter-package.inc
-
-PR = "r2"
-
-# We're API/ABI compatible and this may make things easier for layers
-PROVIDES += "clutter-1.6"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.tar.bz2 \
- file://enable_tests-1.4.patch \
- file://update_gettext_macro_version.patch"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-# because we've namespaced PN to clutter-1.8
-S = "${WORKDIR}/clutter-${PV}"
-
-BASE_CONF += "--disable-introspection"
-
-SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
-SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91"
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
deleted file mode 100644
index 89d8026..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require clutter.inc
-require clutter-package.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-# the 1.8.4 tag
-SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
-PV = "1.8.4+git${SRCPV}"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \
- file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
- file://enable_tests.patch;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 "
-S = "${WORKDIR}/git"
-
-BASE_CONF += "--disable-introspection"
-
-AUTOTOOLS_AUXDIR = "${S}/build"
diff --git a/meta/recipes-graphics/clutter/clutter-fpu.inc b/meta/recipes-graphics/clutter/clutter-fpu.inc
deleted file mode 100644
index c541fe3..0000000
--- a/meta/recipes-graphics/clutter/clutter-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_clutter_fpu_setting(bb, d):
- if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
- return "--without-fpu"
- return ""
-
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
deleted file mode 100644
index facb0a1..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require recipes-graphics/clutter/clutter-gst.inc
-
-PR = "r0"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
- file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
-
-DEPENDS += "clutter-1.8 gstreamer"
-RDEPENDS_${PN} += "gst-meta-base"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \
- file://enable_tests-1.8.patch"
-
-S = "${WORKDIR}/clutter-gst-${PV}"
-
-SRC_URI[md5sum] = "98aeed6baa7b3a80f10e7733080eb088"
-SRC_URI[sha256sum] = "54e2966e507563bd3f123a4e25780c2487f854c6cc3df3bedc8c6b5eb45e9769"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
deleted file mode 100644
index 702424b..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Clutter GStreamer"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2+"
-
-DEPENDS = "gstreamer gst-plugins-base"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-gst"
-
-PACKAGES =+ "${PN}-examples"
-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-1.4.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
deleted file mode 100644
index 3fc1378..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install example binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/examples/Makefile.am
-===================================================================
---- git.orig/examples/Makefile.am 2011-05-04 14:07:21.000000000 -0700
-+++ git/examples/Makefile.am 2011-05-04 14:24:38.625984314 -0700
-@@ -1,6 +1,6 @@
- NULL = #
-
--noinst_PROGRAMS = video-player video-sink audio-player
-+bin_PROGRAMS = video-player video-sink audio-player
-
- INCLUDES = -I$(top_srcdir) \
- $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch
deleted file mode 100644
index de1dcc2..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Install example binary needed for poky-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-Index: clutter-gst-1.3.8/examples/Makefile.am
-===================================================================
---- clutter-gst-1.3.8.orig/examples/Makefile.am
-+++ clutter-gst-1.3.8/examples/Makefile.am
-@@ -1,6 +1,6 @@
- NULL = #
-
--noinst_PROGRAMS = video-player video-sink video-sink-navigation
-+bin_PROGRAMS = video-player video-sink video-sink-navigation
-
- INCLUDES = -I$(top_srcdir) \
- $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
deleted file mode 100644
index 6175a52..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install example binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-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/clutter-gtk-1.8_0.11.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
deleted file mode 100644
index 0885ce1..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require recipes-graphics/clutter/clutter-gtk.inc
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter-gtk/0.11/clutter-gtk-${PV}.tar.bz2"
-SRC_URI[md5sum] = "8b88cfcb0358ecfe3e9228efd55f7ebc"
-SRC_URI[sha256sum] = "58d5b027c4589ff442d820f624d7991e25cbeaab795b05f2df2e4c7bc1af2cf6"
-
-DEPENDS += "clutter-1.8"
-
-inherit gettext
-
-S = "${WORKDIR}/clutter-gtk-${PV}"
\ No newline at end of file
diff --git a/meta/recipes-graphics/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc
deleted file mode 100644
index e8d9e10..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Clutter GTK+"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-DEPENDS = "gtk+"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/*"
-
-inherit autotools pkgconfig gtk-doc
-
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
deleted file mode 100644
index f44755b..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable GTK_WIDGET macros
-
-This patch enables the macros that clutter-gtk is still using
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/clutter-gtk/Makefile.am
-===================================================================
---- git.orig/clutter-gtk/Makefile.am 2011-05-04 14:07:20.000000000 -0700
-+++ git/clutter-gtk/Makefile.am 2011-05-04 14:25:34.013984328 -0700
-@@ -8,8 +8,6 @@
- -DCLUTTER_GTK_COMPILATION \
- -DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
-- -DGDK_DISABLE_DEPRECATED \
-- -DGTK_DISABLE_DEPRECATED \
- -DCLUTTER_DISABLE_DEPRECATED
-
- AM_CPPFLAGS = \
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
deleted file mode 100644
index bedf80e..0000000
--- a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install the test binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/examples/Makefile.am
-===================================================================
---- git.orig/examples/Makefile.am 2011-05-04 14:07:20.000000000 -0700
-+++ git/examples/Makefile.am 2011-05-04 14:38:29.785984519 -0700
-@@ -1,6 +1,6 @@
- NULL =
-
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- gtk-clutter-events \
- gtk-clutter-multistage \
- gtk-clutter-test \
diff --git a/meta/recipes-graphics/clutter/clutter-package.inc b/meta/recipes-graphics/clutter/clutter-package.inc
deleted file mode 100644
index 22993ff..0000000
--- a/meta/recipes-graphics/clutter/clutter-package.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-PACKAGES =+ "clutter-examples"
-FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
deleted file mode 100644
index 5a912af..0000000
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Clutter graphics library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1+"
-
-# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
-STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
-BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
-
-DEPENDS = "${STDDEPENDS} virtual/libgl libdrm"
-EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
-
-FILESPATH = "${FILE_DIRNAME}/clutter"
-
-inherit autotools pkgconfig gtk-doc gettext
-
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require clutter-fpu.inc
-
-#Fix up some weirdness in the docs
-do_configure_prepend() {
- sed -i s:doc/reference/Makefile::g ${S}/configure.ac
- sed -i s:doc::g ${S}/Makefile.am
-}
diff --git a/meta/recipes-graphics/clutter/clutter/build-fix.patch b/meta/recipes-graphics/clutter/clutter/build-fix.patch
deleted file mode 100644
index 08c1845..0000000
--- a/meta/recipes-graphics/clutter/clutter/build-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Installing the same file twice causes an error in Automake 1.11
-
-JL 19/03/10
-
-Upstream-Status: Pending
-
-Index: git/clutter/Makefile.am
-===================================================================
---- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000
-+++ git/clutter/Makefile.am 2010-03-19 11:50:46.744042007 +0000
-@@ -219,7 +219,6 @@
- $(source_h) \
- clutter-json.h \
- clutter-enum-types.h \
-- clutter-version.h \
- clutter.h
-
- DISTCLEANFILES = \
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
deleted file mode 100644
index 8cff0c5..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
deleted file mode 100644
index d3c196f..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.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(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
deleted file mode 100644
index 16460b1..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
deleted file mode 100644
index 2ff7697..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
-+++ git/tests/interactive/Makefile.am 2011-01-28 14:26:59.000000000 +0800
-@@ -107,7 +107,7 @@
-
- common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
-
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
-
- test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
- test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
deleted file mode 100644
index 16460b1..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-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);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests.patch b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
deleted file mode 100644
index 480b208..0000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- tests/Makefile.am | 7 ++++++-
- tests/test-actors.c | 2 +-
- tests/test-text.c | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
-+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
-@@ -88,7 +88,7 @@
-
- common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
-
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
-
- test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
- test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
-Index: git/tests/interactive/test-actors.c
-===================================================================
---- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
-+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
-@@ -178,7 +178,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);
-
-- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
-+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
- real_hand = clutter_texture_new_from_file (file, &error);
- if (real_hand == NULL)
- g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch
deleted file mode 100644
index 05f3d27..0000000
--- a/meta/recipes-graphics/clutter/clutter/symconflict.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/tests/test-depth.c
-===================================================================
---- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
-+++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
-@@ -11,13 +11,13 @@
- clutter_timeline_start (timeline);
- }
-
--static ClutterActor *raise[2];
-+static ClutterActor *clutterraise[2];
- static gboolean raise_no = 0;
-
- static gboolean
- raise_top (gpointer ignored)
- {
-- clutter_actor_raise_top (raise[raise_no]);
-+ clutter_actor_raise_top (clutterraise[raise_no]);
- raise_no = !raise_no;
- return TRUE;
- }
-@@ -202,8 +202,8 @@
-
- clutter_timeline_start (timeline);
-
-- raise[0] = rect;
-- raise[1] = hand;
-+ clutterraise[0] = rect;
-+ clutterraise[1] = hand;
- g_timeout_add (2000, raise_top, NULL);
-
- clutter_main ();
diff --git a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
deleted file mode 100644
index ccc6c2a..0000000
--- a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Compiling conformance test leads running test-conformance target binary, and
-gets failure in cross-compile environment. Introduce this commit from upstream
-to fix it.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-
-commit 7fd6273c25569fe4f37ad371532d93e5170e51f7
-Author: Neil Roberts <neil@linux.intel.com>
-Date: Mon Oct 11 16:16:45 2010 +0100
-
- tests: Generate the stub scripts using sed
-
- Instead of trying to run ./test-conformance with the -l option to
- generate a list of available tests it now runs sed on the
- test-conform-main.c file instead. Running the generated executable is
- a pain for cross-compiling so it would be nice to avoid it unless it's
- absolutely necessary. Although you could tell people who are cross
- compiling to just disable the conformance tests, this seems a shame
- because they could still be useful along with the wrappers for example
- if the cross compile is built to a shared network folder where the
- tests can be run on the actual device.
-
- The sed script is a little more ugly than it could be because it tries
- to avoid using the GNU extensions '\+' and '\|'.
-
- The script ends up placing restrictions on the format of the C file
- because the tests must all be listed on one line each. There is now a
- comment to explain this. Hopefully the trade off is worth it.
-
- http://bugzilla.clutter-project.org/show_bug.cgi?id=2363
-
-Upstream-Status: Backport
-
-diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
-index 3036639..1e723e7 100644
---- a/tests/conform/Makefile.am
-+++ b/tests/conform/Makefile.am
-@@ -89,9 +89,11 @@ test_conformance_SOURCES = $(common_sources) $(units_sources)
-
- wrappers: stamp-test-conformance
- @true
--stamp-test-conformance: Makefile test-conformance$(EXEEXT)
-+stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
- @mkdir -p wrappers
-- @( $(abs_builddir)/test-conformance$(EXEEXT) -l -m thorough | $(GREP) '^/' ) > unit-tests
-+ @sed -n -e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-+ -e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-+ $(srcdir)/test-conform-main.c > unit-tests
- @chmod +x test-launcher.sh
- @( echo "/stamp-test-conformance" ; \
- echo "/test-conformance" ; \
-diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
-index a8b3cf8..2ae7a04 100644
---- a/tests/conform/test-conform-main.c
-+++ b/tests/conform/test-conform-main.c
-@@ -92,6 +92,11 @@ main (int argc, char **argv)
- {
- clutter_test_init (&argc, &argv);
-
-+ /* This file is run through a sed script during the make step so the
-+ lines containing the tests need to be formatted on a single line
-+ each. To comment out a test use the SKIP or TODO macros. Using
-+ #if 0 would break the script. */
-+
- TEST_CONFORM_SIMPLE ("/timeline", test_timeline);
- TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_interpolate);
- TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_rewind);
diff --git a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
deleted file mode 100644
index 6671098..0000000
--- a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: clutter-1.6.14/build/autotools/po.m4
-===================================================================
---- clutter-1.6.14.orig/build/autotools/po.m4 2011-05-31 22:39:55.000000000 -0700
-+++ clutter-1.6.14/build/autotools/po.m4 2011-05-31 22:40:36.898833113 -0700
-@@ -29,7 +29,7 @@
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
-- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-Index: clutter-1.6.14/po/Makefile.in.in
-===================================================================
---- clutter-1.6.14.orig/po/Makefile.in.in 2011-05-31 22:40:05.000000000 -0700
-+++ clutter-1.6.14/po/Makefile.in.in 2011-05-31 22:40:21.030833109 -0700
-@@ -8,8 +8,8 @@
- # Please note that the actual code of GNU gettext is covered by the GNU
- # General Public License and is *not* in the public domain.
- #
--# Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+# Origin: gettext-0.18
-+GETTEXT_MACRO_VERSION = 0.18
-
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
deleted file mode 100644
index 26f7889..0000000
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
-HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
-LICENSE = "LGPLv2.1+"
-
-STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
-BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
-
-DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage libdrm"
-EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
-
-FILESPATH = "${FILE_DIRNAME}/cogl"
-
-inherit autotools pkgconfig gtk-doc gettext
-
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require clutter-fpu.inc
-
-#Fix up some weirdness in the docs
-do_configure_prepend() {
- sed -i s:doc/reference/Makefile::g ${S}/configure.ac
- sed -i s:doc::g ${S}/Makefile.am
-}
diff --git a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
deleted file mode 100644
index 003e9ff..0000000
--- a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we can
-check this to turn off the use of 'clz' instructions, which otherwise would
-cause compile errors like "selected processor does not support ARM mode
-`clz r3,r0'".
-
-Upstream-Status: Accepted (should be in the next cogl stable release)
-
-Signed-off-by: Wolfgang Denk <wd@denx.de>
-Signed-off-by: Joshua Lock <josh@linux.intel.com>
-
-Index: cogl-1.8.2/cogl/cogl-fixed.c
-===================================================================
---- cogl-1.8.2.orig/cogl/cogl-fixed.c
-+++ cogl-1.8.2/cogl/cogl-fixed.c
-@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x)
- /*
- * Find the highest bit set
- */
--#if defined (__arm__)
-+#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
- /* This actually requires at least arm v5, but gcc does not seem
- * to set the architecture defines correctly, and it is I think
- * very unlikely that anyone will want to use clutter on anything
diff --git a/meta/recipes-graphics/clutter/cogl/macro-versions.patch b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
deleted file mode 100644
index 2dcdd8e..0000000
--- a/meta/recipes-graphics/clutter/cogl/macro-versions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: cogl-1.8.0/configure.ac
-===================================================================
---- cogl-1.8.0.orig/configure.ac
-+++ cogl-1.8.0/configure.ac
-@@ -833,7 +833,7 @@ LT_INIT([disable-static])
- dnl ================================================================
- dnl I18n stuff.
- dnl ================================================================
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18])
- AM_GNU_GETTEXT([external])
-
- GETTEXT_PACKAGE="cogl"
-Index: cogl-1.8.0/po/Makefile.in.in
-===================================================================
---- cogl-1.8.0.orig/po/Makefile.in.in
-+++ cogl-1.8.0/po/Makefile.in.in
-@@ -9,7 +9,7 @@
- # General Public License and is *not* in the public domain.
- #
- # Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+GETTEXT_MACRO_VERSION = 0.18
-
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.2.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
deleted file mode 100644
index fe4266b..0000000
--- a/meta/recipes-graphics/clutter/cogl_1.8.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require cogl.inc
-
-PR = "r3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
- file://macro-versions.patch \
- file://build_for_armv4t.patch"
-
-SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f"
-SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73"
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
deleted file mode 100644
index 3fb70ae..0000000
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require cogl.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-# the 1.8.2 tag
-SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
-PV = "1.8.2+git${SRCPV}"
-PR = "r4"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
- file://build_for_armv4t.patch"
-S = "${WORKDIR}/git"
-
-AUTOTOOLS_AUXDIR = "${S}/build"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends
2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 1/8] Remove old clutter recipes Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-21 9:52 ` Burton, Ross
2013-05-20 15:05 ` [PATCH v2 3/8] New cogl recipe (1.14.0) Tomas Frydrych
` (6 subsequent siblings)
8 siblings, 1 reply; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/classes/clutter.bbclass | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 meta/classes/clutter.bbclass
diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
new file mode 100644
index 0000000..184fb44
--- /dev/null
+++ b/meta/classes/clutter.bbclass
@@ -0,0 +1,28 @@
+
+def get_minor_dir(v):
+ import re
+ m = re.match("^([0-9]+)\.([0-9]+)", v)
+ return "%s.%s" % (m.group(1), m.group(2))
+
+def get_real_name(n):
+ import re
+ m = re.match("^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n)
+ return "%s" % (m.group(1))
+
+VERMINOR = "${@get_minor_dir("${PV}")}"
+REALNAME = "${@get_real_name("${BPN}")}"
+FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}"
+
+def get_fpu_setting(bb, d):
+ if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
+ return "--without-fpu"
+ return ""
+
+CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
+
+CLUTTER_SRC_GIT = "git://git.gnome.org/${REALNAME};protocol=git"
+
+SRC_URI = "${CLUTTER_SRC_FTP}"
+S = "${WORKDIR}/${REALNAME}-${PV}"
+
+inherit autotools pkgconfig gtk-doc gettext
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 3/8] New cogl recipe (1.14.0)
2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 1/8] Remove old clutter recipes Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-21 10:01 ` Burton, Ross
2013-05-20 15:05 ` [PATCH v2 4/8] New clutter recipe (1.14.4) Tomas Frydrych
` (5 subsequent siblings)
8 siblings, 1 reply; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping
up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0
pc file and headers and are backward compatible), and to simplify dependency
management (worth noting that since the 1.x development files are not parallel
installable, it is not possible to use two versions of cogl 1.x at the same
time anyway).
Package configuration is provided via PACKAGECONFIG options as follows:
GL flavour: 'gl' for big GL or 'gles2' for GLES2
(GLES1 is availabe in cogl, but not supporeted here at present.)
EGL platform: 'egl-null' -- PVR-style null platform
'egl-kms' -- kms platform provide by Mesa
'egl-x11' -- egl over xlib platform
(Additional EGL platforms, e.g., Wayland are supported by cogl,
but not supported here at present.)
GLX: 'glx' for the GLX extension support (implies 'gl')
Default configuration is 'glx'; typical configuration providing 'native' egl
on embedded HW would be 'gles2 egl-null'.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 58 +++++++++++++++++++++++++
meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb | 7 +++
2 files changed, 65 insertions(+)
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
new file mode 100644
index 0000000..17d8629
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -0,0 +1,58 @@
+DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
+HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+LICENSE = "LGPLv2.1+"
+
+inherit clutter
+
+DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+# Extra DEPENDS for PACKAGECONFIG
+EDEPENDS_GL = "virtual/libgl libdrm"
+EDEPENDS_GLES2 = "virtual/libgles2"
+EDEPENDS_KMS = "libdrm virtual/egl"
+EDEPENDS_EGL = "virtual/egl"
+EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi"
+
+# Extra RDEPENDS for PACKAGECONFIG
+# This has to be explictly listed, because cogl dlopens the backends
+ERDEPENDS_GL = "libgl"
+ERDEPENDS_GLES2 = "libgles2"
+
+EXTRA_OECONF += "--disable-introspection \
+ --disable-gtk-doc \
+ ${@get_fpu_setting(bb, d)} \
+ --enable-examples-install \
+ --enable-debug \
+ --disable-gl \
+ --disable-gles1 \
+ --disable-gles2 \
+ --disable-glx \
+ "
+
+# GL flavours
+PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}"
+PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
+
+# egl backends
+PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}"
+PACKAGECONFIG[egl-null] = "--enable-null-egl-platform"
+PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}"
+
+# glx
+PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}"
+
+# Default to GLX
+PACKAGECONFIG ??= "glx"
+
+#Fix up some weirdness in the docs
+do_configure_prepend() {
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
new file mode 100644
index 0000000..0f40c59
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
@@ -0,0 +1,7 @@
+
+require cogl-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "7eabaf4241c0b87cc9e3b0fa23fd0315"
+SRC_URI[archive.sha256sum] = "276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 4/8] New clutter recipe (1.14.4)
2013-05-20 15:05 ` Tomas Frydrych
` (2 preceding siblings ...)
2013-05-20 15:05 ` [PATCH v2 3/8] New cogl recipe (1.14.0) Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 5/8] New clutter-gst recipe (1.6.0) Tomas Frydrych
` (4 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor,
keeping up with the upstream versioning policy (all 1.x packages install
clutter-1.0 pc file and headers and are backward compatible), and to simplify
dependency management (worth noting that since the 1.x development files are
not parall installable, it is not possible to use two versions of clutter 1.x
at the same time anyway).
Package configuration is provided via PACKAGECONFIG options as follows:
'x11' : enable X11 backend,
'glx' : enable GLX backend,
'egl' : enable EGL backend,
'evdev': enable evdev input backend
Default configuration is 'glx'; typical configuration for embedded HW using
'native' EGL would be 'egl evdev'.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 56 ++++++++++++++++++++
.../recipes-graphics/clutter/clutter-1.0_1.14.4.bb | 7 +++
.../clutter/clutter-1.14/enable_tests.patch | 36 +++++++++++++
3 files changed, 99 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
new file mode 100644
index 0000000..6710776
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -0,0 +1,56 @@
+DESCRIPTION = "Clutter graphics library"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2.1+"
+
+inherit clutter
+
+SRC_URI += "file://enable_tests.patch"
+
+DEPENDS = "gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
+EDEPENDS_GLX = "virtual/libgl"
+EDEPENDS_EGL = "virtual/egl"
+
+EDEPENDS_EVDEV = "libxkbcommon"
+ERDEPENDS_EVDEV = "xkeyboard-config"
+
+# Disable pretty much everything, override in platform specific set up
+EXTRA_OECONF += "--disable-gtk-doc \
+ ${@get_fpu_setting(bb, d)} \
+ --disable-introspection \
+ --disable-egl-backend \
+ --disable-quartz-backend \
+ --disable-win32-backend \
+ --disable-x11-backend \
+ --disable-gdk-backend \
+ --disable-wayland-backend \
+ --disable-wayland-compositor \
+ --disable-cex100-backend \
+ --disable-tslib-input \
+ --disable-evdev-input \
+ "
+
+PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}"
+PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}"
+PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
+
+# Default configuration, distros might want to override
+PACKAGECONFIG ??= "glx"
+
+FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+do_configure_prepend() {
+ # Fix up some weirdness in the docs
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+
+ # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
+ touch -t 200001010000 po/clutter-1.0.pot
+
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
new file mode 100644
index 0000000..35824c6
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
@@ -0,0 +1,7 @@
+
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf"
+SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c"
diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
new file mode 100644
index 0000000..f97d598
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
@@ -0,0 +1,36 @@
+Make tests installable
+
+The test applications are useful for image testing.
+
+Imported from clutter 1.8 package, git://git.openembedded.org/openembedded,
+commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+
+Index: git/tests/interactive/Makefile.am
+===================================================================
+--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
++++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
+@@ -88,7 +88,7 @@
+
+ common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
+
+-noinst_PROGRAMS = test-interactive
++bin_PROGRAMS = test-interactive
+
+ test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
+ test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+Index: git/tests/interactive/test-actors.c
+===================================================================
+--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
++++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
+@@ -178,7 +178,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);
+
+- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
++ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
+ real_hand = clutter_texture_new_from_file (file, &error);
+ if (real_hand == NULL)
+ g_error ("image load failed: %s", error->message);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 5/8] New clutter-gst recipe (1.6.0)
2013-05-20 15:05 ` Tomas Frydrych
` (3 preceding siblings ...)
2013-05-20 15:05 ` [PATCH v2 4/8] New clutter recipe (1.14.4) Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 6/8] New clutter-gtk recipe (1.4.2) Tomas Frydrych
` (3 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 23 ++++++++++
.../clutter/clutter-gst-1.0_1.6.0.bb | 9 ++++
.../clutter/clutter-gst-1.6/cogl-1.14.patch | 48 ++++++++++++++++++++
.../clutter/clutter-gst/enable-tests.patch | 23 ++++++++++
4 files changed, 103 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
new file mode 100644
index 0000000..f79795c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Clutter GStreamer"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2+"
+
+inherit clutter
+
+SRC_URI += "file://enable-tests.patch"
+
+DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0"
+RDEPENDS_${PN} += "gst-meta-base"
+PACKAGES =+ "${PN}-examples"
+
+EXTRA_OECONF += "--disable-introspection"
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so"
+FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
+
+do_configure_prepend () {
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
new file mode 100644
index 0000000..dc5cc13
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
@@ -0,0 +1,9 @@
+require clutter-gst-1.0.inc
+
+SRC_URI += "file://cogl-1.14.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b"
+SRC_URI[archive.sha256sum] = "abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
new file mode 100644
index 0000000..a46b448
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
@@ -0,0 +1,48 @@
+From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001
+From: Tomas Frydrych <tomas@sleepfive.com>
+Date: Thu, 11 Oct 2012 08:53:03 +0100
+Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against
+ cogl-1.14
+
+Cogl 1.14 exposes various GL types through the public API but it does not
+pull in the GL type definitions through its public headers; specifically
+compilation will fail due to undefined GL_TEXTURE_2D. So include the headers
+the hard way.
+
+Upstream-status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+---
+ clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 9b4b53c..f092581 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -42,6 +42,23 @@
+ #include "config.h"
+ #endif
+
++/*
++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes.
++ */
++#include <cogl/cogl.h>
++
++#ifdef COGL_HAS_GLES1
++#include <GLES/gl.h>
++#include <GLES/glext.h>
++#elif COGL_HAS_GLES2
++#include <GLES2/gl2.h>
++#include <GLES2/gl2ext.h>
++#elif COGL_HAS_GL
++#include <GL/gl.h>
++#else
++#error Unknown cogl configuration
++#endif
++
+ #include "clutter-gst-video-sink.h"
+ #include "clutter-gst-util.h"
+ #include "clutter-gst-private.h"
+--
+1.7.10.4
+
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 0000000..b3aec39
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
@@ -0,0 +1,23 @@
+Install example binary needed for core-image-clutter
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
+Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded,
+commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6
+
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.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 video-sink-navigation
++bin_PROGRAMS = video-player video-sink video-sink-navigation
+
+ INCLUDES = -I$(top_srcdir) \
+ $(MAINTAINER_CFLAGS) \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 6/8] New clutter-gtk recipe (1.4.2)
2013-05-20 15:05 ` Tomas Frydrych
` (4 preceding siblings ...)
2013-05-20 15:05 ` [PATCH v2 5/8] New clutter-gst recipe (1.6.0) Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 7/8] New mx recipe (1.4.7) Tomas Frydrych
` (2 subsequent siblings)
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 ++++++++++++
meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb | 6 ++++++
2 files changed, 18 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
new file mode 100644
index 0000000..3717f48
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "ClutterGtk"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2+"
+
+inherit clutter
+
+DEPENDS = "clutter-1.0 gtk+3"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+EXTRA_OECONF += "--disable-introspection"
+
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
new file mode 100644
index 0000000..64eb70c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
@@ -0,0 +1,6 @@
+require clutter-gtk-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6"
+SRC_URI[archive.sha256sum] = "dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 7/8] New mx recipe (1.4.7)
2013-05-20 15:05 ` Tomas Frydrych
` (5 preceding siblings ...)
2013-05-20 15:05 ` [PATCH v2 6/8] New clutter-gtk recipe (1.4.2) Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 8/8] packagegroup-core-clutter: use clutter-1.0 packages Tomas Frydrych
2013-05-21 8:14 ` updates for cogl, clutter and mx Richard Purdie
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to mx-1.0, keeping up with the upstream versioning
policy. The 1.14.7 tag does not build with clutter 1.14, so git revision
9b1db6b8060bd00b121a692f942404a24ae2960f from the 1.14 branch is used instead.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 14 ++++++
.../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 46 ++++++++++++++++++++
meta/recipes-graphics/mx/mx.inc | 21 +++++++++
.../recipes-graphics/mx/mx/fix-test-includes.patch | 20 +++++++++
meta/recipes-graphics/mx/mx_1.4.7.bb | 18 --------
5 files changed, 101 insertions(+), 18 deletions(-)
create mode 100644 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
create mode 100644 meta/recipes-graphics/mx/mx.inc
create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch
delete mode 100644 meta/recipes-graphics/mx/mx_1.4.7.bb
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
new file mode 100644
index 0000000..4c4c8eb
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -0,0 +1,14 @@
+require mx.inc
+
+# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix
+SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
+PV = "1.4.7+git${SRCPV}"
+
+SRC_URI = "git://github.com/clutter-project/mx.git;protocol=git \
+ file://fix-build-dir.patch \
+ file://fix-test-includes.patch \
+ "
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
+ file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
new file mode 100644
index 0000000..e7481e9
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
@@ -0,0 +1,46 @@
+Fix build for S != B
+
+This patch is specific to version 1.4.x
+Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/81
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+--
+Index: git/docs/reference/libmx-gtk/Makefile.am
+===================================================================
+--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
++++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
+@@ -1,3 +1,6 @@
++EXTRA_DIST=
++CLEANFILES=
++
+ ## Process this file with automake to produce Makefile.in
+
+ # We require automake 1.6 at least.
+@@ -77,7 +80,7 @@
+ GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++include $(top_builddir)/gtk-doc.make
+
+ # Other files to distribute
+ EXTRA_DIST += version.xml.in
+Index: git/docs/reference/libmx/Makefile.am
+===================================================================
+--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
++++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
+@@ -1,3 +1,6 @@
++EXTRA_DIST=
++CLEANFILES=
++
+ ## Process this file with automake to produce Makefile.in
+
+ # We require automake 1.6 at least.
+@@ -106,7 +109,7 @@
+ GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++include $(top_builddir)/gtk-doc.make
+
+ # Other files to distribute
+ EXTRA_DIST += version.xml.in
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc
new file mode 100644
index 0000000..e3b4b15
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "Clutter based widget library"
+LICENSE = "LGPLv2.1"
+
+inherit clutter
+
+DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf"
+
+SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz"
+
+EXTRA_OECONF = "--disable-introspection \
+ --disable-gtk-doc \
+ --disable-gtk-widgets \
+ --with-dbus \
+ --with-winsys=none \
+ --without-clutter-imcontext \
+ --without-clutter-gesture \
+ --without-startup-notification \
+ --without-glade \
+ "
+
+FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
new file mode 100644
index 0000000..c6496a9
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
@@ -0,0 +1,20 @@
+Fix missing include directory when building tests
+
+This patch is currently required for all versions of mx
+Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/82
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+--
+Index: git/tests/Makefile.am
+===================================================================
+--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100
++++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100
+@@ -10,7 +10,8 @@
+
+ INCLUDES = \
+ -I$(top_srcdir) \
+- -I$(top_builddir)
++ -I$(top_builddir)\
++ -I$(top_builddir)/mx
+
+ noinst_PROGRAMS = \
+ test-deform-texture \
diff --git a/meta/recipes-graphics/mx/mx_1.4.7.bb b/meta/recipes-graphics/mx/mx_1.4.7.bb
deleted file mode 100644
index fd9189b..0000000
--- a/meta/recipes-graphics/mx/mx_1.4.7.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Clutter based widget library"
-LICENSE = "LGPLv2.1"
-
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
- file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
-
-PR = "r0"
-
-DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification"
-
-inherit autotools gettext
-
-SRC_URI = "https://github.com/downloads/clutter-project/${BPN}/${BP}.tar.xz"
-
-SRC_URI[md5sum] = "19b1e4918a5ae6d014fc0dab2bb3d0a1"
-SRC_URI[sha256sum] = "1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d"
-
-EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets --with-dbus"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 8/8] packagegroup-core-clutter: use clutter-1.0 packages
2013-05-20 15:05 ` Tomas Frydrych
` (6 preceding siblings ...)
2013-05-20 15:05 ` [PATCH v2 7/8] New mx recipe (1.4.7) Tomas Frydrych
@ 2013-05-20 15:05 ` Tomas Frydrych
2013-05-21 8:14 ` updates for cogl, clutter and mx Richard Purdie
8 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-20 15:05 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
.../packagegroups/packagegroup-core-clutter.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 7b1cedc..cb2aba0 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -5,7 +5,7 @@
SUMMARY = "Clutter package groups"
LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
inherit packagegroup
@@ -20,7 +20,7 @@ RCONFLICTS_${PN}-core = "task-core-clutter-core"
SUMMARY_${PN}-core = "Clutter graphics library"
RDEPENDS_${PN}-core = "\
- clutter-1.8 \
- clutter-gst-1.8 \
- clutter-gtk-1.8 \
+ clutter-1.0 \
+ clutter-gst-1.0 \
+ clutter-gtk-1.0 \
"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: updates for cogl, clutter and mx
2013-05-20 15:05 ` Tomas Frydrych
` (7 preceding siblings ...)
2013-05-20 15:05 ` [PATCH v2 8/8] packagegroup-core-clutter: use clutter-1.0 packages Tomas Frydrych
@ 2013-05-21 8:14 ` Richard Purdie
8 siblings, 0 replies; 36+ messages in thread
From: Richard Purdie @ 2013-05-21 8:14 UTC (permalink / raw)
To: Tomas Frydrych; +Cc: openembedded-core
On Mon, 2013-05-20 at 16:05 +0100, Tomas Frydrych wrote:
> > There are some issues with this patch set, some of the included patches
> > either do not have Upstream-Status or Signed-off-by tags, please review
> > that.
>
> Updated the various patch headers in v.2.
>
> > Also, I want to confirm that these are all new recipes and will not cause
> > backward PRs (ie do you need PE bumps to these)?
>
> I renamed the mx recipe also to mx-1.0 for consistency, so yes, these are all
> different packages now.
>
> > Finally, I think you need to update the packagegroup-core-clutter recipe.
>
> Done.
Thanks for this. I'm not convinced with the delete everything, then
re-add approach as it makes the git history even harder to read than
git's normal rename handling which is bad enough. I therefore split the
removal patch over the other patches. I also tweaked the patch titles as
"New xxxx" doesn't read well when listed alongside the other changes.
I've merged this with this minor tweaks.
Cheers,
Richard
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends
2013-05-20 15:05 ` [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
@ 2013-05-21 9:52 ` Burton, Ross
0 siblings, 0 replies; 36+ messages in thread
From: Burton, Ross @ 2013-05-21 9:52 UTC (permalink / raw)
To: Tomas Frydrych; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi Tomas,
On Monday, 20 May 2013, Tomas Frydrych wrote:
> +def get_minor_dir(v):
> + import re
> + m = re.match("^([0-9]+)\.([0-9]+)", v)
> + return "%s.%s" % (m.group(1), m.group(2))
>
>
Just an observation not a critic, but I'd love to see these centralised,
we've got the same logic duplicated all over the place now.
+def get_fpu_setting(bb, d):
> + if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
> + return "--without-fpu"
> + return ""
>
> This option isn't used by Clutter or cogl anymore, so you can drop this
function.
Ross
[-- Attachment #2: Type: text/html, Size: 979 bytes --]
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 3/8] New cogl recipe (1.14.0)
2013-05-20 15:05 ` [PATCH v2 3/8] New cogl recipe (1.14.0) Tomas Frydrych
@ 2013-05-21 10:01 ` Burton, Ross
2013-05-21 10:28 ` Tomas Frydrych
0 siblings, 1 reply; 36+ messages in thread
From: Burton, Ross @ 2013-05-21 10:01 UTC (permalink / raw)
To: Tomas Frydrych; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
On Monday, 20 May 2013, Tomas Frydrych wrote:
> GL flavour: 'gl' for big GL or 'gles2' for GLES2
> (GLES1 is availabe in cogl, but not supporeted here at
> present.)
>
Does this support enabling both GL and GLES2 in the same build? (at which
point the choice of backend becomes someone else's problem, but that's fine)
> +DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf"
>
The inherit gtk-doc in clutter.bbclass already adds a dependency on gtk-doc.
> +EXTRA_OECONF += "--disable-introspection \
> + --disable-gtk-doc \
>
gtk-doc.bbclass does this for you.
> + ${@get_fpu_setting(bb, d)} \
>
Unused, you can drop this.
+ --enable-examples-install \
> + --enable-debug \
> + --disable-gl \
> + --disable-gles1 \
> + --disable-gles2 \
> + --disable-glx \
>
Why are these not "disabled flags" in each of the relevant PACKAGECONFIG
definitions?
+ # Disable DOLT
> + sed -i -e 's/^DOLT//' ${S}/configure.ac
This was removed from clutter/cogl in 2010, so drop this.
Ross
[-- Attachment #2: Type: text/html, Size: 2446 bytes --]
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 3/8] New cogl recipe (1.14.0)
2013-05-21 10:01 ` Burton, Ross
@ 2013-05-21 10:28 ` Tomas Frydrych
0 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 10:28 UTC (permalink / raw)
To: openembedded-core
On 21/05/13 11:01, Burton, Ross wrote:
> On Monday, 20 May 2013, Tomas Frydrych wrote:
>
> GL flavour: 'gl' for big GL or 'gles2' for GLES2
> (GLES1 is availabe in cogl, but not supporeted here at
> present.)
>
>
> Does this support enabling both GL and GLES2 in the same build? (at
> which point the choice of backend becomes someone else's problem, but
> that's fine)
Yes, the PACKAGECONFIG options are additive.
Tomas
--
http://sleepfive.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* updates for cogl, clutter and mx v3
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
` (7 preceding siblings ...)
2013-05-17 20:16 ` updates for cogl, clutter and mx Saul Wold
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
` (7 more replies)
8 siblings, 8 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
Fixes per Ross' comments:
* Removed unused/unnecessary configure options
* Reworked PACKAGECONFIG for cogl and clutter
* Removed unnecessary configure framment's from cogl/clutter/clutter-gst
[PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
[PATCH v3 2/8] New cogl recipe (1.14.0)
[PATCH v3 3/8] New clutter recipe (1.14.4)
[PATCH v3 4/8] fix clutter
[PATCH v3 5/8] New clutter-gst recipe (1.6.0)
[PATCH v3 6/8] New clutter-gtk recipe (1.4.2)
[PATCH v3 7/8] New mx recipe (1.4.7)
[PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:19 ` Phil Blundell
2013-05-21 11:04 ` [PATCH v3 2/8] New cogl recipe (1.14.0) Tomas Frydrych
` (6 subsequent siblings)
7 siblings, 1 reply; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/classes/clutter.bbclass | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 meta/classes/clutter.bbclass
diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
new file mode 100644
index 0000000..0dc4850
--- /dev/null
+++ b/meta/classes/clutter.bbclass
@@ -0,0 +1,23 @@
+
+def get_minor_dir(v):
+ import re
+ m = re.match("^([0-9]+)\.([0-9]+)", v)
+ return "%s.%s" % (m.group(1), m.group(2))
+
+def get_real_name(n):
+ import re
+ m = re.match("^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n)
+ return "%s" % (m.group(1))
+
+VERMINOR = "${@get_minor_dir("${PV}")}"
+REALNAME = "${@get_real_name("${BPN}")}"
+FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}"
+
+CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
+
+CLUTTER_SRC_GIT = "git://git.gnome.org/${REALNAME};protocol=git"
+
+SRC_URI = "${CLUTTER_SRC_FTP}"
+S = "${WORKDIR}/${REALNAME}-${PV}"
+
+inherit autotools pkgconfig gtk-doc gettext
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 2/8] New cogl recipe (1.14.0)
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 3/8] New clutter recipe (1.14.4) Tomas Frydrych
` (5 subsequent siblings)
7 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping
up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0
pc file and headers and are backward compatible), and to simplify dependency
management (worth noting that since the 1.x development files are not parallel
installable, it is not possible to use two versions of cogl 1.x at the same
time anyway).
Package configuration is provided via PACKAGECONFIG options as follows:
GL flavour: 'gl' for big GL or 'gles2' for GLES2
(GLES1 is availabe in cogl, but not supporeted here at present.)
EGL platform: 'egl-null' -- PVR-style null platform
'egl-kms' -- kms platform provide by Mesa
'egl-x11' -- egl over xlib platform
(Additional EGL platforms, e.g., Wayland are supported by cogl,
but not supported here at present.)
GLX: 'glx' for the GLX extension support (implies 'gl')
Default configuration is 'glx'; typical configuration providing 'native' egl
on embedded HW would be 'gles2 egl-null'.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 50 +++++++++++++++++++++++++
meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb | 7 ++++
2 files changed, 57 insertions(+)
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
new file mode 100644
index 0000000..611d8fc
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -0,0 +1,50 @@
+DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
+HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+LICENSE = "LGPLv2.1+"
+
+inherit clutter
+
+DEPENDS = "pango glib-2.0 gdk-pixbuf"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+# Extra DEPENDS for PACKAGECONFIG
+EDEPENDS_GL = "virtual/libgl libdrm"
+EDEPENDS_GLES2 = "virtual/libgles2"
+EDEPENDS_KMS = "libdrm virtual/egl"
+EDEPENDS_EGL = "virtual/egl"
+EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi"
+
+# Extra RDEPENDS for PACKAGECONFIG
+# This has to be explictly listed, because cogl dlopens the backends
+ERDEPENDS_GL = "libgl"
+ERDEPENDS_GLES2 = "libgles2"
+
+EXTRA_OECONF += "--disable-introspection \
+ --enable-examples-install \
+ --enable-debug \
+ --disable-gles1 \
+ "
+
+# GL flavours
+PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
+PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
+
+# egl backends
+PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
+PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
+PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
+
+# glx
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx, ${EDEPENDS_X11}"
+
+# Default to GLX
+PACKAGECONFIG ??= "gl glx"
+
+#Fix up some weirdness in the docs
+do_configure_prepend() {
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+}
+
+FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
new file mode 100644
index 0000000..0f40c59
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
@@ -0,0 +1,7 @@
+
+require cogl-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "7eabaf4241c0b87cc9e3b0fa23fd0315"
+SRC_URI[archive.sha256sum] = "276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 3/8] New clutter recipe (1.14.4)
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 2/8] New cogl recipe (1.14.0) Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 4/8] fix clutter Tomas Frydrych
` (4 subsequent siblings)
7 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor,
keeping up with the upstream versioning policy (all 1.x packages install
clutter-1.0 pc file and headers and are backward compatible), and to simplify
dependency management (worth noting that since the 1.x development files are
not parall installable, it is not possible to use two versions of clutter 1.x
at the same time anyway).
Package configuration is provided via PACKAGECONFIG options as follows:
'x11' : enable X11 backend,
'glx' : enable GLX backend,
'egl' : enable EGL backend,
'evdev': enable evdev input backend
Default configuration is 'glx'; typical configuration for embedded HW using
'native' EGL would be 'egl evdev'.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 56 ++++++++++++++++++++
.../recipes-graphics/clutter/clutter-1.0_1.14.4.bb | 7 +++
.../clutter/clutter-1.14/enable_tests.patch | 36 +++++++++++++
3 files changed, 99 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
new file mode 100644
index 0000000..6710776
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -0,0 +1,56 @@
+DESCRIPTION = "Clutter graphics library"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2.1+"
+
+inherit clutter
+
+SRC_URI += "file://enable_tests.patch"
+
+DEPENDS = "gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
+EDEPENDS_GLX = "virtual/libgl"
+EDEPENDS_EGL = "virtual/egl"
+
+EDEPENDS_EVDEV = "libxkbcommon"
+ERDEPENDS_EVDEV = "xkeyboard-config"
+
+# Disable pretty much everything, override in platform specific set up
+EXTRA_OECONF += "--disable-gtk-doc \
+ ${@get_fpu_setting(bb, d)} \
+ --disable-introspection \
+ --disable-egl-backend \
+ --disable-quartz-backend \
+ --disable-win32-backend \
+ --disable-x11-backend \
+ --disable-gdk-backend \
+ --disable-wayland-backend \
+ --disable-wayland-compositor \
+ --disable-cex100-backend \
+ --disable-tslib-input \
+ --disable-evdev-input \
+ "
+
+PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}"
+PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}"
+PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
+
+# Default configuration, distros might want to override
+PACKAGECONFIG ??= "glx"
+
+FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+do_configure_prepend() {
+ # Fix up some weirdness in the docs
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+
+ # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
+ touch -t 200001010000 po/clutter-1.0.pot
+
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
new file mode 100644
index 0000000..35824c6
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
@@ -0,0 +1,7 @@
+
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf"
+SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c"
diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
new file mode 100644
index 0000000..f97d598
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
@@ -0,0 +1,36 @@
+Make tests installable
+
+The test applications are useful for image testing.
+
+Imported from clutter 1.8 package, git://git.openembedded.org/openembedded,
+commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+
+Index: git/tests/interactive/Makefile.am
+===================================================================
+--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
++++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
+@@ -88,7 +88,7 @@
+
+ common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
+
+-noinst_PROGRAMS = test-interactive
++bin_PROGRAMS = test-interactive
+
+ test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
+ test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+Index: git/tests/interactive/test-actors.c
+===================================================================
+--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
++++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
+@@ -178,7 +178,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);
+
+- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
++ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
+ real_hand = clutter_texture_new_from_file (file, &error);
+ if (real_hand == NULL)
+ g_error ("image load failed: %s", error->message);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 4/8] fix clutter
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
` (2 preceding siblings ...)
2013-05-21 11:04 ` [PATCH v3 3/8] New clutter recipe (1.14.4) Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:20 ` Phil Blundell
2013-05-21 11:04 ` [PATCH v3 5/8] New clutter-gst recipe (1.6.0) Tomas Frydrych
` (3 subsequent siblings)
7 siblings, 1 reply; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 6710776..9b4b169 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -17,29 +17,24 @@ EDEPENDS_EGL = "virtual/egl"
EDEPENDS_EVDEV = "libxkbcommon"
ERDEPENDS_EVDEV = "xkeyboard-config"
-# Disable pretty much everything, override in platform specific set up
-EXTRA_OECONF += "--disable-gtk-doc \
- ${@get_fpu_setting(bb, d)} \
- --disable-introspection \
- --disable-egl-backend \
+# Disable backends we do not currently support building
+EXTRA_OECONF += "--disable-introspection \
--disable-quartz-backend \
--disable-win32-backend \
- --disable-x11-backend \
--disable-gdk-backend \
--disable-wayland-backend \
--disable-wayland-compositor \
--disable-cex100-backend \
--disable-tslib-input \
- --disable-evdev-input \
"
-PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}"
-PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}"
-PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}"
-PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
+PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}"
+PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}"
+PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
# Default configuration, distros might want to override
-PACKAGECONFIG ??= "glx"
+PACKAGECONFIG ??= "x11 glx"
FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
@@ -50,7 +45,4 @@ do_configure_prepend() {
# see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
touch -t 200001010000 po/clutter-1.0.pot
-
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 5/8] New clutter-gst recipe (1.6.0)
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
` (3 preceding siblings ...)
2013-05-21 11:04 ` [PATCH v3 4/8] fix clutter Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 6/8] New clutter-gtk recipe (1.4.2) Tomas Frydrych
` (2 subsequent siblings)
7 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 19 ++++++++
.../clutter/clutter-gst-1.0_1.6.0.bb | 9 ++++
.../clutter/clutter-gst-1.6/cogl-1.14.patch | 48 ++++++++++++++++++++
.../clutter/clutter-gst/enable-tests.patch | 23 ++++++++++
4 files changed, 99 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
new file mode 100644
index 0000000..eebfd09
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Clutter GStreamer"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2+"
+
+inherit clutter
+
+SRC_URI += "file://enable-tests.patch"
+
+DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0"
+RDEPENDS_${PN} += "gst-meta-base"
+PACKAGES =+ "${PN}-examples"
+
+EXTRA_OECONF += "--disable-introspection"
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so"
+FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
+
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
new file mode 100644
index 0000000..dc5cc13
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
@@ -0,0 +1,9 @@
+require clutter-gst-1.0.inc
+
+SRC_URI += "file://cogl-1.14.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b"
+SRC_URI[archive.sha256sum] = "abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
new file mode 100644
index 0000000..a46b448
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
@@ -0,0 +1,48 @@
+From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001
+From: Tomas Frydrych <tomas@sleepfive.com>
+Date: Thu, 11 Oct 2012 08:53:03 +0100
+Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against
+ cogl-1.14
+
+Cogl 1.14 exposes various GL types through the public API but it does not
+pull in the GL type definitions through its public headers; specifically
+compilation will fail due to undefined GL_TEXTURE_2D. So include the headers
+the hard way.
+
+Upstream-status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+---
+ clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 9b4b53c..f092581 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -42,6 +42,23 @@
+ #include "config.h"
+ #endif
+
++/*
++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes.
++ */
++#include <cogl/cogl.h>
++
++#ifdef COGL_HAS_GLES1
++#include <GLES/gl.h>
++#include <GLES/glext.h>
++#elif COGL_HAS_GLES2
++#include <GLES2/gl2.h>
++#include <GLES2/gl2ext.h>
++#elif COGL_HAS_GL
++#include <GL/gl.h>
++#else
++#error Unknown cogl configuration
++#endif
++
+ #include "clutter-gst-video-sink.h"
+ #include "clutter-gst-util.h"
+ #include "clutter-gst-private.h"
+--
+1.7.10.4
+
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 0000000..b3aec39
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
@@ -0,0 +1,23 @@
+Install example binary needed for core-image-clutter
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
+Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded,
+commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6
+
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.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 video-sink-navigation
++bin_PROGRAMS = video-player video-sink video-sink-navigation
+
+ INCLUDES = -I$(top_srcdir) \
+ $(MAINTAINER_CFLAGS) \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 6/8] New clutter-gtk recipe (1.4.2)
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
` (4 preceding siblings ...)
2013-05-21 11:04 ` [PATCH v3 5/8] New clutter-gst recipe (1.6.0) Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 7/8] New mx recipe (1.4.7) Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages Tomas Frydrych
7 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 ++++++++++++
meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb | 6 ++++++
2 files changed, 18 insertions(+)
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
new file mode 100644
index 0000000..3717f48
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "ClutterGtk"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2+"
+
+inherit clutter
+
+DEPENDS = "clutter-1.0 gtk+3"
+PACKAGES =+ "${PN}-examples"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+EXTRA_OECONF += "--disable-introspection"
+
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
new file mode 100644
index 0000000..64eb70c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb
@@ -0,0 +1,6 @@
+require clutter-gtk-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6"
+SRC_URI[archive.sha256sum] = "dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 7/8] New mx recipe (1.4.7)
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
` (5 preceding siblings ...)
2013-05-21 11:04 ` [PATCH v3 6/8] New clutter-gtk recipe (1.4.2) Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages Tomas Frydrych
7 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The package has been renamed to mx-1.0, keeping up with the upstream versioning
policy. The 1.14.7 tag does not build with clutter 1.14, so git revision
9b1db6b8060bd00b121a692f942404a24ae2960f from the 1.14 branch is used instead.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 14 ++++++
.../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 46 ++++++++++++++++++++
meta/recipes-graphics/mx/mx.inc | 21 +++++++++
.../recipes-graphics/mx/mx/fix-test-includes.patch | 20 +++++++++
meta/recipes-graphics/mx/mx_1.4.7.bb | 18 --------
5 files changed, 101 insertions(+), 18 deletions(-)
create mode 100644 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
create mode 100644 meta/recipes-graphics/mx/mx.inc
create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch
delete mode 100644 meta/recipes-graphics/mx/mx_1.4.7.bb
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
new file mode 100644
index 0000000..4c4c8eb
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -0,0 +1,14 @@
+require mx.inc
+
+# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix
+SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
+PV = "1.4.7+git${SRCPV}"
+
+SRC_URI = "git://github.com/clutter-project/mx.git;protocol=git \
+ file://fix-build-dir.patch \
+ file://fix-test-includes.patch \
+ "
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
+ file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
new file mode 100644
index 0000000..e7481e9
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
@@ -0,0 +1,46 @@
+Fix build for S != B
+
+This patch is specific to version 1.4.x
+Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/81
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+--
+Index: git/docs/reference/libmx-gtk/Makefile.am
+===================================================================
+--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
++++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
+@@ -1,3 +1,6 @@
++EXTRA_DIST=
++CLEANFILES=
++
+ ## Process this file with automake to produce Makefile.in
+
+ # We require automake 1.6 at least.
+@@ -77,7 +80,7 @@
+ GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++include $(top_builddir)/gtk-doc.make
+
+ # Other files to distribute
+ EXTRA_DIST += version.xml.in
+Index: git/docs/reference/libmx/Makefile.am
+===================================================================
+--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
++++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
+@@ -1,3 +1,6 @@
++EXTRA_DIST=
++CLEANFILES=
++
+ ## Process this file with automake to produce Makefile.in
+
+ # We require automake 1.6 at least.
+@@ -106,7 +109,7 @@
+ GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++include $(top_builddir)/gtk-doc.make
+
+ # Other files to distribute
+ EXTRA_DIST += version.xml.in
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc
new file mode 100644
index 0000000..e3b4b15
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "Clutter based widget library"
+LICENSE = "LGPLv2.1"
+
+inherit clutter
+
+DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf"
+
+SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz"
+
+EXTRA_OECONF = "--disable-introspection \
+ --disable-gtk-doc \
+ --disable-gtk-widgets \
+ --with-dbus \
+ --with-winsys=none \
+ --without-clutter-imcontext \
+ --without-clutter-gesture \
+ --without-startup-notification \
+ --without-glade \
+ "
+
+FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
new file mode 100644
index 0000000..c6496a9
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
@@ -0,0 +1,20 @@
+Fix missing include directory when building tests
+
+This patch is currently required for all versions of mx
+Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/82
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+--
+Index: git/tests/Makefile.am
+===================================================================
+--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100
++++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100
+@@ -10,7 +10,8 @@
+
+ INCLUDES = \
+ -I$(top_srcdir) \
+- -I$(top_builddir)
++ -I$(top_builddir)\
++ -I$(top_builddir)/mx
+
+ noinst_PROGRAMS = \
+ test-deform-texture \
diff --git a/meta/recipes-graphics/mx/mx_1.4.7.bb b/meta/recipes-graphics/mx/mx_1.4.7.bb
deleted file mode 100644
index fd9189b..0000000
--- a/meta/recipes-graphics/mx/mx_1.4.7.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Clutter based widget library"
-LICENSE = "LGPLv2.1"
-
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
- file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
-
-PR = "r0"
-
-DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification"
-
-inherit autotools gettext
-
-SRC_URI = "https://github.com/downloads/clutter-project/${BPN}/${BP}.tar.xz"
-
-SRC_URI[md5sum] = "19b1e4918a5ae6d014fc0dab2bb3d0a1"
-SRC_URI[sha256sum] = "1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d"
-
-EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets --with-dbus"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
` (6 preceding siblings ...)
2013-05-21 11:04 ` [PATCH v3 7/8] New mx recipe (1.4.7) Tomas Frydrych
@ 2013-05-21 11:04 ` Tomas Frydrych
7 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 11:04 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
.../packagegroups/packagegroup-core-clutter.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 7b1cedc..cb2aba0 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -5,7 +5,7 @@
SUMMARY = "Clutter package groups"
LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
inherit packagegroup
@@ -20,7 +20,7 @@ RCONFLICTS_${PN}-core = "task-core-clutter-core"
SUMMARY_${PN}-core = "Clutter graphics library"
RDEPENDS_${PN}-core = "\
- clutter-1.8 \
- clutter-gst-1.8 \
- clutter-gtk-1.8 \
+ clutter-1.0 \
+ clutter-gst-1.0 \
+ clutter-gtk-1.0 \
"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
2013-05-21 11:04 ` [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
@ 2013-05-21 11:19 ` Phil Blundell
2013-05-21 16:51 ` Paul Eggleton
0 siblings, 1 reply; 36+ messages in thread
From: Phil Blundell @ 2013-05-21 11:19 UTC (permalink / raw)
To: Tomas Frydrych; +Cc: openembedded-core
On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
> meta/classes/clutter.bbclass | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
> create mode 100644 meta/classes/clutter.bbclass
Do we really need a new class for this? Can it be merged with gnomebase
somehow, perhaps?
If clutter really does need its own specialised logic then maybe clutter
and cogl should both stay in recipes-graphics/clutter and just share
an .inc file. It seems a bit sad to clutter (no pun intended) the
global classes directory with this sort of thing.
p.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 4/8] fix clutter
2013-05-21 11:04 ` [PATCH v3 4/8] fix clutter Tomas Frydrych
@ 2013-05-21 11:20 ` Phil Blundell
2013-05-21 12:36 ` Tomas Frydrych
0 siblings, 1 reply; 36+ messages in thread
From: Phil Blundell @ 2013-05-21 11:20 UTC (permalink / raw)
To: Tomas Frydrych; +Cc: openembedded-core
On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
> -# Disable pretty much everything, override in platform specific set up
> -EXTRA_OECONF += "--disable-gtk-doc \
> - ${@get_fpu_setting(bb, d)} \
> - --disable-introspection \
> - --disable-egl-backend \
> +# Disable backends we do not currently support building
> +EXTRA_OECONF += "--disable-introspection \
Was this supposed to have been squashed with 3/8?
p.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 4/8] fix clutter
2013-05-21 11:20 ` Phil Blundell
@ 2013-05-21 12:36 ` Tomas Frydrych
0 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-21 12:36 UTC (permalink / raw)
Cc: openembedded-core
On 21/05/13 12:20, Phil Blundell wrote:
> On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
>> -# Disable pretty much everything, override in platform specific set up
>> -EXTRA_OECONF += "--disable-gtk-doc \
>> - ${@get_fpu_setting(bb, d)} \
>> - --disable-introspection \
>> - --disable-egl-backend \
>> +# Disable backends we do not currently support building
>> +EXTRA_OECONF += "--disable-introspection \
>
> Was this supposed to have been squashed with 3/8?
Yes, sorry :( I think Richard already pushed the previous version as well.
Tomas
--
http://sleepfive.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
2013-05-21 11:19 ` Phil Blundell
@ 2013-05-21 16:51 ` Paul Eggleton
2013-05-22 8:23 ` Tomas Frydrych
0 siblings, 1 reply; 36+ messages in thread
From: Paul Eggleton @ 2013-05-21 16:51 UTC (permalink / raw)
To: Phil Blundell; +Cc: openembedded-core
On Tuesday 21 May 2013 12:19:36 Phil Blundell wrote:
> On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
> > meta/classes/clutter.bbclass | 23 +++++++++++++++++++++++
> > 1 file changed, 23 insertions(+)
> > create mode 100644 meta/classes/clutter.bbclass
>
> Do we really need a new class for this? Can it be merged with gnomebase
> somehow, perhaps?
>
> If clutter really does need its own specialised logic then maybe clutter
> and cogl should both stay in recipes-graphics/clutter and just share
> an .inc file. It seems a bit sad to clutter (no pun intended) the
> global classes directory with this sort of thing.
Have to say I agree; given that this set has been merged we could take this as
an additional patch if it works for Tomas?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
2013-05-21 16:51 ` Paul Eggleton
@ 2013-05-22 8:23 ` Tomas Frydrych
0 siblings, 0 replies; 36+ messages in thread
From: Tomas Frydrych @ 2013-05-22 8:23 UTC (permalink / raw)
To: openembedded-core
On 21/05/13 17:51, Paul Eggleton wrote:
> On Tuesday 21 May 2013 12:19:36 Phil Blundell wrote:
>> On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
>>> meta/classes/clutter.bbclass | 23 +++++++++++++++++++++++
>>> 1 file changed, 23 insertions(+)
>>> create mode 100644 meta/classes/clutter.bbclass
>>
>> Do we really need a new class for this? Can it be merged with gnomebase
>> somehow, perhaps?
>>
>> If clutter really does need its own specialised logic then maybe clutter
>> and cogl should both stay in recipes-graphics/clutter and just share
>> an .inc file. It seems a bit sad to clutter (no pun intended) the
>> global classes directory with this sort of thing.
>
> Have to say I agree; given that this set has been merged we could take this as
> an additional patch if it works for Tomas?
The clutter class is used by cogl, clutter and mx (only the version
parsing logic in the latter); it is also used by the mutter package in
meta-clutter. But if you prefer includes in oecore, that's fine by me.
Tomas
--
http://sleepfive.com
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2013-05-22 8:23 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-17 11:25 updates for cogl, clutter and mx Tomas Frydrych
2013-05-17 11:25 ` [PATCH 1/7] Remove old clutter recipes Tomas Frydrych
2013-05-17 11:25 ` [PATCH 2/7] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
2013-05-17 11:25 ` [PATCH 3/7] New cogl recipe (1.14.0) Tomas Frydrych
2013-05-17 11:25 ` [PATCH 4/7] New clutter recipe (1.14.4) Tomas Frydrych
2013-05-17 11:25 ` [PATCH 5/7] New clutter gst recipe (1.6.0) Tomas Frydrych
2013-05-17 11:25 ` [PATCH 6/7] New clutter-gtk recipe (1.4.2) Tomas Frydrych
2013-05-17 11:25 ` [PATCH 7/7] Update mx recipe to build with clutter 1.14.4 Tomas Frydrych
2013-05-17 20:16 ` updates for cogl, clutter and mx Saul Wold
2013-05-20 15:05 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 1/8] Remove old clutter recipes Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
2013-05-21 9:52 ` Burton, Ross
2013-05-20 15:05 ` [PATCH v2 3/8] New cogl recipe (1.14.0) Tomas Frydrych
2013-05-21 10:01 ` Burton, Ross
2013-05-21 10:28 ` Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 4/8] New clutter recipe (1.14.4) Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 5/8] New clutter-gst recipe (1.6.0) Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 6/8] New clutter-gtk recipe (1.4.2) Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 7/8] New mx recipe (1.4.7) Tomas Frydrych
2013-05-20 15:05 ` [PATCH v2 8/8] packagegroup-core-clutter: use clutter-1.0 packages Tomas Frydrych
2013-05-21 8:14 ` updates for cogl, clutter and mx Richard Purdie
2013-05-21 11:04 ` updates for cogl, clutter and mx v3 Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends Tomas Frydrych
2013-05-21 11:19 ` Phil Blundell
2013-05-21 16:51 ` Paul Eggleton
2013-05-22 8:23 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 2/8] New cogl recipe (1.14.0) Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 3/8] New clutter recipe (1.14.4) Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 4/8] fix clutter Tomas Frydrych
2013-05-21 11:20 ` Phil Blundell
2013-05-21 12:36 ` Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 5/8] New clutter-gst recipe (1.6.0) Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 6/8] New clutter-gtk recipe (1.4.2) Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 7/8] New mx recipe (1.4.7) Tomas Frydrych
2013-05-21 11:04 ` [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages Tomas Frydrych
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.