summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2015-05-18 16:58:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-20 21:41:07 +0100
commit50ce68aa27e6620d76f71b8c20495d3db4e9f546 (patch)
tree959a9d3ae6834fab1e52516486e0d3f6a7df2958 /meta/recipes-graphics
parentd30b1b0d0e99c7c579c6bdb36ed3378c9057a46d (diff)
downloadpoky-50ce68aa27e6620d76f71b8c20495d3db4e9f546.tar.gz
clutter-gst: update to latest upstream version 3.0.4
This also makes it GStreamer 1.0 compatible https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 (From OE-Core rev: 4a2f9e7eebcfe106738af17917a700d769acf03b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch48
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.0.inc18
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb9
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch33
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/enable-tests.patch (renamed from meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch)0
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-3.0.inc18
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb7
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb2
8 files changed, 59 insertions, 76 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch
deleted file mode 100644
index d009e44c34..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001
2From: Tomas Frydrych <tomas@sleepfive.com>
3Date: Thu, 11 Oct 2012 08:53:03 +0100
4Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against
5 cogl-1.14
6
7Cogl 1.14 exposes various GL types through the public API but it does not
8pull in the GL type definitions through its public headers; specifically
9compilation will fail due to undefined GL_TEXTURE_2D. So include the headers
10the hard way.
11
12Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509
13Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
14---
15 clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++
16 1 file changed, 17 insertions(+)
17
18diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
19index 9b4b53c..f092581 100644
20--- a/clutter-gst/clutter-gst-video-sink.c
21+++ b/clutter-gst/clutter-gst-video-sink.c
22@@ -42,6 +42,23 @@
23 #include "config.h"
24 #endif
25
26+/*
27+ * cogl-1.14 exposes generic GL types in the API, but not the actual includes.
28+ */
29+#include <cogl/cogl.h>
30+
31+#ifdef COGL_HAS_GLES1
32+#include <GLES/gl.h>
33+#include <GLES/glext.h>
34+#elif COGL_HAS_GLES2
35+#include <GLES2/gl2.h>
36+#include <GLES2/gl2ext.h>
37+#elif COGL_HAS_GL
38+#include <GL/gl.h>
39+#else
40+#error Unknown cogl configuration
41+#endif
42+
43 #include "clutter-gst-video-sink.h"
44 #include "clutter-gst-util.h"
45 #include "clutter-gst-private.h"
46--
471.7.10.4
48
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
deleted file mode 100644
index bb05ede624..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
+++ /dev/null
@@ -1,18 +0,0 @@
1SUMMARY = "GStreamer integration library for Clutter"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+"
4
5inherit clutter
6
7SRC_URI += "file://enable-tests.patch"
8
9DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0"
10RDEPENDS_${PN} += "gst-meta-base"
11PACKAGES =+ "${PN}-examples"
12
13EXTRA_OECONF += "--disable-introspection"
14
15FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so"
16FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
17FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so"
18FILES_${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
deleted file mode 100644
index dc5cc13053..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require clutter-gst-1.0.inc
2
3SRC_URI += "file://cogl-1.14.patch"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
6 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
7
8SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b"
9SRC_URI[archive.sha256sum] = "abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch
new file mode 100644
index 0000000000..0b26b990d7
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/0001-Install-example-binary-needed-for-core-image-clutter.patch
@@ -0,0 +1,33 @@
1From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 30 Apr 2015 12:19:13 +0300
4Subject: [PATCH] Install example binary needed for core-image-clutter
5
6Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
7
8Upstream-Status: Inappropriate [configuration]
9
10Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded,
11commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0
12
13Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
14Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15---
16 examples/Makefile.am | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/examples/Makefile.am b/examples/Makefile.am
20index bfbc1b5..09655e3 100644
21--- a/examples/Makefile.am
22+++ b/examples/Makefile.am
23@@ -1,6 +1,6 @@
24 NULL = #
25
26-noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content
27+bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content
28
29 AM_CPPFLAGS = -I$(top_srcdir) \
30 $(MAINTAINER_CFLAGS) \
31--
322.1.4
33
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/enable-tests.patch
index b3aec392e6..b3aec392e6 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0-3.0.4/enable-tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
new file mode 100644
index 0000000000..d4fed7127f
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
@@ -0,0 +1,18 @@
1SUMMARY = "GStreamer integration library for Clutter"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+"
4
5inherit clutter
6
7SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch"
8
9DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0"
10RDEPENDS_${PN} += "gstreamer1.0-meta-base"
11PACKAGES =+ "${PN}-examples"
12
13EXTRA_OECONF += "--disable-introspection"
14
15FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so"
16FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
17FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug/lib*.so"
18FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb
new file mode 100644
index 0000000000..dbc66e1507
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.4.bb
@@ -0,0 +1,7 @@
1require clutter-gst-3.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
4 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
5
6SRC_URI[archive.md5sum] = "0b4283e6ccf5ee5d9f5fb635230fc714"
7SRC_URI[archive.sha256sum] = "c61011732428c74923a52cc7629903bd910ecad22634d58f7b0c1dc55235162a"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 7540821c4e..9d67e5f89c 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -16,6 +16,6 @@ PACKAGES = "\
16SUMMARY_${PN}-core = "Clutter graphics library" 16SUMMARY_${PN}-core = "Clutter graphics library"
17RDEPENDS_${PN}-core = "\ 17RDEPENDS_${PN}-core = "\
18 clutter-1.0 \ 18 clutter-1.0 \
19 clutter-gst-1.0 \ 19 clutter-gst-3.0 \
20 clutter-gtk-1.0 \ 20 clutter-gtk-1.0 \
21 " 21 "