diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2016-08-30 16:18:01 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-03 09:58:27 +0100 |
| commit | 0190736ef89447b81ab9a95e83ec205c5c1f4618 (patch) | |
| tree | f2acfeabcf9eaafe5f3fe3bd0f2c18a555ff81bd /meta/recipes-multimedia | |
| parent | 6858df73073d32f6301b2302ae563670e32db134 (diff) | |
| download | openembedded-core-contrib-0190736ef89447b81ab9a95e83ec205c5c1f4618.tar.gz | |
gstreamer1.0: upgrade to 1.8.3
1.8.2 -> 1.8.3
Remove backported patch from 1.8.3:
0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
10 files changed, 18 insertions, 66 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.8.3.bb index 57e8785fdc..3d86221d22 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.8.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.8.3.bb @@ -14,7 +14,7 @@ SRC_URI = " \ file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ " -SRC_URI[md5sum] = "95bc3dd0ea2dc664b4f3a96897005013" -SRC_URI[sha256sum] = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a" +SRC_URI[md5sum] = "b51a736147bacb40f85827a4e0ae0d2c" +SRC_URI[sha256sum] = "9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc index 0fff612eee..aa3e8200f2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc @@ -11,7 +11,6 @@ inherit autotools pkgconfig gettext acpaths = "-I ${S}/common/m4 -I ${S}/m4" -PR = "r1" GSTREAMER_1_0_OMX_TARGET ?= "bellagio" GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch deleted file mode 100755 index 90bfba990c..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 43549773608b4f58dc664b7115a1ef0dcb32f251 Mon Sep 17 00:00:00 2001 -From: Haihua Hu <jared.hu@nxp.com> -Date: Tue, 14 Jun 2016 13:48:09 +0800 -Subject: [PATCH 1/2] [glplugin]gleffects: fix little rectangel appears at the - center when use squeeze and tunnel effects - -These two shader will calculate the verctor length and use it as denominator. -But length could be zero which will cause undefine behaviour. Add protection for -this condition - -Upstream-Status: Backport [1.8.3] - -https://bugzilla.gnome.org/show_bug.cgi?id=767635 - -Signed-off-by: Haihua Hu <jared.hu@nxp.com> ---- - ext/gl/effects/gstgleffectssources.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ext/gl/effects/gstgleffectssources.c b/ext/gl/effects/gstgleffectssources.c -index 6bdc155..3e87b8b 100644 ---- a/ext/gl/effects/gstgleffectssources.c -+++ b/ext/gl/effects/gstgleffectssources.c -@@ -100,7 +100,8 @@ const gchar *squeeze_fragment_source_gles2 = - "void main () {" - " vec2 texturecoord = v_texcoord.xy;" - " vec2 normcoord = texturecoord - 0.5;" -- " float r = length (normcoord);" -+ /* Add a very small value to length otherwise it could be 0 */ -+ " float r = length (normcoord)+0.01;" - " r = pow(r, 0.40)*1.3;" - " normcoord = normcoord / r;" - " texturecoord = (normcoord + 0.5);" -@@ -136,7 +137,8 @@ const gchar *tunnel_fragment_source_gles2 = - * rect textures */ - " normcoord = (texturecoord - 0.5);" - " float r = length(normcoord);" -- " normcoord *= clamp (r, 0.0, 0.275) / r;" -+ " if (r > 0.0)" -+ " normcoord *= clamp (r, 0.0, 0.275) / r;" - " texturecoord = normcoord + 0.5;" - " gl_FragColor = texture2D (tex, texturecoord);" - "}"; --- -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.3.bb index fb974a5eda..928d2d4313 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.3.bb @@ -17,11 +17,10 @@ SRC_URI = " \ file://0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch \ file://0005-glshader-add-glBindFragDataLocation.patch \ file://0006-glcolorconvert-GLES3-deprecates-texture2D-and-it-doe.patch \ - file://0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch \ file://0008-gl-implement-GstGLMemoryEGL.patch \ " -SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8" -SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97" +SRC_URI[md5sum] = "955281a43e98c5464563fa049e0a0911" +SRC_URI[sha256sum] = "7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b" S = "${WORKDIR}/gst-plugins-bad-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.8.3.bb index 3af6af24f4..986b5ac606 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.8.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.8.3.bb @@ -13,7 +13,7 @@ SRC_URI = " \ file://make-gio_unix_2_0-dependency-configurable.patch \ " -SRC_URI[md5sum] = "f55254ca18b845a9a7d8fe671bc09c24" -SRC_URI[sha256sum] = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d" +SRC_URI[md5sum] = "4d03dd81828ea6b98a44c8f1ab7f4976" +SRC_URI[sha256sum] = "114871d4d63606b4af424a8433cd923e4ff66896b244bb7ac97b9da47f71e79e" S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.8.3.bb index b1728db9a0..5cc6578b77 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.8.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.8.3.bb @@ -11,7 +11,7 @@ SRC_URI = " \ file://ensure-valid-sentinel-for-gst_structure_get.patch \ " -SRC_URI[md5sum] = "1ad652a98c2106f6d839dfba8d310d23" -SRC_URI[sha256sum] = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944" +SRC_URI[md5sum] = "473ebb1f15c67de99ddb6e4d027c0876" +SRC_URI[sha256sum] = "a1d6579ba203a7734927c24b90bf6590d846c5a5fcec01a48201018c8ad2827a" S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.8.3.bb index d313ef3e66..2745937961 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.8.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.8.3.bb @@ -7,7 +7,7 @@ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[md5sum] = "f781790cf64b44522b01ab560f16d4de" -SRC_URI[sha256sum] = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac" +SRC_URI[md5sum] = "4fc66c77253b0ad5ce224bda654b2e7d" +SRC_URI[sha256sum] = "6fa2599fdd072d31fbaf50c34af406e2be944a010b1f4eab67a5fe32a0310693" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.8.2.bb deleted file mode 100644 index 01abafb442..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.8.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -include gstreamer1.0-rtsp-server.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" - -SRC_URI[md5sum] = "193ae75a676f39294f64b162bbe2369d" -SRC_URI[sha256sum] = "7d414cd4302ae253821dcb22d483fadc9d21cf96b5fd4c0a33fd41960f8e0459" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.8.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.8.3.bb new file mode 100644 index 0000000000..17059d0703 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.8.3.bb @@ -0,0 +1,6 @@ +include gstreamer1.0-rtsp-server.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" + +SRC_URI[md5sum] = "e4b07b10dd65b6c26c9ca5f72e59297b" +SRC_URI[sha256sum] = "010f06800c1c957851d1352e5ec7a8ba3ce6a857fec1b8afc7d1a9e5f53288bf" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.3.bb index 98f2d1a345..d3561ebbde 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.3.bb @@ -7,7 +7,7 @@ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ " -SRC_URI[md5sum] = "0f011ee793cbcfa96d6b51d8271349fa" -SRC_URI[sha256sum] = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341" +SRC_URI[md5sum] = "e88dad542df9d986822e982105d2b530" +SRC_URI[sha256sum] = "66b37762d4fdcd63bce5a2bec57e055f92420e95037361609900278c0db7c53f" S = "${WORKDIR}/gstreamer-${PV}" |