diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2015-05-18 16:58:36 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-20 21:41:07 +0100 |
commit | 50ce68aa27e6620d76f71b8c20495d3db4e9f546 (patch) | |
tree | 959a9d3ae6834fab1e52516486e0d3f6a7df2958 /meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | |
parent | d30b1b0d0e99c7c579c6bdb36ed3378c9057a46d (diff) | |
download | poky-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/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | 48 |
1 files changed, 0 insertions, 48 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 @@ | |||
1 | From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Frydrych <tomas@sleepfive.com> | ||
3 | Date: Thu, 11 Oct 2012 08:53:03 +0100 | ||
4 | Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against | ||
5 | cogl-1.14 | ||
6 | |||
7 | Cogl 1.14 exposes various GL types through the public API but it does not | ||
8 | pull in the GL type definitions through its public headers; specifically | ||
9 | compilation will fail due to undefined GL_TEXTURE_2D. So include the headers | ||
10 | the hard way. | ||
11 | |||
12 | Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 | ||
13 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
14 | --- | ||
15 | clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++ | ||
16 | 1 file changed, 17 insertions(+) | ||
17 | |||
18 | diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c | ||
19 | index 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 | -- | ||
47 | 1.7.10.4 | ||
48 | |||