diff options
author | Jeremy Stashluk <stashluk@gmail.com> | 2013-02-19 12:13:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-22 06:09:22 -0800 |
commit | abfc956bc1ab8236208781402aa0b5bf572842bf (patch) | |
tree | f7bf396ea30329768caea181a6b409d9aa38d6d8 /meta/recipes-multimedia | |
parent | c07179750301f84c3ba7f55cb2603128cf2fd6dc (diff) | |
download | poky-abfc956bc1ab8236208781402aa0b5bf572842bf.tar.gz |
gst-plugins-gl: add package recipe
Added notes, signoff, and upstream status to internal patch.
(From OE-Core rev: 76cebb57d3ce507e3876e0a9a881eaa3e8c6fdb8)
Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch | 35 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bb | 19 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch new file mode 100644 index 0000000000..bc2f88b241 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 14d51cbefef19737e7ab2b6818ee1d3bdb248d12 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeremy Stashluk <jstashluk@dekaresearch.com> | ||
3 | Date: Wed, 6 Feb 2013 09:59:48 -0500 | ||
4 | Subject: [PATCH] conditional gl framebuffer undefined use | ||
5 | |||
6 | The OpenGL extension GL_ARB_framebuffer_object defines the macro | ||
7 | GL_FRAMEBUFFER_UNDEFINED. The macro will only need to map to an error | ||
8 | string if the extension provides functions that might return the macro. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com> | ||
13 | --- | ||
14 | gst-libs/gst/gl/gstgldisplay.c | 2 ++ | ||
15 | 1 file changed, 2 insertions(+) | ||
16 | |||
17 | diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c | ||
18 | index 3ed0b71..64c6c2c 100644 | ||
19 | --- a/gst-libs/gst/gl/gstgldisplay.c | ||
20 | +++ b/gst-libs/gst/gl/gstgldisplay.c | ||
21 | @@ -2177,9 +2177,11 @@ gst_gl_display_check_framebuffer_status (void) | ||
22 | GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"); | ||
23 | break; | ||
24 | |||
25 | +#if defined(GL_ARB_framebuffer_object) | ||
26 | case GL_FRAMEBUFFER_UNDEFINED: | ||
27 | GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED"); | ||
28 | break; | ||
29 | +#endif | ||
30 | |||
31 | default: | ||
32 | GST_ERROR ("General FBO error"); | ||
33 | -- | ||
34 | 1.7.9.5 | ||
35 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bb new file mode 100644 index 0000000000..ffda9779be --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require recipes-multimedia/gstreamer/gst-plugins.inc | ||
2 | |||
3 | LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | ||
5 | |||
6 | SRC_URI[md5sum] = "ac70ede13f79978d56eaed8abaa3c938" | ||
7 | SRC_URI[sha256sum] = "48340b6a4b8abce16344a7bc33e74a94fdcce4f57ef6342cdf2f941c429bf210" | ||
8 | |||
9 | SRC_URI += " file://0001-conditional-gl-framebuffer-undefined-use.patch" | ||
10 | |||
11 | DEPENDS += "gst-plugins-base virtual/libgles2 virtual/egl jpeg" | ||
12 | |||
13 | inherit gettext gconf | ||
14 | |||
15 | # This package doesn't have a configure switch for EGL or GL, so forcibly tell | ||
16 | # configure that it can't find gl.h so it always uses EGL. If/when we have some | ||
17 | # way for machines to specify their preferred GL flavour this can be | ||
18 | # automatically adapted. | ||
19 | EXTRA_OECONF += "ac_cv_header_GL_gl_h=no" | ||