[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1376/8267] gstreamer1.0-plugins-bad: Don't use the predefined variable name in glcolorconvert

[Emmanuele Bassi <ebassi src gnome org>]

commit 352acc90c4cd55877b28571ffa041a103165865e
Author: Yuqing Zhu <carol zhu nxp com>
Date:   Mon Jul 4 13:46:30 2016 +0800

    gstreamer1.0-plugins-bad: Don't use the predefined variable name in glcolorconvert
    
    Using 'sample' as a variable name is an error in GLES3.
    
    (From OE-Core rev: bf58344101de5cbdfb54534b028aad2112863033)
    
    Signed-off-by: Yuqing Zhu <carol zhu nxp com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...ert-don-t-use-the-predefined-variable-nam.patch |   32 ++++++++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb    |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch
 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch
new file mode 100755
index 0000000..b75f402
--- /dev/null
+++ 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch
@@ -0,0 +1,32 @@
+From b069672ace2b762f400ca6d318571cbedf5141f2 Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew centricular com>
+Date: Thu, 31 Mar 2016 20:00:37 +1100
+Subject: [PATCH 1/3] glcolorconvert: don't use the predefined variable name
+ sample
+
+Using 'sample' as a variable name is an error in GLES3
+
+Upstream-Status: Backport [1.9.1]
+---
+ gst-libs/gst/gl/gstglcolorconvert.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c
+index f478faa..c23624f 100644
+--- a/gst-libs/gst/gl/gstglcolorconvert.c
++++ b/gst-libs/gst/gl/gstglcolorconvert.c
+@@ -261,9 +261,9 @@ static const struct shader_templ templ_RGB_to_PLANAR_YUV =
+     "    for (int j = 0; j < int(chroma_sampling.y); j++) {\n"
+     "      int n = (i+1)*(j+1);\n"
+     "      delta.y = float(j);\n"
+-    "      vec4 sample = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n"
++    "      vec4 s = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n"
+            /* rolling average */
+-    "      uv_texel = (float(n-1) * uv_texel + sample) / float(n);\n"
++    "      uv_texel = (float(n-1) * uv_texel + s) / float(n);\n"
+     "    }\n"
+     "  }\n"
+     "}\n"
+-- 
+1.9.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
index 0df1b8e..7f6b918 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
@@ -14,6 +14,7 @@ SRC_URI = " \
     file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
     file://0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch \
     file://0003-glcolorconvert-implement-multiple-render-targets-for.patch \
+    file://0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch \
 "
 SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8"
 SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"