From: Tomas Frydrych <to...@sleepfive.com>
Signed-off-by: Tomas Frydrych <to...@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 <to...@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.z...@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 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
