diff options
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | 48 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch | 23 |
2 files changed, 71 insertions, 0 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 new file mode 100644 index 0000000000..d009e44c34 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | |||
@@ -0,0 +1,48 @@ | |||
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 | |||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch new file mode 100644 index 0000000000..b3aec392e6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Install example binary needed for core-image-clutter | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, | ||
8 | commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 | ||
9 | |||
10 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
11 | |||
12 | Index: git/examples/Makefile.am | ||
13 | =================================================================== | ||
14 | --- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 | ||
15 | +++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800 | ||
16 | @@ -1,6 +1,6 @@ | ||
17 | NULL = # | ||
18 | |||
19 | -noinst_PROGRAMS = video-player video-sink video-sink-navigation | ||
20 | +bin_PROGRAMS = video-player video-sink video-sink-navigation | ||
21 | |||
22 | INCLUDES = -I$(top_srcdir) \ | ||
23 | $(MAINTAINER_CFLAGS) \ | ||