diff options
author | 2016-12-08 18:57:54 -0800 | |
---|---|---|
committer | 2016-12-13 22:47:30 +0000 | |
commit | 309e02b7313398a05e70915560882c880c7f7c76 (patch) | |
tree | 53630abf58afd480acce1ccb1b125a5f21e92401 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch | |
parent | 3206f408e908870629eb47afac6249a3c9497a66 (diff) | |
download | openembedded-core-contrib-309e02b7313398a05e70915560882c880c7f7c76.tar.gz |
gstreamer1.0: Upgrade to 1.10.1
Remove backported patches and upstreamed ones
Drop --disable-trace its no more in 1.10.x
Add packageconfig option for kms, keep it disabled by default
in bad plugins recipe
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch')
-rwxr-xr-x | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch | 32 |
1 files changed, 0 insertions, 32 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 deleted file mode 100755 index b75f402d82..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - |