summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2object-Also-add-videometa-if-there-is-padding-to.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.4.bb)8
3 files changed, 6 insertions, 39 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
index c542b13f0d..016e176707 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
@@ -37,7 +37,7 @@ RDEPENDS_gstreamer1.0-meta-base = "\
37 gstreamer1.0-plugins-base-videoscale \ 37 gstreamer1.0-plugins-base-videoscale \
38 gstreamer1.0-plugins-base-videoconvert \ 38 gstreamer1.0-plugins-base-videoconvert \
39 gstreamer1.0-plugins-good-autodetect \ 39 gstreamer1.0-plugins-good-autodetect \
40 gstreamer1.0-plugins-good-souphttpsrc" 40 gstreamer1.0-plugins-good-soup"
41 41
42RRECOMMENDS_gstreamer1.0-meta-x11-base = "\ 42RRECOMMENDS_gstreamer1.0-meta-x11-base = "\
43 gstreamer1.0-plugins-base-ximagesink \ 43 gstreamer1.0-plugins-base-ximagesink \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2object-Also-add-videometa-if-there-is-padding-to.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2object-Also-add-videometa-if-there-is-padding-to.patch
deleted file mode 100644
index 2a9a23e15d..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2object-Also-add-videometa-if-there-is-padding-to.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 22be02612adc757f6a43cefc6ee65ecaef68f0d9 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <dv@pseudoterminal.org>
3Date: Thu, 23 Mar 2017 22:13:05 +0100
4Subject: [PATCH] v4l2object: Also add videometa if there is padding to the
5 right and bottom
6
7https://bugzilla.gnome.org/show_bug.cgi?id=780478
8
9Upstream-Status: Backport [1.10.5]
10
11Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
12---
13 sys/v4l2/gstv4l2object.c | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
17index 91c8ff0..ed4654e 100644
18--- a/sys/v4l2/gstv4l2object.c
19+++ b/sys/v4l2/gstv4l2object.c
20@@ -3070,9 +3070,10 @@ store_info:
21 GST_DEBUG_OBJECT (v4l2object->element, "Got sizeimage %" G_GSIZE_FORMAT,
22 info->size);
23
24- /* to avoid copies we need video meta if top or left padding */
25+ /* to avoid copies we need video meta if there is padding */
26 v4l2object->need_video_meta =
27- ((align->padding_top + align->padding_left) != 0);
28+ ((align->padding_top + align->padding_left + align->padding_right +
29+ align->padding_bottom) != 0);
30
31 /* ... or if stride is non "standard" */
32 if (!standard_stride)
33--
342.7.4
35
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bb
index 57447bffba..3d38f007dc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bb
@@ -10,9 +10,11 @@ SRC_URI = " \
10 file://avoid-including-sys-poll.h-directly.patch \ 10 file://avoid-including-sys-poll.h-directly.patch \
11 file://ensure-valid-sentinel-for-gst_structure_get.patch \ 11 file://ensure-valid-sentinel-for-gst_structure_get.patch \
12 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 12 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
13 file://0001-v4l2object-Also-add-videometa-if-there-is-padding-to.patch \
14" 13"
15SRC_URI[md5sum] = "cc0cc13cdb07d4237600b6886b81f31d" 14SRC_URI[md5sum] = "20254217d9805484532e08ff1c3aa296"
16SRC_URI[sha256sum] = "8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e" 15SRC_URI[sha256sum] = "5591ee7208ab30289a30658a82b76bf87169c927572d9b794f3a41ed48e1ee96"
17 16
18S = "${WORKDIR}/gst-plugins-good-${PV}" 17S = "${WORKDIR}/gst-plugins-good-${PV}"
18
19RPROVIDES_${PN}-pulseaudio += "${PN}-pulse"
20RPROVIDES_${PN}-soup += "${PN}-souphttpsrc"