summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorYuqing Zhu <carol.zhu@nxp.com>2016-07-04 13:46:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:45 +0100
commit352acc90c4cd55877b28571ffa041a103165865e (patch)
tree24c010cce9c0f4863208983b09eb3b90184e64f8 /meta/recipes-multimedia/gstreamer
parent365fdce1edf9cf6886fc0272da5cc5a08856004e (diff)
downloadpoky-352acc90c4cd55877b28571ffa041a103165865e.tar.gz
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>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rwxr-xr-xmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb1
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 0000000000..b75f402d82
--- /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 @@
1From b069672ace2b762f400ca6d318571cbedf5141f2 Mon Sep 17 00:00:00 2001
2From: Matthew Waters <matthew@centricular.com>
3Date: Thu, 31 Mar 2016 20:00:37 +1100
4Subject: [PATCH 1/3] glcolorconvert: don't use the predefined variable name
5 sample
6
7Using 'sample' as a variable name is an error in GLES3
8
9Upstream-Status: Backport [1.9.1]
10---
11 gst-libs/gst/gl/gstglcolorconvert.c | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c
15index f478faa..c23624f 100644
16--- a/gst-libs/gst/gl/gstglcolorconvert.c
17+++ b/gst-libs/gst/gl/gstglcolorconvert.c
18@@ -261,9 +261,9 @@ static const struct shader_templ templ_RGB_to_PLANAR_YUV =
19 " for (int j = 0; j < int(chroma_sampling.y); j++) {\n"
20 " int n = (i+1)*(j+1);\n"
21 " delta.y = float(j);\n"
22- " vec4 sample = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n"
23+ " vec4 s = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n"
24 /* rolling average */
25- " uv_texel = (float(n-1) * uv_texel + sample) / float(n);\n"
26+ " uv_texel = (float(n-1) * uv_texel + s) / float(n);\n"
27 " }\n"
28 " }\n"
29 "}\n"
30--
311.9.1
32
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 0df1b8e91b..7f6b918e29 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 = " \
14 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ 14 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
15 file://0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch \ 15 file://0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch \
16 file://0003-glcolorconvert-implement-multiple-render-targets-for.patch \ 16 file://0003-glcolorconvert-implement-multiple-render-targets-for.patch \
17 file://0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch \
17" 18"
18SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8" 19SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8"
19SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97" 20SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"