summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2020-12-08 15:05:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-15 22:51:55 +0000
commitd54a590ffe7f9debb43ca2b9aa9141d08248d9c7 (patch)
treee7fd775d56d5cf516c35433eb392a38fcfcbbbdb /meta/recipes-multimedia
parentdf7bccf25496393ee58ec28afb00ad42d7abf70e (diff)
downloadpoky-d54a590ffe7f9debb43ca2b9aa9141d08248d9c7.tar.gz
gstreamer1.0: upgrade 1.18.1 -> 1.18.2
Drop patches as it as merged upstream: * gstreamer1.0: 0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch * gstreamer1.0-plugins-good: 0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch Update pacthes: * gstreamer1.0: 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch (From OE-Core rev: 44803c0ae61072cd64228f31cca6990dbd817b02) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb)3
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch51
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch34
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch18
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch16
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb)3
17 files changed, 69 insertions, 108 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb
index 2e09ef9c25..9fd9e0be93 100644
--- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
12 file://0001-connect-has-a-different-signature-on-musl.patch \ 12 file://0001-connect-has-a-different-signature-on-musl.patch \
13 " 13 "
14 14
15SRC_URI[sha256sum] = "712212babd2238233d55beecfc0fe1ea8db18e8807ac6ab05a64505b2c7ab0df" 15SRC_URI[sha256sum] = "6ea73d718bf1f9692218540ff88479c51d67c0b477fa56d6812fc7b739d30a56"
16 16
17DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" 17DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
18RRECOMMENDS_${PN} = "git" 18RRECOMMENDS_${PN} = "git"
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb
index 048b45a08f..54a4b5df15 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=http
9 file://gst-player.desktop \ 9 file://gst-player.desktop \
10 " 10 "
11 11
12SRCREV = "998ee69af18a5928759dbe17fffbceebbc8d72d0" 12SRCREV = "45086d8ef2d75244d9d5c8f69c0f0e1dfd4200b3"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb
index 38bbffafa4..b638814aa4 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
10 " 10 "
11 11
12SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" 12SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
13SRC_URI[sha256sum] = "39a717bc2613efbbba19df3cf5cacff0987471fc8281ba2c5dcdeaded79c2ed8" 13SRC_URI[sha256sum] = "36969ad44c5f0756a8a90215410710d6c39713d58f6cee13d663be9774557f49"
14 14
15S = "${WORKDIR}/gst-libav-${PV}" 15S = "${WORKDIR}/gst-libav-${PV}"
16 16
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb
index 513d66f9fc..686fcc2655 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
9 9
10SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" 10SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
11 11
12SRC_URI[sha256sum] = "42a8e0f9518b94655981ede441638f9f9395f4b1b9a4b329f068ee793975a965" 12SRC_URI[sha256sum] = "4c05d64544eecf4aaf5b337789916c67ed720317dfb2c8c8c335720fcc5c7cf4"
13 13
14S = "${WORKDIR}/gst-omx-${PV}" 14S = "${WORKDIR}/gst-omx-${PV}"
15 15
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb
index ebd8c5a27d..f70437ccd3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb
@@ -6,7 +6,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
6 file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ 6 file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \
7 file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ 7 file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
8 " 8 "
9SRC_URI[sha256sum] = "c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2" 9SRC_URI[sha256sum] = "8ad5822f1118fe46a19af54422b74e3a16d79a6800dcb173b49e199a496b341a"
10 10
11S = "${WORKDIR}/gst-plugins-bad-${PV}" 11S = "${WORKDIR}/gst-plugins-bad-${PV}"
12 12
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb
index 1b2bd4fe14..531d577b0c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
9 file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ 9 file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
10 file://0004-glimagesink-Downrank-to-marginal.patch \ 10 file://0004-glimagesink-Downrank-to-marginal.patch \
11 " 11 "
12SRC_URI[sha256sum] = "1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641" 12SRC_URI[sha256sum] = "dd04fb1f7826e2f6d9b4d66fc22f19cc6a47c301e13041f0ee3d7f65c89b05ac"
13 13
14S = "${WORKDIR}/gst-plugins-base-${PV}" 14S = "${WORKDIR}/gst-plugins-base-${PV}"
15 15
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
deleted file mode 100644
index 685ee08e50..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 3ec4fe5507a39383b161f1ab7687acb4a57c32f8 Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sun, 15 Nov 2020 11:30:07 +0000
4Subject: [PATCH] rpicamsrc: add vchostif library as it is required to build
5 successful
6
7fix: undefined reference to `vc_gencmd'
8/usr/src/debug/gstreamer1.0-plugins-good/1.18.1-r0/build/../gst-plugins-good-1.18.1/sys/rpicamsrc/RaspiCamControl.c:1440: undefined reference to `vc_gencmd'
9
10Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/818]
11
12Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
13---
14 sys/rpicamsrc/meson.build | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build
18index dc18a8345..48b2ceb66 100644
19--- a/sys/rpicamsrc/meson.build
20+++ b/sys/rpicamsrc/meson.build
21@@ -34,7 +34,7 @@ if not cc.has_header('bcm_host.h', args: rpi_inc_args)
22 endif
23
24 mmal_deps = []
25-foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host']
26+foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'vchostif', 'bcm_host']
27 l = cc.find_library(rpi_lib, dirs: rpi_lib_path, required: false)
28 if not l.found()
29 if get_option('rpicamsrc').enabled()
30--
312.29.2
32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb
index 77e1333ddc..2e076bf884 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb
@@ -2,10 +2,9 @@ require gstreamer1.0-plugins-common.inc
2 2
3SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ 3SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
4 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ 4 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
5 file://0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch \
6 " 5 "
7 6
8SRC_URI[sha256sum] = "e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c" 7SRC_URI[sha256sum] = "f71752dde434d9ec55fa5e8d2e2a3be3fc6eb5b34f397b065f84aead25b449a4"
9 8
10S = "${WORKDIR}/gst-plugins-good-${PV}" 9S = "${WORKDIR}/gst-plugins-good-${PV}"
11 10
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb
index 614ef8d740..e482aa10b2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb
@@ -9,7 +9,7 @@ LICENSE_FLAGS = "commercial"
9SRC_URI = " \ 9SRC_URI = " \
10 https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ 10 https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
11 " 11 "
12SRC_URI[sha256sum] = "18cd6cb829eb9611ca63cbcbf46aca0f0de1dd28b2df18caa2834326a75ff725" 12SRC_URI[sha256sum] = "a337a022ed472209b38cab5918dc2f4e7a6adc1f4afacd226a6345e5cb668bdb"
13 13
14S = "${WORKDIR}/gst-plugins-ugly-${PV}" 14S = "${WORKDIR}/gst-plugins-ugly-${PV}"
15 15
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb
index c0c5d271d0..5711744b4d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" 6LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
7 7
8SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" 8SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
9SRC_URI[sha256sum] = "42b289422f7ab32757670848cf2245c5a8a8b08a665a9cab65ded8d69364f6f6" 9SRC_URI[sha256sum] = "e19d0f760b353e88161b3712193cffbd79bf1314418da792b5fec4d8ecef389c"
10 10
11DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" 11DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
12RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" 12RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb
index 30534c9782..b680aa38d6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server"
10 10
11SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" 11SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
12 12
13SRC_URI[sha256sum] = "10a82865c3d199e66731017ca4b120bad071df9889e60cfe4dd6c49d953ef754" 13SRC_URI[sha256sum] = "973922aba65a1672a131527dee965fb09bab4bb996c351f0ee7f42f0d5b954e2"
14 14
15S = "${WORKDIR}/${PNREAL}-${PV}" 15S = "${WORKDIR}/${PNREAL}-${PV}"
16 16
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb
index acf5598a62..f237191d5f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
10 10
11SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" 11SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
12 12
13SRC_URI[sha256sum] = "400d3c42810b50b4566df03f37319a6bdd758f969560c40147e7d9a3b0e8a6ea" 13SRC_URI[sha256sum] = "8c7b2c74fda095d83dea67accde6a68ba9f608d97ed969fdcf278930f9b1c7c0"
14 14
15S = "${WORKDIR}/${REALPN}-${PV}" 15S = "${WORKDIR}/${REALPN}-${PV}"
16DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" 16DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
index 17f8a0beb7..fe58e718a7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
@@ -1,27 +1,41 @@
1From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001 1From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Thu, 25 Jan 2018 17:55:02 +0200 3Date: Sat, 10 Oct 2020 19:09:03 +0000
4Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall 4Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through
5 through to system plugin scanner 5 to system plugin scanner
6 6
7If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. 7If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
8 8
9Falling through to the one installed on the system is problamatic in cross-compilation 9Falling through to the one installed on the system is problamatic in cross-compilation
10environemnts, regardless of whether one pointed to by the env var succeeded or failed. 10environemnts, regardless of whether one pointed to by the env var succeeded or failed.
11 11
12written by: Alexander Kanavin <alex.kanavin@gmail.com> 12taken from:
13http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b
13 14
14Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669] 15Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669]
15Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> 16Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
16--- 17---
17 gst/gstpluginloader.c | 4 +--- 18 gst/gstpluginloader.c | 15 +++++++--------
18 1 file changed, 1 insertion(+), 3 deletions(-) 19 1 file changed, 7 insertions(+), 8 deletions(-)
19 20
20diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c 21diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
21index d1e404d..2e00c3c 100644 22index d1e404d98..c626bf263 100644
22--- a/gst/gstpluginloader.c 23--- a/gst/gstpluginloader.c
23+++ b/gst/gstpluginloader.c 24+++ b/gst/gstpluginloader.c
24@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) 25@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
26 if (loader->child_running)
27 return TRUE;
28
29- /* Find the gst-plugin-scanner: first try the env-var if it is set,
30- * otherwise use the installed version */
31+ /* Find the gst-plugin-scanner */
32 env = g_getenv ("GST_PLUGIN_SCANNER_1_0");
33 if (env == NULL)
34 env = g_getenv ("GST_PLUGIN_SCANNER");
35
36 if (env != NULL && *env != '\0') {
37+ /* use the env-var if it is set */
38 GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env);
25 helper_bin = g_strdup (env); 39 helper_bin = g_strdup (env);
26 res = gst_plugin_loader_try_helper (loader, helper_bin); 40 res = gst_plugin_loader_try_helper (loader, helper_bin);
27 g_free (helper_bin); 41 g_free (helper_bin);
@@ -29,9 +43,24 @@ index d1e404d..2e00c3c 100644
29- 43-
30- if (!res) { 44- if (!res) {
31+ } else { 45+ } else {
46+ /* use the installed version */
32 GST_LOG ("Trying installed plugin scanner"); 47 GST_LOG ("Trying installed plugin scanner");
33 48
34 #ifdef G_OS_WIN32 49 #ifdef G_OS_WIN32
50@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
51 #endif
52 res = gst_plugin_loader_try_helper (loader, helper_bin);
53 g_free (helper_bin);
54+ }
55
56- if (!res) {
57- GST_INFO ("No gst-plugin-scanner available, or not working");
58- }
59+ if (!res) {
60+ GST_INFO ("No gst-plugin-scanner available, or not working");
61 }
62
63 return loader->child_running;
35-- 64--
362.28.0 652.29.2
37 66
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch
deleted file mode 100644
index a2d215d72d..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 4449246a8d788e71dfe4679fba95955cec5894c1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 3 Nov 2020 22:58:26 -0800
4Subject: [PATCH] gst_private.h: increse padding in struct _GstClockEntryImpl
5
6When compiling for 32bit architectures with 64bit time_t e.g. riscv32,
7the static assert that the GstClockEntryImpl smaller or
8equal to the struct _GstClockEntryImpl triggered.
9(they were 12bytes off).
10
11To fix this, the padding is increased by 8 bytes (on 32bit).
12
13Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/694]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 gst/gst_private.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/gst/gst_private.h b/gst/gst_private.h
20index a8897e1..8252ede 100644
21--- a/gst/gst_private.h
22+++ b/gst/gst_private.h
23@@ -522,7 +522,7 @@ struct _GstClockEntryImpl
24 GstClockEntry entry;
25 GWeakRef clock;
26 GDestroyNotify destroy_entry;
27- gpointer padding[19]; /* padding for allowing e.g. systemclock
28+ gpointer padding[21]; /* padding for allowing e.g. systemclock
29 * to add data in lieu of overridable
30 * virtual functions on the clock */
31 };
32--
332.29.2
34
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
index c8bd58d471..96abef17b0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
@@ -1,7 +1,7 @@
1From 355dd938bfb2cd36d6c3c4ed59ba1dcafdc78d95 Mon Sep 17 00:00:00 2001 1From 598d108e2c438d8f2ecd3bf948fa3ebbd3681490 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> 2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Fri, 14 Aug 2020 16:38:26 +0100 3Date: Fri, 14 Aug 2020 16:38:26 +0100
4Subject: [PATCH 2/4] Remove unused valgrind detection 4Subject: [PATCH 2/3] Remove unused valgrind detection
5 5
6Having this just to log a debug message in case we're 6Having this just to log a debug message in case we're
7running inside valgrind doesn't seem very useful, and 7running inside valgrind doesn't seem very useful, and
@@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
19 3 files changed, 42 deletions(-) 19 3 files changed, 42 deletions(-)
20 20
21diff --git a/gst/gst_private.h b/gst/gst_private.h 21diff --git a/gst/gst_private.h b/gst/gst_private.h
22index 1b0f02b..a8897e1 100644 22index eefd044d9..8252ede51 100644
23--- a/gst/gst_private.h 23--- a/gst/gst_private.h
24+++ b/gst/gst_private.h 24+++ b/gst/gst_private.h
25@@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin 25@@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
@@ -32,10 +32,10 @@ index 1b0f02b..a8897e1 100644
32 G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); 32 G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void);
33 G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); 33 G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void);
34diff --git a/gst/gstinfo.c b/gst/gstinfo.c 34diff --git a/gst/gstinfo.c b/gst/gstinfo.c
35index 37987d3..15f522e 100644 35index 5d317877b..097f8b20d 100644
36--- a/gst/gstinfo.c 36--- a/gst/gstinfo.c
37+++ b/gst/gstinfo.c 37+++ b/gst/gstinfo.c
38@@ -304,36 +304,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; 38@@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT;
39 static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; 39 static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
40 static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; 40 static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
41 41
@@ -72,7 +72,7 @@ index 37987d3..15f522e 100644
72 static gchar * 72 static gchar *
73 _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token, 73 _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token,
74 guint val) 74 guint val)
75@@ -462,9 +432,6 @@ _priv_gst_debug_init (void) 75@@ -463,9 +433,6 @@ _priv_gst_debug_init (void)
76 _priv_GST_CAT_PROTECTION = 76 _priv_GST_CAT_PROTECTION =
77 _gst_debug_category_new ("GST_PROTECTION", 0, "protection"); 77 _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
78 78
@@ -82,7 +82,7 @@ index 37987d3..15f522e 100644
82 env = g_getenv ("GST_DEBUG_OPTIONS"); 82 env = g_getenv ("GST_DEBUG_OPTIONS");
83 if (env != NULL) { 83 if (env != NULL) {
84 if (strstr (env, "full_tags") || strstr (env, "full-tags")) 84 if (strstr (env, "full_tags") || strstr (env, "full-tags"))
85@@ -2502,12 +2469,6 @@ gst_debug_construct_win_color (guint colorinfo) 85@@ -2503,12 +2470,6 @@ gst_debug_construct_win_color (guint colorinfo)
86 return 0; 86 return 0;
87 } 87 }
88 88
@@ -96,7 +96,7 @@ index 37987d3..15f522e 100644
96 _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, 96 _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
97 const gchar * func, gint line, GObject * obj, const gchar * msg, 97 const gchar * func, gint line, GObject * obj, const gchar * msg,
98diff --git a/meson.build b/meson.build 98diff --git a/meson.build b/meson.build
99index f95b4f7..143c043 100644 99index ce1921aa4..7a84d0981 100644
100--- a/meson.build 100--- a/meson.build
101+++ b/meson.build 101+++ b/meson.build
102@@ -200,7 +200,6 @@ check_headers = [ 102@@ -200,7 +200,6 @@ check_headers = [
@@ -108,5 +108,5 @@ index f95b4f7..143c043 100644
108 'sys/uio.h', 108 'sys/uio.h',
109 ] 109 ]
110-- 110--
1112.28.0 1112.29.2
112 112
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch
index 1c0e1f8171..bf5e57249c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch
@@ -1,7 +1,7 @@
1From 24867db22a5cc35e7643bc218e959ce56c306aca Mon Sep 17 00:00:00 2001 1From cf8077a7e3ab0ae236ebde79b7fc0b02eac658de Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <crg7475@mailbox.org> 2From: Carlos Rafael Giani <crg7475@mailbox.org>
3Date: Fri, 25 Oct 2019 00:06:26 +0200 3Date: Fri, 25 Oct 2019 00:06:26 +0200
4Subject: [PATCH 3/4] meson: Add option for installed tests 4Subject: [PATCH 3/3] meson: Add option for installed tests
5 5
6This adds an option for producing installed versions of the unit tests. 6This adds an option for producing installed versions of the unit tests.
7These versions don't need meson to run (only a small shell script). This 7These versions don't need meson to run (only a small shell script). This
@@ -23,7 +23,7 @@ Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
23 23
24diff --git a/build-aux/gen-installed-test-desc.py b/build-aux/gen-installed-test-desc.py 24diff --git a/build-aux/gen-installed-test-desc.py b/build-aux/gen-installed-test-desc.py
25new file mode 100644 25new file mode 100644
26index 0000000..69e8a0f 26index 000000000..69e8a0faf
27--- /dev/null 27--- /dev/null
28+++ b/build-aux/gen-installed-test-desc.py 28+++ b/build-aux/gen-installed-test-desc.py
29@@ -0,0 +1,18 @@ 29@@ -0,0 +1,18 @@
@@ -47,7 +47,7 @@ index 0000000..69e8a0f
47+write_template(args.output, build_template(args.test_execdir, args.testname)) 47+write_template(args.output, build_template(args.test_execdir, args.testname))
48diff --git a/build-aux/gen-installed-test-shscript.py b/build-aux/gen-installed-test-shscript.py 48diff --git a/build-aux/gen-installed-test-shscript.py b/build-aux/gen-installed-test-shscript.py
49new file mode 100644 49new file mode 100644
50index 0000000..5da86fb 50index 000000000..5da86fb37
51--- /dev/null 51--- /dev/null
52+++ b/build-aux/gen-installed-test-shscript.py 52+++ b/build-aux/gen-installed-test-shscript.py
53@@ -0,0 +1,25 @@ 53@@ -0,0 +1,25 @@
@@ -77,7 +77,7 @@ index 0000000..5da86fb
77+write_template(args.output, build_template(args.test_execdir, args.testname)) 77+write_template(args.output, build_template(args.test_execdir, args.testname))
78+os.chmod(args.output, 0o755) 78+os.chmod(args.output, 0o755)
79diff --git a/meson_options.txt b/meson_options.txt 79diff --git a/meson_options.txt b/meson_options.txt
80index 72c3997..346c423 100644 80index 72c3997e2..346c423d4 100644
81--- a/meson_options.txt 81--- a/meson_options.txt
82+++ b/meson_options.txt 82+++ b/meson_options.txt
83@@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso 83@@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
@@ -90,7 +90,7 @@ index 72c3997..346c423 100644
90 # Feature options 90 # Feature options
91 option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') 91 option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
92diff --git a/tests/check/meson.build b/tests/check/meson.build 92diff --git a/tests/check/meson.build b/tests/check/meson.build
93index 372ea41..bb0dcfa 100644 93index a617cf159..e629131c5 100644
94--- a/tests/check/meson.build 94--- a/tests/check/meson.build
95+++ b/tests/check/meson.build 95+++ b/tests/check/meson.build
96@@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false) 96@@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false)
@@ -168,7 +168,7 @@ index 372ea41..bb0dcfa 100644
168 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') 168 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
169diff --git a/tests/files/testfile b/tests/files/testfile 169diff --git a/tests/files/testfile b/tests/files/testfile
170new file mode 100644 170new file mode 100644
171index 0000000..89954e0 171index 000000000..89954e0e2
172--- /dev/null 172--- /dev/null
173+++ b/tests/files/testfile 173+++ b/tests/files/testfile
174@@ -0,0 +1,80 @@ 174@@ -0,0 +1,80 @@
@@ -253,5 +253,5 @@ index 0000000..89954e0
253+................................................................................ 253+................................................................................
254+................................................................................ 254+................................................................................
255-- 255--
2562.28.0 2562.29.2
257 257
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb
index d55b2871e7..0fb0bcebc1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb
@@ -19,9 +19,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
19 file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ 19 file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
20 file://0002-Remove-unused-valgrind-detection.patch \ 20 file://0002-Remove-unused-valgrind-detection.patch \
21 file://0003-meson-Add-option-for-installed-tests.patch \ 21 file://0003-meson-Add-option-for-installed-tests.patch \
22 file://0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch \
23 " 22 "
24SRC_URI[sha256sum] = "79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba" 23SRC_URI[sha256sum] = "66cdeb4f970c2e55932a2f427177d438fe2c55c0b6d29e80fda80263f2ae5446"
25 24
26PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ 25PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
27 check \ 26 check \