diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch')
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch deleted file mode 100644 index bc2f88b24..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 14d51cbefef19737e7ab2b6818ee1d3bdb248d12 Mon Sep 17 00:00:00 2001 -From: Jeremy Stashluk <jstashluk@dekaresearch.com> -Date: Wed, 6 Feb 2013 09:59:48 -0500 -Subject: [PATCH] conditional gl framebuffer undefined use - -The OpenGL extension GL_ARB_framebuffer_object defines the macro -GL_FRAMEBUFFER_UNDEFINED. The macro will only need to map to an error -string if the extension provides functions that might return the macro. - -Upstream-Status: Pending - -Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com> ---- - gst-libs/gst/gl/gstgldisplay.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c -index 3ed0b71..64c6c2c 100644 ---- a/gst-libs/gst/gl/gstgldisplay.c -+++ b/gst-libs/gst/gl/gstgldisplay.c -@@ -2177,9 +2177,11 @@ gst_gl_display_check_framebuffer_status (void) - GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"); - break; - -+#if defined(GL_ARB_framebuffer_object) - case GL_FRAMEBUFFER_UNDEFINED: - GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED"); - break; -+#endif - - default: - GST_ERROR ("General FBO error"); --- -1.7.9.5 - |