Skip to contentSkip to conversation

Updates the gstreamer to version 1.18.0

PATCH In review Jose Quaresma 3 participants 45 messages Oct 29, 2020 – Nov 1, 2020 5 messages not in the archive Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

v5 cover Updates the gstreamer to version 1.18.0

V2:
- Fixes the build of vulkan plugin
- Fixes pacth headers
- Upgrade orc 0.4.31 -> 0.4.32

V3:
- gstreamer1.0: Fix reproducibility issue around libcap
- gstreamer1.0-python: install append is not need any more
- gstreamer1.0-plugins-[good/bad]: disable new meson options
- gstreamer1.0-plugins-[base/good/bad]: add new meson option as PACKAGECONFIG
- Update pacth headers

V4:
- gstreamer1.0-plugins-good: on wayland qt5 needs qtwayland

V5:
- [PATCH v4 02] -> [PATCH v5 01] gstreamer1.0: Fix reproducibility issue around libcap
- [PATCH v4 01] -> [PATCH v5 02] gstreamer1.0: upgrade to version 1.18.0
- gstreamer1.0-libav: add comercial license flags as ffmpeg needs this

Jose Quaresma (22):
gstreamer1.0: Fix reproducibility issue around libcap gstreamer1.0: upgrade to version 1.18.0 gstreamer1.0-plugins-base: upgrade to version 1.18.0 gstreamer1.0-plugins-base: add new meson option as PACKAGECONFIG gstreamer1.0-plugins-good: upgrade to version 1.18.0 gstreamer1.0-plugins-good: disable new meson options gstreamer1.0-plugins-good: add new meson option as PACKAGECONFIG gstreamer1.0-plugins-bad: upgrade to version 1.18.0 gstreamer1.0-plugins-bad: disable new meson options gstreamer1.0-plugins-bad: add new meson options as PACKAGECONFIG gstreamer1.0-plugins-ugly: upgrade to version 1.18.0 gstreamer1.0-python: upgrade to version 1.18.0 gstreamer1.0-python: install append is not need any more gstreamer1.0-rtsp-server: upgrade to version 1.18.0 gstreamer1.0-vaapi: upgrade to version 1.18.0
gst-examples: upgrade to version 1.18.0
gstreamer1.0-omx: upgrade to version 1.18.0 gstreamer1.0-libav: upgrade to version 1.18.0
gst-devtools: add version 1.18.0 (gst-validate -> gst-devtools)
orc: Upgrade 0.4.31 -> 0.4.32
gstreamer1.0-plugins-good: on wayland qt5 needs qtwayland gstreamer1.0-libav: add comercial license flags as ffmpeg needs this

 .../orc/{orc_0.4.31.bb => orc_0.4.32.bb}      |   3 +-
 ...ct-has-a-different-signature-on-musl.patch |  10 +-
 .../gstreamer/gst-devtools_1.18.0.bb          |  43 ++++
 ...001-Make-player-examples-installable.patch |  24 +-
 ...mples_1.16.0.bb => gst-examples_1.18.0.bb} |   4 +-
 .../gstreamer/gst-validate_1.16.2.bb          |  25 --
 .../gstreamer/gstreamer1.0-libav_1.16.2.bb    |  35 ---
 .../gstreamer/gstreamer1.0-libav_1.18.0.bb    |  23 ++
 ...x_1.16.2.bb => gstreamer1.0-omx_1.18.0.bb} |   4 +-
 ...alized-warnings-when-compiling-with.patch} |   8 +-
 ...even-when-cross-compiling-if-introsp.patch |  36 ---
 ...avoid-including-sys-poll.h-directly.patch} |   8 +-
 ...sentinals-for-gst_structure_get-etc.patch} |  43 ++--
 ...ssing-opencv-data-dir-in-yocto-buil.patch} |   8 +-
 ....bb => gstreamer1.0-plugins-bad_1.18.0.bb} |  38 +--
 ...t-caps-from-src-pad-when-query-caps.patch} |  12 +-
 ...even-when-cross-compiling-if-introsp.patch |  36 ---
 ...02-meson-Add-variables-for-gir-files.patch | 235 ------------------
 ...arse-enhance-SSA-text-lines-parsing.patch} |  10 +-
 ...v-fb-Make-sure-config.h-is-included.patch} |   8 +-
 ...04-glimagesink-Downrank-to-marginal.patch} |   8 +-
 ...bb => gstreamer1.0-plugins-base_1.18.0.bb} |  32 +--
 ...defines-GLsync-to-fix-compile-on-som.patch |  70 ------
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |   8 +-
 ...bb => gstreamer1.0-plugins-good_1.18.0.bb} |  21 +-
 ...bb => gstreamer1.0-plugins-ugly_1.18.0.bb} |   5 +-
 ...son.build-fix-builds-with-python-3.8.patch |  24 --
 ....16.2.bb => gstreamer1.0-python_1.18.0.bb} |  24 +-
 ...even-when-cross-compiling-if-introsp.patch |  36 ---
 ....bb => gstreamer1.0-rtsp-server_1.18.0.bb} |   9 +-
 .../0001-vaapsink-downgrade-to-marginal.patch |  46 ----
 ...1.16.2.bb => gstreamer1.0-vaapi_1.18.0.bb} |  16 +-
 ...der.c-when-env-var-is-set-do-not-fal.patch |  16 +-
 ...002-Remove-unused-valgrind-detection.patch | 112 +++++++++
 ...even-when-cross-compiling-if-introsp.patch |  36 ---
 ...eson-Add-option-for-installed-tests.patch} |  20 +-
 .../0003-meson-Add-valgrind-feature.patch     |  74 ------
 .../gstreamer/gstreamer1.0/0004-capfix.patch  |  48 ++++
 .../gstreamer/gstreamer1.0/capfix.patch       |  37 ---
 ...er1.0_1.16.2.bb => gstreamer1.0_1.18.0.bb} |  29 +--
 40 files changed, 403 insertions(+), 881 deletions(-)
 rename meta/recipes-devtools/orc/{orc_0.4.31.bb => orc_0.4.32.bb} (86%)
 rename meta/recipes-multimedia/gstreamer/{gst-validate => gst-devtools}/0001-connect-has-a-different-signature-on-musl.patch (76%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-devtools_1.18.0.bb
 rename meta/recipes-multimedia/gstreamer/{gst-examples_1.16.0.bb => gst-examples_1.18.0.bb} (91%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.16.2.bb => gstreamer1.0-omx_1.18.0.bb} (92%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch => 0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch} (80%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{avoid-including-sys-poll.h-directly.patch => 0002-avoid-including-sys-poll.h-directly.patch} (79%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{ensure-valid-sentinels-for-gst_structure_get-etc.patch => 0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch} (69%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch => 0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch} (91%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.16.2.bb => gstreamer1.0-plugins-bad_1.18.0.bb} (85%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{get-caps-from-src-pad-when-query-caps.patch => 0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch} (81%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{0003-ssaparse-enhance-SSA-text-lines-parsing.patch => 0002-ssaparse-enhance-SSA-text-lines-parsing.patch} (98%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{0005-viv-fb-Make-sure-config.h-is-included.patch => 0003-viv-fb-Make-sure-config.h-is-included.patch} (80%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{0009-glimagesink-Downrank-to-marginal.patch => 0004-glimagesink-Downrank-to-marginal.patch} (85%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.16.2.bb => gstreamer1.0-plugins-base_1.18.0.bb} (78%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.2.bb => gstreamer1.0-plugins-good_1.18.0.bb} (81%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.16.2.bb => gstreamer1.0-plugins-ugly_1.18.0.bb} (89%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.16.2.bb => gstreamer1.0-python_1.18.0.bb} (50%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.16.2.bb => gstreamer1.0-rtsp-server_1.18.0.bb} (74%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.16.2.bb => gstreamer1.0-vaapi_1.18.0.bb} (82%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-meson-Add-option-for-installed-tests.patch => 0003-meson-Add-option-for-installed-tests.patch} (97%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-valgrind-feature.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-capfix.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.16.2.bb => gstreamer1.0_1.18.0.bb} (72%)
Signature · 1 line
2.29.1
#1 lore raw

PATCH v5 1/22 gstreamer1.0: Fix reproducibility issue around libcap

Currently gstreamer configuration depends libcap and on whether setcap is found on the host system.

Removing libcap from DEPENDS and only use it when the 'setcap' is enabled.

* capfix.patch
Removed as the same goals can be achieved only with the PACKAGECONFIG 'setcap'

---
 .../gstreamer/gstreamer1.0/capfix.patch       | 37 -------------------
 .../gstreamer/gstreamer1.0_1.16.2.bb          |  5 +--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch deleted +0 -37
deleted file mode 100644
index 7ca3d5ad4a..0000000000
@@ -1,37 +0,0 @@
-Currently gstreamer configuration depends on whether setcap is found on the host
-system. Turn this into a configure option to make builds deterinistic.
-
-RP 2020/2/19
-Signed-off-by: Richard Purdie <[email protected]>
-Upstream-Status: Pending
-
-Index: gstreamer-1.16.1/libs/gst/helpers/meson.build
-===================================================================
---- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build
-+++ gstreamer-1.16.1/libs/gst/helpers/meson.build
-@@ -73,7 +73,12 @@ if have_ptp
-     endif
-   endif
- 
--  setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
-+  setcap_feature = get_option('setcap')
-+  if setcap_feature.disabled()
-+    setcap = find_program('dontexist', required : false)
-+  else
-+    setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
-+  endif
- 
-   # user/group to change to in gst-ptp-helper
-   ptp_helper_setuid_user = get_option('ptp-helper-setuid-user')
-Index: gstreamer-1.16.1/meson_options.txt
-===================================================================
---- gstreamer-1.16.1.orig/meson_options.txt
-+++ gstreamer-1.16.1/meson_options.txt
-@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va
- option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind')
- option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces')
- option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
-+option('setcap', type : 'feature', value : 'auto', description : 'Use setcap')
- 
- # Common feature options
- option('examples', type : 'feature', value : 'auto', yield : true)
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb +2 -3
index 50a872e292..9d92fe1439 100644
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
 SECTION = "multimedia"
 LICENSE = "LGPLv2+"
 
-DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
+DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"
 
 inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
 
@@ -21,7 +21,6 @@ SRC_URI = " \
     file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
     file://0003-meson-Add-valgrind-feature.patch \
     file://0004-meson-Add-option-for-installed-tests.patch \
-    file://capfix.patch \
 "
 SRC_URI[md5sum] = "0e661ed5bdf1d8996e430228d022628e"
 SRC_URI[sha256sum] = "e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e"
@@ -40,7 +39,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
 PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled"
-PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap libcap-native"
+PACKAGECONFIG[setcap] = ",,libcap libcap-native"
 
 # TODO: put this in a gettext.bbclass patch
 def gettext_oemeson(d):
Signature · 1 line
2.29.1
#2 lore raw

Re: [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap

Quoted 34 lines · Jose Quaresma

Currently gstreamer configuration depends libcap and on whether setcap is found on the host system.

Removing libcap from DEPENDS and only use it when the 'setcap' is enabled.

* capfix.patch
Removed as the same goals can be achieved only with the PACKAGECONFIG 'setcap'

---
 .../gstreamer/gstreamer1.0/capfix.patch       | 37 -------------------
 .../gstreamer/gstreamer1.0_1.16.2.bb          |  5 +--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch deleted +0 -13
deleted file mode 100644
index 7ca3d5ad4a..0000000000
@@ -1,37 +0,0 @@
-Currently gstreamer configuration depends on whether setcap is found on the host
-system. Turn this into a configure option to make builds deterinistic.
-
-RP 2020/2/19
-Signed-off-by: Richard Purdie <[email protected]>
-Upstream-Status: Pending
-
-Index: gstreamer-1.16.1/libs/gst/helpers/meson.build
-===================================================================
---- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build
-+++ gstreamer-1.16.1/libs/gst/helpers/meson.build
-@@ -73,7 +73,12 @@ if have_ptp
-     endif

meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch line 23

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch deleted +0 -10
-   endif
- 
--  setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
-+  setcap_feature = get_option('setcap')
-+  if setcap_feature.disabled()
-+    setcap = find_program('dontexist', required : false)
-+  else
-+    setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
-+  endif
-

I did have a question about this. I think the problem this patch was fixing was that <PATH>/setcap was being coded into the headers and hence the output regardless of whether setcap was enabled or disabled. Since its looking directly at /usr/sbin/ and /sbin/, this made it depend on the host system it was built on.

Are you saying that is no longer encoded in the output?

Cheers,

Richard

#3 lore raw

Re: [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap

It looks for setcap in /usr/sbin and /sbin but needs libcap as wheel. when we have libcaps on DEPENDS as with version 1.16 and the host system has setcap binary, it introduces a dependency on the host system.
The patch fixes this situation.

But libcap is only needed if we need to use the setcap
So remove libcap from DEPENDS will fail to use 'ptp-helper-permissions=capabilities' even if setcap is found on the host.

In my opinion this a better description can be used in this PACKAGECONFIG, something like this:

-PACKAGECONFIG[setcap] = ",,libcap libcap-native" +PACKAGECONFIG[capabilities] = "-Dptp-helper-permissions=capabilities,,libcap libcap-native"

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 15:32:

Quoted 59 lines · Jose Quaresma
Quoted 34 lines

Currently gstreamer configuration depends libcap and on whether setcap is found on the host system.

Removing libcap from DEPENDS and only use it when the 'setcap' is enabled.

* capfix.patch
Removed as the same goals can be achieved only with the PACKAGECONFIG 'setcap'

---
 .../gstreamer/gstreamer1.0/capfix.patch       | 37 -------------------
 .../gstreamer/gstreamer1.0_1.16.2.bb          |  5 +--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch deleted +0 -13
deleted file mode 100644
index 7ca3d5ad4a..0000000000
@@ -1,37 +0,0 @@
-Currently gstreamer configuration depends on whether setcap is found on the host
-system. Turn this into a configure option to make builds deterinistic.
-
-RP 2020/2/19
-Signed-off-by: Richard Purdie <[email protected]>
-Upstream-Status: Pending
-
-Index: gstreamer-1.16.1/libs/gst/helpers/meson.build
-===================================================================
---- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build
-+++ gstreamer-1.16.1/libs/gst/helpers/meson.build
-@@ -73,7 +73,12 @@ if have_ptp
-     endif

meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch line 23

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch deleted +0 -10
-   endif
-
--  setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
-+  setcap_feature = get_option('setcap')
-+  if setcap_feature.disabled()
-+    setcap = find_program('dontexist', required : false)
-+  else
-+    setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
-+  endif
-

I did have a question about this. I think the problem this patch was fixing was that <PATH>/setcap was being coded into the headers and hence the output regardless of whether setcap was enabled or disabled. Since its looking directly at /usr/sbin/ and /sbin/, this made it depend on the host system it was built on.

Are you saying that is no longer encoded in the output?

Cheers,

Richard

Signature · 2 lines
best regards,
José Quaresma
#4 lore raw

Re: [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap

Quoted 16 lines · Jose Quaresma

It looks for setcap in /usr/sbin and /sbin but needs libcap as wheel. when we have libcaps on DEPENDS as with version 1.16 and the host system has setcap binary, it introduces a dependency on the host system.
The patch fixes this situation.

But libcap is only needed if we need to use the setcap
So remove libcap from DEPENDS will fail to use 'ptp-helper-permissions=capabilities' even if setcap is found on the host.

In my opinion this a better description can be used in this PACKAGECONFIG, something like this:

(quoted diff) +1 -1
-PACKAGECONFIG[setcap] = ",,libcap libcap-native"
+PACKAGECONFIG[capabilities] =
Quoted 1 line

"-Dptp-helper-permissions=capabilities,,libcap libcap-native"

So you're saying that as long as setcap isn't in DEPENDS, we're ok? That means your patchset as it stands should be ok?

If the user enables capabilities, it won't find setcap from libcap- native though will it? That is a potential problem even if its not the default?

Cheers,

Richard

#5 lore raw

Re: [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap

I will need to rebuild and check if when setcap is enabled it will pick setcap from host on from libcap-
native.

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:43:

Quoted 31 lines · Jose Quaresma
Quoted 16 lines

It looks for setcap in /usr/sbin and /sbin but needs libcap as wheel. when we have libcaps on DEPENDS as with version 1.16 and the host system has setcap binary, it introduces a dependency on the host system.
The patch fixes this situation.

But libcap is only needed if we need to use the setcap
So remove libcap from DEPENDS will fail to use 'ptp-helper-permissions=capabilities' even if setcap is found on the host.

In my opinion this a better description can be used in this PACKAGECONFIG, something like this:

(quoted diff) +1 -1
-PACKAGECONFIG[setcap] = ",,libcap libcap-native"
+PACKAGECONFIG[capabilities] =
Quoted 1 line

"-Dptp-helper-permissions=capabilities,,libcap libcap-native"

So you're saying that as long as setcap isn't in DEPENDS, we're ok? That means your patchset as it stands should be ok?

If the user enables capabilities, it won't find setcap from libcap- native though will it? That is a potential problem even if its not the default?

Cheers,

Richard

Signature · 2 lines
best regards,
José Quaresma

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

Re: [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:58:

Quoted 28 lines

I will need to rebuild and check if when setcap is enabled it will pick setcap from host on from libcap-
native.

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:43:

Quoted 21 lines · Jose Quaresma
Quoted 16 lines

It looks for setcap in /usr/sbin and /sbin but needs libcap as wheel. when we have libcaps on DEPENDS as with version 1.16 and the host system has setcap binary, it introduces a dependency on the host system.
The patch fixes this situation.

But libcap is only needed if we need to use the setcap
So remove libcap from DEPENDS will fail to use 'ptp-helper-permissions=capabilities' even if setcap is found on the host.

In my opinion this a better description can be used in this PACKAGECONFIG, something like this:

(quoted diff) +1 -1
-PACKAGECONFIG[setcap] = ",,libcap libcap-native"
+PACKAGECONFIG[capabilities] =
Quoted 1 line

"-Dptp-helper-permissions=capabilities,,libcap libcap-native"

So you're saying that as long as setcap isn't in DEPENDS, we're ok?

Yes it's correct.

Quoted 1 line
Quoted 1 line

That means your patchset as it stands should be ok?

Yes it's correct.

Quoted 4 lines
Quoted 4 lines

If the user enables capabilities, it won't find setcap from libcap- native though will it? That is a potential problem even if its not the default?

Yes it find the setcap on recipe-sysroot-native

The help of messon find_program said that it will find the program in the first arg
and fallback to the other if the last one fails. In this case it first find setcap on the PATH
setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
https://mesonbuild.com/Reference-manual.html#find_program

I made a little change on the souce to check this:

+++ b/libs/gst/helpers/meson.build
@@ -67,6 +67,7 @@ if have_ptp
endif

setcap_prog = find_program('setcap', '/usr/sbin/setcap',
'/sbin/setcap', required : false)
+ message('setcap_prog: ' + setcap_prog.full_path()) cap_dep = dependency('libcap', required: false)

  # user/group to change to in gst-ptp-helper

This give me:

# with PACKAGECONFIG_append = "setcap"
bitbake  gstreamer1.0 -c configure -v -f | grep setcap_prog
Message: setcap_prog:
/work/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/gstreamer1.0/1.18.0-r0/recipe-sysroot-native/usr/sbin/setcap
# with PACKAGECONFIG_remove = "setcap"
bitbake  gstreamer1.0 -c configure -v -f | grep setcap_prog
Message: setcap_prog: /sbin/setcap
Quoted 13 lines
Quoted 5 lines

Cheers,

Richard

--
best regards,
José Quaresma

Signature · 2 lines
best regards,
José Quaresma
#8 lore raw

Re: [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap

Quoted 79 lines · Jose Quaresma

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:58:

Quoted 4 lines

I will need to rebuild and check if when setcap is enabled it will pick setcap from host on from libcap-
native.

Quoted 27 lines

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:43:

Quoted 25 lines · Jose Quaresma
Quoted 20 lines

It looks for setcap in /usr/sbin and /sbin but needs libcap as wheel.
when we have libcaps on DEPENDS as with version 1.16 and the host
system has setcap binary, it introduces a dependency on the host
system.
The patch fixes this situation.

But libcap is only needed if we need to use the setcap So remove libcap from DEPENDS will fail to use 'ptp-helper-permissions=capabilities' even if setcap is found on the
host.

In my opinion this a better description can be used in this PACKAGECONFIG, something like this:

(quoted diff) +1 -1
-PACKAGECONFIG[setcap] = ",,libcap libcap-native"
+PACKAGECONFIG[capabilities] =
Quoted 1 line

"-Dptp-helper-permissions=capabilities,,libcap libcap-native"

So you're saying that as long as setcap isn't in DEPENDS, we're ok?

Yes it's correct.

Quoted 1 line
Quoted 1 line

That means your patchset as it stands should be ok?

Yes it's correct.

Quoted 5 lines
Quoted 5 lines

If the user enables capabilities, it won't find setcap from libcap-
native though will it? That is a potential problem even if its not the
default?

Yes it find the setcap on recipe-sysroot-native

The help of messon find_program said that it will find the program in the first arg
and fallback to the other if the last one fails. In this case it first
find setcap on the PATH
setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
https://mesonbuild.com/Reference-manual.html#find_program

I made a little change on the souce to check this:

+++ b/libs/gst/helpers/meson.build

(quoted diff) +1 -0
@@ -67,6 +67,7 @@ if have_ptp
  endif
 
  setcap_prog = find_program('setcap', '/usr/sbin/setcap',
 '/sbin/setcap', required : false)
+  message('setcap_prog: ' + setcap_prog.full_path())
  cap_dep = dependency('libcap', required: false)
 
  # user/group to change to in gst-ptp-helper

This give me:

# with PACKAGECONFIG_append = "setcap"
bitbake  gstreamer1.0 -c configure -v -f | grep setcap_prog
Message: setcap_prog:
/work/build/tmp/work/armv7vet2hf-neon-poky-linux-
gnueabi/gstreamer1.0/1.18.0-r0/recipe-sysroot-native/usr/sbin/setcap
Quoted 3 lines
# with PACKAGECONFIG_remove = "setcap"
bitbake  gstreamer1.0 -c configure -v -f | grep setcap_prog
Message: setcap_prog: /sbin/setcap

Thanks for confirming that, sounds like the patch is indeed no longer needed. I was worried it wouldn't behave like that.

Cheers,

Richard

#9 lore raw

PATCH v5 2/22 gstreamer1.0: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch Submited
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669

* 0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch Removed since these are included in 1.18.0

* 0003-meson-Add-valgrind-feature.patch
Removed because upstream don't depend anymore on valgrind
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595

* 0002-Remove-unused-valgrind-detection.patch
Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/a2cbf75523cdf8a4df1baa7007d86ef455972245

API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc.
Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch.

---
 ...der.c-when-env-var-is-set-do-not-fal.patch |  16 +--
 ...002-Remove-unused-valgrind-detection.patch | 112 ++++++++++++++++++
 ...even-when-cross-compiling-if-introsp.patch |  36 ------
 ...eson-Add-option-for-installed-tests.patch} |  20 ++--
 .../0003-meson-Add-valgrind-feature.patch     |  74 ------------
 .../gstreamer/gstreamer1.0/0004-capfix.patch  |  48 ++++++++
 ...er1.0_1.16.2.bb => gstreamer1.0_1.18.0.bb} |  24 ++--
 7 files changed, 188 insertions(+), 142 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-meson-Add-option-for-installed-tests.patch => 0003-meson-Add-option-for-installed-tests.patch} (97%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-valgrind-feature.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-capfix.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.16.2.bb => gstreamer1.0_1.18.0.bb} (78%)
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch +9 -7
index 67a872cddb..17f8a0beb7 100644
@@ -1,7 +1,7 @@
-From a1d7c582392c8bc87fa9411af77b20e011944357 Mon Sep 17 00:00:00 2001
+From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 25 Jan 2018 17:55:02 +0200
-Subject: [PATCH] gst/gstpluginloader.c: when env var is set do not fall
+Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall
  through to system plugin scanner
 
 If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
@@ -9,17 +9,19 @@ If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that
 Falling through to the one installed on the system is problamatic in cross-compilation
 environemnts, regardless of whether one pointed to by the env var succeeded or failed.
 
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
+written by: Alexander Kanavin <[email protected]>
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669]
+Signed-off-by: Jose Quaresma <[email protected]>
 ---
  gst/gstpluginloader.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
-index 430829d..3a75731 100644
+index d1e404d..2e00c3c 100644
 --- a/gst/gstpluginloader.c
 +++ b/gst/gstpluginloader.c
-@@ -471,9 +471,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
+@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
      helper_bin = g_strdup (env);
      res = gst_plugin_loader_try_helper (loader, helper_bin);
      g_free (helper_bin);
@@ -31,5 +33,5 @@ index 430829d..3a75731 100644
  
  #ifdef G_OS_WIN32
 -- 
-2.15.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch new file +112 -0

112 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted +0 -36
deleted file mode 100644
index 1ed7198a5c..0000000000
@@ -1,36 +0,0 @@
-From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Thu, 17 Oct 2019 12:13:35 +0100
-Subject: [PATCH] meson: build gir even when cross-compiling if introspection
- was enabled explicitly
-
-This can be made to work in certain circumstances when
-cross-compiling, so default to not building g-i stuff
-when cross-compiling, but allow it if introspection was
-enabled explicitly via -Dintrospection=enabled.
-
-Fixes #454 and #381.
-
-Upstream-Status: Backport [35db4a2433fbdf8612cf98b5aab5b14aeb5372f8]
-
-Signed-off-by: Carlos Rafael Giani <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 90d98d8eb..a47e7f34e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -466,7 +466,7 @@ rt_lib = cc.find_library('rt', required : false)
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
- 
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
- 
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
--- 
-2.17.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-meson-Add-option-for-installed-tests.patch +10 -10
similarity index 97%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-meson-Add-option-for-installed-tests.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch
index 0e6c44ea32..1c0e1f8171 100644
@@ -1,7 +1,7 @@
-From b843400284751968862751dfe93853f151551c64 Mon Sep 17 00:00:00 2001
+From 24867db22a5cc35e7643bc218e959ce56c306aca Mon Sep 17 00:00:00 2001
 From: Carlos Rafael Giani <[email protected]>
 Date: Fri, 25 Oct 2019 00:06:26 +0200
-Subject: [PATCH] meson: Add option for installed tests
+Subject: [PATCH 3/4] meson: Add option for installed tests
 
 This adds an option for producing installed versions of the unit tests.
 These versions don't need meson to run (only a small shell script). This
@@ -77,10 +77,10 @@ index 0000000..5da86fb
 +write_template(args.output, build_template(args.test_execdir, args.testname))
 +os.chmod(args.output, 0o755)
 diff --git a/meson_options.txt b/meson_options.txt
-index 8afde39..8884dcc 100644
+index 72c3997..346c423 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -16,6 +16,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
+@@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
  option('memory-alignment', type: 'combo',
         choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],
         value: 'malloc')
@@ -90,10 +90,10 @@ index 8afde39..8884dcc 100644
  # Feature options
  option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 04da83f..2db7f76 100644
+index 372ea41..bb0dcfa 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -118,11 +118,17 @@ if add_languages('cpp', required : false)
+@@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false)
    ]
  endif
  
@@ -109,10 +109,10 @@ index 04da83f..2db7f76 100644
    '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
 -  '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
 +  '-DTESTFILE="@0@"'.format(test_files_path + '/testfile'),
-   '-DGST_USE_UNSTABLE_API',
    '-DGST_DISABLE_DEPRECATED',
  ]
-@@ -137,6 +143,14 @@ endif
+ 
+@@ -138,6 +144,14 @@ endif
  glib_deps = [gio_dep, gobject_dep, gmodule_dep, glib_dep]
  gst_deps = [gst_dep, gst_base_dep, gst_check_dep, gst_net_dep, gst_controller_dep]
  
@@ -127,7 +127,7 @@ index 04da83f..2db7f76 100644
  foreach t : core_tests
    fname = t[0]
    test_name = fname.split('.')[0].underscorify()
-@@ -150,8 +164,38 @@ foreach t : core_tests
+@@ -151,8 +165,38 @@ foreach t : core_tests
          include_directories : [configinc],
          link_with : link_with_libs,
          dependencies : test_deps + glib_deps + gst_deps,
@@ -253,5 +253,5 @@ index 0000000..89954e0
 +................................................................................
 +................................................................................
 -- 
-2.17.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-valgrind-feature.patch deleted +0 -74

74 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-capfix.patch new file +48 -0

48 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb +9 -15
similarity index 78%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.bb
index 9d92fe1439..d382655bcb 100644
@@ -8,22 +8,20 @@ LICENSE = "LGPLv2+"
 
 DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"
 
-inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
+inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
 S = "${WORKDIR}/gstreamer-${PV}"
 
-SRC_URI = " \
-    https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-    file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
-    file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
-    file://0003-meson-Add-valgrind-feature.patch \
-    file://0004-meson-Add-option-for-installed-tests.patch \
-"
-SRC_URI[md5sum] = "0e661ed5bdf1d8996e430228d022628e"
-SRC_URI[sha256sum] = "e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
+           file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
+           file://0002-Remove-unused-valgrind-detection.patch \
+           file://0003-meson-Add-option-for-installed-tests.patch \
+           "
+SRC_URI[md5sum] = "25d683630ff8b82b2c878aa3edd3c491"
+SRC_URI[sha256sum] = "0ff09245b06c0aeb5d9a156edcab088a7e8213a0bf9c84a1ff0318f9c00c7805"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    check \
@@ -34,7 +32,6 @@ PACKAGECONFIG[debug] = "-Dgst_debug=true,-Dgst_debug=false"
 PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false"
 PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
 PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
-PACKAGECONFIG[valgrind] = "-Dvalgrind=enabled,-Dvalgrind=disabled,valgrind,"
 PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
@@ -51,15 +48,12 @@ def gettext_oemeson(d):
     return '-Dnls=enabled'
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Dexamples=disabled \
     -Ddbghelp=disabled \
     ${@gettext_oemeson(d)} \
 "
 
-GTKDOC_MESON_OPTION = "gtk_doc"
-GTKDOC_MESON_ENABLE_FLAG = "enabled"
-GTKDOC_MESON_DISABLE_FLAG = "disabled"
-
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
 
Signature · 1 line
2.29.1
#10 lore raw

PATCH v5 3/22 gstreamer1.0-plugins-base: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
* 0002-meson-Add-variables-for-gir-files.patch
Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more.

API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc.
Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch.

---
 ...t-caps-from-src-pad-when-query-caps.patch} |  12 +-
 ...even-when-cross-compiling-if-introsp.patch |  36 ---
 ...02-meson-Add-variables-for-gir-files.patch | 235 ------------------
 ...arse-enhance-SSA-text-lines-parsing.patch} |  10 +-
 ...v-fb-Make-sure-config.h-is-included.patch} |   8 +-
 ...04-glimagesink-Downrank-to-marginal.patch} |   8 +-
 ...bb => gstreamer1.0-plugins-base_1.18.0.bb} |  31 +--
 7 files changed, 33 insertions(+), 307 deletions(-)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{get-caps-from-src-pad-when-query-caps.patch => 0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch} (81%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{0003-ssaparse-enhance-SSA-text-lines-parsing.patch => 0002-ssaparse-enhance-SSA-text-lines-parsing.patch} (98%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{0005-viv-fb-Make-sure-config.h-is-included.patch => 0003-viv-fb-Make-sure-config.h-is-included.patch} (80%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/{0009-glimagesink-Downrank-to-marginal.patch => 0004-glimagesink-Downrank-to-marginal.patch} (85%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.16.2.bb => gstreamer1.0-plugins-base_1.18.0.bb} (78%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch +7 -5
similarity index 81%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch
index a4727e23ea..d5d9838372 100644
@@ -1,14 +1,13 @@
-From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001
+From f9d48cd85ee68207733b1b91a00453462c33524a Mon Sep 17 00:00:00 2001
 From: zhouming <[email protected]>
 Date: Wed, 14 May 2014 10:16:20 +0800
-Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
+Subject: [PATCH 1/4] ENGR00312515: get caps from src pad when query caps
 
 https://bugzilla.gnome.org/show_bug.cgi?id=728312
 
 Upstream-Status: Pending
 
 Signed-off-by: zhouming <[email protected]>
-
 ---
  gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
@@ -17,10 +16,10 @@ Signed-off-by: zhouming <[email protected]>
 diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
 old mode 100644
 new mode 100755
-index 8a127c8..71c5d78
+index f545857..62d10ef
 --- a/gst-libs/gst/tag/gsttagdemux.c
 +++ b/gst-libs/gst/tag/gsttagdemux.c
-@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
+@@ -1777,6 +1777,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
        }
        break;
      }
@@ -40,3 +39,6 @@ index 8a127c8..71c5d78
      default:
        res = gst_pad_query_default (pad, parent, query);
        break;
+-- 
+2.28.0
+
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted +0 -36
deleted file mode 100644
index 49ab471414..0000000000
@@ -1,36 +0,0 @@
-From 30672ba7d134553e59935ddc875104adba26f25c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Thu, 17 Oct 2019 20:06:24 +0100
-Subject: [PATCH] meson: build gir even when cross-compiling if introspection
- was enabled explicitly
-
-This can be made to work in certain circumstances when
-cross-compiling, so default to not building g-i stuff
-when cross-compiling, but allow it if introspection was
-enabled explicitly via -Dintrospection=enabled.
-
-See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
-
-Upstream-Status: Backport [30672ba7d134553e59935ddc875104adba26f25c]
-
-Signed-off-by: Carlos Rafael Giani <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 264d84c9e..c8147c224 100644
---- a/meson.build
-+++ b/meson.build
-@@ -372,7 +372,7 @@ endif
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
-     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
--- 
-2.17.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch deleted +0 -235

235 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch +6 -4
similarity index 98%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch
index 9e95524057..e453a500c9 100644
@@ -1,7 +1,7 @@
-From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001
+From f587861bbe12ad0b10370f835592746aafedbf56 Mon Sep 17 00:00:00 2001
 From: Mingke Wang <[email protected]>
 Date: Thu, 19 Mar 2015 14:17:10 +0800
-Subject: [PATCH] ssaparse: enhance SSA text lines parsing.
+Subject: [PATCH 2/4] ssaparse: enhance SSA text lines parsing.
 
 some parser will pass in the original ssa text line which starts with "Dialog:"
 and there's are maybe multiple Dialog lines in one input buffer.
@@ -9,9 +9,8 @@ and there's are maybe multiple Dialog lines in one input buffer.
 Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496]
 
 Signed-off-by: Mingke Wang <[email protected]>
-
 ---
- gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++-----
+ gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++----
  1 file changed, 134 insertions(+), 16 deletions(-)
  mode change 100644 => 100755 gst/subparse/gstssaparse.c
 
@@ -225,3 +224,6 @@ index c849c08..4b9636c
  
    if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) {
      GstSegment segment;
+-- 
+2.28.0
+
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch +4 -4
similarity index 80%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
index 6e53d2e8b5..2af83ff8b9 100644
@@ -1,7 +1,7 @@
-From bec38a0c2e2958927c42b2f9ae939969b7c4a326 Mon Sep 17 00:00:00 2001
+From 153f3b83a3fed77785bd1420bed8bbafa2d791b3 Mon Sep 17 00:00:00 2001
 From: Carlos Rafael Giani <[email protected]>
 Date: Tue, 21 May 2019 14:01:11 +0200
-Subject: [PATCH] viv-fb: Make sure config.h is included
+Subject: [PATCH 3/4] viv-fb: Make sure config.h is included
 
 This prevents build errors due to missing GST_API_* symbols
 
@@ -13,7 +13,7 @@ Signed-off-by: Carlos Rafael Giani <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h
-index 05e1f6229..96ce5e685 100644
+index 05e1f62..96ce5e6 100644
 --- a/gst-libs/gst/gl/gl-prelude.h
 +++ b/gst-libs/gst/gl/gl-prelude.h
 @@ -22,6 +22,10 @@
@@ -28,5 +28,5 @@ index 05e1f6229..96ce5e685 100644
  
  #ifdef BUILDING_GST_GL
 -- 
-2.17.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch +4 -4
similarity index 85%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch
index e8094f459e..f45ea65ef3 100644
@@ -1,7 +1,7 @@
-From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
+From 79841a02ee754eba736cb32aaf2ed2b2fc0483d4 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 24 Sep 2015 19:47:32 +0300
-Subject: [PATCH] glimagesink: Downrank to marginal
+Subject: [PATCH 4/4] glimagesink: Downrank to marginal
 
 On desktop, where there is good OpenGL, xvimagesink will come up first,
 on other platforms, OpenGL can't be trusted because it's either software (like
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
-index a4b2540..0ccaacd 100644
+index 302e845..463be9c 100644
 --- a/ext/gl/gstopengl.c
 +++ b/ext/gl/gstopengl.c
 @@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin)
@@ -28,5 +28,5 @@ index a4b2540..0ccaacd 100644
    }
  
 -- 
-2.1.4
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb +12 -19
similarity index 78%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.bb
index 6563b6f738..7fe5a480d4 100644
@@ -1,26 +1,22 @@
 require gstreamer1.0-plugins-common.inc
 
 LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
-                    file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
-
-SRC_URI = " \
-            https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
-            file://get-caps-from-src-pad-when-query-caps.patch \
-            file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
-            file://0002-meson-Add-variables-for-gir-files.patch \
-            file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
-            file://0005-viv-fb-Make-sure-config.h-is-included.patch \
-            file://0009-glimagesink-Downrank-to-marginal.patch \
-            "
-SRC_URI[md5sum] = "3fdb32823535799a748c1fc14f978e2c"
-SRC_URI[sha256sum] = "b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
+
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
+           file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
+           file://0003-viv-fb-Make-sure-config.h-is-included.patch \
+           file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
+           file://0004-glimagesink-Downrank-to-marginal.patch \
+           "
+SRC_URI[md5sum] = "5ea9dc2692335e03170c3639901c2d83"
+SRC_URI[sha256sum] = "762abdd1a950809a1cea62fff7f86b5f7d6bd5f6841e3e585c700b823cdb7897"
 
 S = "${WORKDIR}/gst-plugins-base-${PV}"
 
 DEPENDS += "iso-codes util-linux zlib"
 
-inherit gobject-introspection gtk-doc
+inherit gobject-introspection
 
 PACKAGES_DYNAMIC =+ "^libgst.*"
 
@@ -74,16 +70,13 @@ OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayla
 OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}"
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Dgl-graphene=disabled \
     ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \
     ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \
     ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \
 "
 
-GTKDOC_MESON_OPTION = "gtk_doc"
-GTKDOC_MESON_ENABLE_FLAG = "enabled"
-GTKDOC_MESON_DISABLE_FLAG = "disabled"
-
 FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h"
 FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
 
Signature · 1 line
2.29.1
#11 lore raw

PATCH v5 4/22 gstreamer1.0-plugins-base: add new meson option as PACKAGECONFIG

In reply to Jose Quaresma

- gl_winsys have a new meson option to set egl

---
 .../gstreamer/gstreamer1.0-plugins-base_1.18.0.bb                | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.bb +1 -0
index 7fe5a480d4..a04af186f6 100644
@@ -68,6 +68,7 @@ OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', ' x11', '',
 OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gbm', ' gbm', '', d)}"
 OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayland', '', d)}"
 OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}"
+OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' egl', '', d)}"
 
 EXTRA_OEMESON += " \
     -Ddoc=disabled \
Signature · 1 line
2.29.1
#12 lore raw

PATCH v5 5/22 gstreamer1.0-plugins-good: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more.

---
 ...defines-GLsync-to-fix-compile-on-som.patch | 70 -------------------
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |  8 +--
 ...bb => gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++--
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.2.bb => gstreamer1.0-plugins-good_1.18.0.bb} (84%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch deleted +0 -70
deleted file mode 100644
index 136848763b..0000000000
@@ -1,70 +0,0 @@
-From 3e0d5577444b32579bdf5b69d720a322322ff7bc Mon Sep 17 00:00:00 2001
-From: Milian Wolff <[email protected]>
-Date: Tue, 26 Nov 2019 15:08:20 +0100
-Subject: [PATCH] qmlgl: ensure Qt defines GLsync to fix compile on some platforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By explictly including QtGui/qopengl.h we force the code path that
-defines GLsync in the Qt-specific way. Without that, some platforms
-failed to compile the qmlgl plugin, since neither Qt nor gstreamer
-defined GLsync then, leading to e.g.:
-
-```
-make[4]: Entering directory '/.../gst-plugins-good-1.16.1/ext/qt'
-  CXX      libgstqmlgl_la-qtitem.lo
-In file included from gstqtgl.h:32,
-                 from qtitem.h:27,
-                 from qtitem.cc:28:
-/.../usr/include/gstreamer-1.0/
-gst/gl/gstglfuncs.h:93:17: error: expected identifier before ‘*’ token
-   ret (GSTGLAPI *name) args;
-                 ^
-/.../usr/include/gstreamer-1.0/
-gst/gl/glprototypes/sync.h:27:1: note: in expansion of macro
-‘GST_GL_EXT_FUNCTION’
- GST_GL_EXT_FUNCTION (GLsync, FenceSync,
- ^~~~~~~~~~~~~~~~~~~
-```
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/3e0d5577444b32579bdf5b69d720a322322ff7bc]
----
- ext/qt/gstqtgl.h | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
---- a/ext/qt/gstqtgl.h
-+++ b/ext/qt/gstqtgl.h
-@@ -22,14 +22,7 @@
- #include <QtGui/qtgui-config.h>
- #endif
- 
--/* qt uses the same trick as us to typedef GLsync on GLES2 but to a different
-- * type which confuses the preprocessor. Instead of trying to reconcile the
-- * two, we instead use the GLsync definition from Qt from above, and ensure
-- * that we don't typedef GLsync in gstglfuncs.h */
- #include <gst/gl/gstglconfig.h>
--#undef GST_GL_HAVE_GLSYNC
--#define GST_GL_HAVE_GLSYNC 1
--#include <gst/gl/gstglfuncs.h>
- 
- /* The glext.h guard was renamed in 2018, but some software which
-  * includes their own copy of the GL headers (such as qt) might have
-@@ -46,6 +39,17 @@
- #endif
- #endif
- 
-+/* pulls in GLsync, see below */
-+#include <QtGui/qopengl.h>
-+
-+/* qt uses the same trick as us to typedef GLsync on GLES2 but to a different
-+ * type which confuses the preprocessor. Instead of trying to reconcile the
-+ * two, we instead use the GLsync definition from Qt from above, and ensure
-+ * that we don't typedef GLsync in gstglfuncs.h */
-+#undef GST_GL_HAVE_GLSYNC
-+#define GST_GL_HAVE_GLSYNC 1
-+#include <gst/gl/gstglfuncs.h>
-+
- #if defined(QT_OPENGL_ES_2)
- #include <QtGui/QOpenGLContext>
- #include <QtGui/QOpenGLFunctions>
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +4 -4
index 3d423154e0..788d752058 100644
@@ -1,4 +1,4 @@
-From d08234a659bec1fd5c984fedefbeb8192af07839 Mon Sep 17 00:00:00 2001
+From bf8b2fa0f6870589d036f0f33c140a3f85b530a0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 31 Mar 2020 21:23:28 -0700
 Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
-index 2b314e0..12b15dd 100644
+index a05d26e..4cc9fc6 100644
 --- a/ext/qt/gstqsgtexture.cc
 +++ b/ext/qt/gstqsgtexture.cc
 @@ -27,7 +27,7 @@
@@ -39,7 +39,7 @@ index 2b314e0..12b15dd 100644
  
  #define GST_CAT_DEFAULT gst_qsg_texture_debug
 diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
-index 62d26b6..bf68ebb 100644
+index 9360c33..0dfd3f1 100644
 --- a/ext/qt/qtwindow.cc
 +++ b/ext/qt/qtwindow.cc
 @@ -25,7 +25,7 @@
@@ -52,5 +52,5 @@ index 62d26b6..bf68ebb 100644
  #include "gstqsgtexture.h"
  #include "gstqtglutility.h"
 -- 
-2.26.0
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +6 -8
similarity index 84%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb
index 17c9421394..c112f336b2 100644
@@ -1,19 +1,16 @@
 require gstreamer1.0-plugins-common.inc
 
-SRC_URI = " \
-            https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
-            file://0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch \
-            file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
-            "
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
+           file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
+           "
 
-SRC_URI[md5sum] = "bd025f8f14974f94b75ac69a9d1b9c93"
-SRC_URI[sha256sum] = "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319"
+SRC_URI[md5sum] = "c437bf42bf830bc0f482c7d088fb37a5"
+SRC_URI[sha256sum] = "6329bc377a3afea5cf1ab329a91cc4a906f075781780d1edc59e8bea8c1a8bac"
 
 S = "${WORKDIR}/gst-plugins-good-${PV}"
 
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
                     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
 
 DEPENDS += "gstreamer1.0-plugins-base libcap zlib"
@@ -54,6 +51,7 @@ PACKAGECONFIG[wavpack]    = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
 PACKAGECONFIG[x11]        = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Daalib=disabled \
     -Ddirectsound=disabled \
     -Ddv=disabled \
Signature · 1 line
2.29.1
#13 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Quoted 17 lines · Jose Quaresma

* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more.

---
 ...defines-GLsync-to-fix-compile-on-som.patch | 70 ---------------
----
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |  8 +--
 ...bb => gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++--
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-
plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-
som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-
Quoted 1 line

good_1.16.2.bb => gstreamer1.0-plugins-good_1.18.0.bb} (84%)

Thanks for the updated series, I put it in for testing and this time we're seeing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/1305

nasm seems to be needed by plugins-good but is missing?

Cheers,

Richard

#14 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

I need to check what's append with this

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:06:

Quoted 32 lines · Jose Quaresma
Quoted 17 lines

* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more.

---
 ...defines-GLsync-to-fix-compile-on-som.patch | 70 ---------------
----
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |  8 +--
 ...bb => gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++--
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-
plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-
som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-
Quoted 1 line

good_1.16.2.bb => gstreamer1.0-plugins-good_1.18.0.bb} (84%)

Thanks for the updated series, I put it in for testing and this time we're seeing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/1305

nasm seems to be needed by plugins-good but is missing?

Cheers,

Richard

Signature · 2 lines
best regards,
José Quaresma

A message that is not in the archive (sent off-list or not yet received): [email protected]

#16 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

I don't understand that!

The logs from
https://errors.yoctoproject.org/Errors/Details/510826/
Have meson asm enabled [-Dasm=enabled] and this option pulls nasm as dependency in [PATCH v5 07/22]

[PATCH v5 07/22] gstreamer1.0-plugins-good: add new meson option as PACKAGECONFIG

(quoted diff) +0 -0

b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb index ad3eabd0be..860b31106f 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb +1 -0
@@ -20,6 +20,7 @@ RPROVIDES_${PN}-soup += "${PN}-souphttpsrc"
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
+    ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \
     bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup

speex taglib v4l2 \
"

@@ -27,6 +28,7 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled
-Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled
-Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"

+PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm"
 PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
 PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 22:14:

Quoted 45 lines

I need to check what's append with this

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:06:

Quoted 24 lines · Jose Quaresma
Quoted 17 lines

* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more.

---
 ...defines-GLsync-to-fix-compile-on-som.patch | 70 ---------------
----
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |  8 +--
 ...bb => gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++--
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-
plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-
som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-
Quoted 1 line

good_1.16.2.bb => gstreamer1.0-plugins-good_1.18.0.bb} (84%)

Thanks for the updated series, I put it in for testing and this time we're seeing:

Quoted 8 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/1305

nasm seems to be needed by plugins-good but is missing?

Cheers,

Richard

--
best regards,
José Quaresma

Signature · 2 lines
best regards,
José Quaresma

A message that is not in the archive (sent off-list or not yet received): [email protected]

#18 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

nasm is present on sysroot

The build log
https://errors.yoctoproject.org/Errors/Details/510826/

Countain:

NOTE: Direct dependencies are:
'/home/pokybuild/yocto-worker/qemux86-64-ltp/build/meta/recipes-devtools/nasm/nasm_2.15.05.bb:do_populate_sysroot'

NOTE: Skipping as already exists in sysroot:
'nasm'

I don't have a build it on qemux86-64 and only build on arm and on arm it is builded without nasm because -Dasm=disabled Otherwise I think everything is correct with this patch

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 22:54:

Quoted 92 lines

I don't understand that!

The logs from
https://errors.yoctoproject.org/Errors/Details/510826/
Have meson asm enabled [-Dasm=enabled] and this option pulls nasm as dependency in [PATCH v5 07/22]

[PATCH v5 07/22] gstreamer1.0-plugins-good: add new meson option as PACKAGECONFIG

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb +1 -0
index ad3eabd0be..860b31106f 100644
@@ -20,6 +20,7 @@ RPROVIDES_${PN}-soup += "${PN}-souphttpsrc"
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
+    ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \
     bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup
 speex taglib v4l2 \
 "
@@ -27,6 +28,7 @@ X11DEPENDS = "virtual/libx11 libsm libxrender

libxfixes libxdamage"
X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb +1 -2
-Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
 X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled
-Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"
 
+PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm"
 PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
 PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 22:14:

Quoted 35 lines

I need to check what's append with this

Richard Purdie <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 16:06:

Quoted 30 lines · Jose Quaresma
Quoted 17 lines

* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more.

---
 ...defines-GLsync-to-fix-compile-on-som.patch | 70 ---------------
----
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |  8 +--
 ...bb => gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++--
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-
plugins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-
som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-
Quoted 1 line

good_1.16.2.bb => gstreamer1.0-plugins-good_1.18.0.bb} (84%)

Thanks for the updated series, I put it in for testing and this time we're seeing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/1305

nasm seems to be needed by plugins-good but is missing?

Cheers,

Quoted 10 lines
Quoted 2 lines

Richard

--
best regards,
José Quaresma

--
best regards,
José Quaresma

Signature · 2 lines
best regards,
José Quaresma
#19 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Quoted 11 lines · Jose Quaresma

nasm is present on sysroot

The build log
https://errors.yoctoproject.org/Errors/Details/510826/

Countain:

NOTE: Direct dependencies are:
'/home/pokybuild/yocto-worker/qemux86-64-ltp/build/meta/recipes- devtools/nasm/nasm_2.15.05.bb:do_populate_sysroot'

Quoted 6 lines

NOTE: Skipping as already exists in sysroot:
'nasm'

I don't have a build it on qemux86-64 and only build on arm and on arm it is builded without nasm because -Dasm=disabled Otherwise I think everything is correct with this patch

I was able to reproduce by building qemux86-64, it readily fails. The issue is that it needs nasm-native. If I add nasm-native to the dependency line it seems to build fine.

I'll add that and retest on the autobuilder. If that works I'll squash it in.

Cheers,

Richard

#20 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Richard Purdie <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:45:

Quoted 16 lines · Jose Quaresma
Quoted 14 lines

nasm is present on sysroot

The build log
https://errors.yoctoproject.org/Errors/Details/510826/

Countain:

NOTE: Direct dependencies are:
'/home/pokybuild/yocto-worker/qemux86-64-ltp/build/meta/recipes- devtools/nasm/nasm_2.15.05.bb:do_populate_sysroot'

NOTE: Skipping as already exists in sysroot:
'nasm'

Quoted 7 lines
Quoted 3 lines

I don't have a build it on qemux86-64 and only build on arm and on arm it is builded without nasm because -Dasm=disabled Otherwise I think everything is correct with this patch

I was able to reproduce by building qemux86-64, it readily fails. The issue is that it needs nasm-native. If I add nasm-native to the dependency line it seems to build fine.

Big mistake and I don't see it, of course it was the native nasm that is needed to build.
Sorry for that and thanks for looking into this.

Quoted 8 lines

I'll add that and retest on the autobuilder. If that works I'll squash it in.

Cheers,

Richard

Signature · 2 lines
best regards,
José Quaresma

A message that is not in the archive (sent off-list or not yet received): [email protected]

#22 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Hi Richard,

I see your fix:

-PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm" +PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm nasm-native"

and only nasm-native is needed,
because nasm is not needed on target and it's only needed at build time.

I can fix it and send v6 series and I have another fix for this series that remove
0004-capfix.patc in gstreamer1.0: upgrade to version 1.18.0 What do you think?

I hope this is the last version and I will be more careful next time I submit a big patch series.

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:57:

Quoted 47 lines

Richard Purdie <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:45:

Quoted 16 lines · Jose Quaresma
Quoted 14 lines

nasm is present on sysroot

The build log
https://errors.yoctoproject.org/Errors/Details/510826/

Countain:

NOTE: Direct dependencies are:
'/home/pokybuild/yocto-worker/qemux86-64-ltp/build/meta/recipes- devtools/nasm/nasm_2.15.05.bb:do_populate_sysroot'

NOTE: Skipping as already exists in sysroot:
'nasm'

Quoted 7 lines
Quoted 3 lines

I don't have a build it on qemux86-64 and only build on arm and on arm it is builded without nasm because -Dasm=disabled Otherwise I think everything is correct with this patch

I was able to reproduce by building qemux86-64, it readily fails. The issue is that it needs nasm-native. If I add nasm-native to the dependency line it seems to build fine.

Big mistake and I don't see it, of course it was the native nasm that is needed to build.
Sorry for that and thanks for looking into this.

Quoted 8 lines

I'll add that and retest on the autobuilder. If that works I'll squash it in.

Cheers,

Richard

--
best regards,
José Quaresma

Signature · 2 lines
best regards,
José Quaresma
#23 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Since the patches are already in master-next, and will likely not cause any problems, maybe it's easier to create small followup patches, and send them once the main set merges, instead of sending a massive full set again.

Alex

Quoted 77 lines · Jose Quaresma

Hi Richard,

I see your fix:

(quoted diff) +1 -1
-PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm"
+PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm nasm-native"

and only nasm-native is needed,
because nasm is not needed on target and it's only needed at build time.

I can fix it and send v6 series and I have another fix for this series that remove
0004-capfix.patc in gstreamer1.0: upgrade to version 1.18.0 What do you think?

I hope this is the last version and I will be more careful next time I submit a big patch series.

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:57:

Quoted 37 lines

Richard Purdie <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:45:

Quoted 16 lines · Jose Quaresma
Quoted 14 lines

nasm is present on sysroot

The build log
https://errors.yoctoproject.org/Errors/Details/510826/

Countain:

NOTE: Direct dependencies are:
'/home/pokybuild/yocto-worker/qemux86-64-ltp/build/meta/recipes- devtools/nasm/nasm_2.15.05.bb:do_populate_sysroot'

NOTE: Skipping as already exists in sysroot:
'nasm'

Quoted 7 lines
Quoted 3 lines

I don't have a build it on qemux86-64 and only build on arm and on arm it is builded without nasm because -Dasm=disabled Otherwise I think everything is correct with this patch

I was able to reproduce by building qemux86-64, it readily fails. The issue is that it needs nasm-native. If I add nasm-native to the dependency line it seems to build fine.

Big mistake and I don't see it, of course it was the native nasm that is needed to build.
Sorry for that and thanks for looking into this.

Quoted 6 lines

I'll add that and retest on the autobuilder. If that works I'll squash it in.

Cheers,

Quoted 10 lines
Quoted 2 lines

Richard

--
best regards,
José Quaresma

--
best regards,
José Quaresma

#24 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

It's probably better to wait and send two little fixup after the series is applied on the master.

Thanks for the help

Alexander Kanavin <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 18:28:

Quoted 83 lines

Since the patches are already in master-next, and will likely not cause any problems, maybe it's easier to create small followup patches, and send them once the main set merges, instead of sending a massive full set again.

Alex

Quoted 77 lines · Jose Quaresma

Hi Richard,

I see your fix:

(quoted diff) +1 -1
-PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm"
+PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm nasm-native"

and only nasm-native is needed,
because nasm is not needed on target and it's only needed at build time.

I can fix it and send v6 series and I have another fix for this series that remove
0004-capfix.patc in gstreamer1.0: upgrade to version 1.18.0 What do you think?

I hope this is the last version and I will be more careful next time I submit a big patch series.

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:57:

Quoted 37 lines

Richard Purdie <[email protected]> escreveu no dia sexta, 30/10/2020 à(s) 17:45:

Quoted 16 lines · Jose Quaresma
Quoted 14 lines

nasm is present on sysroot

The build log
https://errors.yoctoproject.org/Errors/Details/510826/

Countain:

NOTE: Direct dependencies are:
'/home/pokybuild/yocto-worker/qemux86-64-ltp/build/meta/recipes- devtools/nasm/nasm_2.15.05.bb:do_populate_sysroot'

NOTE: Skipping as already exists in sysroot:
'nasm'

Quoted 7 lines
Quoted 3 lines

I don't have a build it on qemux86-64 and only build on arm and on arm it is builded without nasm because -Dasm=disabled Otherwise I think everything is correct with this patch

I was able to reproduce by building qemux86-64, it readily fails. The issue is that it needs nasm-native. If I add nasm-native to the dependency line it seems to build fine.

Big mistake and I don't see it, of course it was the native nasm that is needed to build.
Sorry for that and thanks for looking into this.

Quoted 6 lines

I'll add that and retest on the autobuilder. If that works I'll squash it in.

Cheers,

Quoted 10 lines
Quoted 2 lines

Richard

--
best regards,
José Quaresma

--
best regards,
José Quaresma

Signature · 2 lines
best regards,
José Quaresma
#25 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

In reply to Jose Quaresma
Quoted 10 lines · Jose Quaresma

Hi Richard,

I see your fix:

(quoted diff) +1 -1
-PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm"
+PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm nasm-native"

and only nasm-native is needed,
because nasm is not needed on target and it's only needed at build time.

I was thinking about that after I sent the email. I've tweaked it again in master-next and squashed it into the series since it was easiest to do that.

Quoted 3 lines

I can fix it and send v6 series and I have another fix for this series that remove 0004-capfix.patc in gstreamer1.0: upgrade to version 1.18.0 What do you think?

We can make this one a follow up to the series.

Quoted 2 lines

I hope this is the last version and I will be more careful next time I submit a big patch series.

No problem, thanks for doing the work in creating it! The end result should be good and its nice to stay close to upstream releases. I'm think we're just about there now.

Cheers,

Richard

#26 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Quoted 25 lines · Richard Purdie
Quoted 11 lines · Jose Quaresma

Hi Richard,

I see your fix:

(quoted diff) +1 -1
-PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm"
+PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm nasm-

native"

and only nasm-native is needed,
because nasm is not needed on target and it's only needed at build time.

I was thinking about that after I sent the email. I've tweaked it again
in master-next and squashed it into the series since it was easiest to
do that.

Quoted 3 lines

I can fix it and send v6 series and I have another fix for this series that remove 0004-capfix.patc in gstreamer1.0: upgrade to version 1.18.0 What do you think?

We can make this one a follow up to the series.

Quoted 7 lines
Quoted 3 lines

I hope this is the last version and I will be more careful next time
I submit a big patch series.

No problem, thanks for doing the work in creating it! The end result should be good and its nice to stay close to upstream releases. I'm think we're just about there now.

Just to follow up, you renamed gst->validate -> gst-devtool but didn't update the maintainers entry. I've added that. We also found that a dependency you added, json-glib had reproducibility failures[1] as it wasn't being tested previously. I spotted a previous similar issue we fixed like this and Alex was kind enough to send a patch.

[1] e.g. https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201030-ld3_vz4a/packages/diff-html/

I'm running another test build, hopefully this one will be better!

Cheers,

Richard

#27 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Richard Purdie <[email protected]> escreveu no dia sábado, 31/10/2020 à(s) 00:49:

Quoted 35 lines · Richard Purdie
Quoted 25 lines · Jose Quaresma
Quoted 11 lines

Hi Richard,

I see your fix:

(quoted diff) +1 -1
-PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm"
+PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm nasm-

native"

and only nasm-native is needed,
because nasm is not needed on target and it's only needed at build time.

I was thinking about that after I sent the email. I've tweaked it again
in master-next and squashed it into the series since it was easiest to
do that.

Quoted 3 lines

I can fix it and send v6 series and I have another fix for this series that remove 0004-capfix.patc in gstreamer1.0: upgrade to version 1.18.0 What do you think?

We can make this one a follow up to the series.

Quoted 7 lines
Quoted 3 lines

I hope this is the last version and I will be more careful next time
I submit a big patch series.

No problem, thanks for doing the work in creating it! The end result should be good and its nice to stay close to upstream releases. I'm think we're just about there now.

Quoted 5 lines

Just to follow up, you renamed gst->validate -> gst-devtool but didn't update the maintainers entry. I've added that. We also found that a dependency you added, json-glib had reproducibility failures[1] as it wasn't being tested previously. I spotted a previous similar issue we fixed like this and Alex was kind enough to send a patch.

Once again I forget maintainers! Thanks for the update. About the json-glib I only build the gst-devtool and don't have any tool to check
the reproducibility. Thanks to Alex for the quick solution he found.

Quoted 2 lines

[1] e.g. https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201030-ld3_vz4a/packages/diff-html/

There are great tools on the OE core to check this type of problems. Congratulations for the autobuilder infrastructure. I will try to setup it in near future
because they are very useful.

Quoted 9 lines

I'm running another test build, hopefully this one will be better!

Cheers,

Richard

Signature · 2 lines
best regards,
José Quaresma
#28 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Quoted 5 lines · Jose Quaresma

There are great tools on the OE core to check this type of problems. Congratulations for the autobuilder infrastructure. I will try to setup it in near future
because they are very useful.

I think there's also a ptest regression for gstreamer:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/1472

It's not a failure, and doesn't prevent merging version updates, but still should be addressed.

Alex

#29 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Quoted 9 lines · Alexander Kanavin
Quoted 5 lines · Jose Quaresma

There are great tools on the OE core to check this type of problems. Congratulations for the autobuilder infrastructure. I will try to setup it in near future
because they are very useful.

Quoted 6 lines

I think there's also a ptest regression for gstreamer:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/1472

It's not a failure, and doesn't prevent merging version updates, but still should be addressed.

Here specifically:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/1472/steps/8/logs/step1c

Alex

#30 lore raw

Re: [OE-core] [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0

Alexander Kanavin <[email protected]> escreveu no dia sábado, 31/10/2020 à(s) 18:56:

Quoted 14 lines · Alexander Kanavin
Quoted 12 lines · Jose Quaresma
Quoted 5 lines

There are great tools on the OE core to check this type of problems. Congratulations for the autobuilder infrastructure. I will try to setup it in near future
because they are very useful.

I think there's also a ptest regression for gstreamer:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/1472

Quoted 7 lines
Quoted 1 line

It's not a failure, and doesn't prevent merging version updates, but still should be addressed.

Here specifically:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/1472/steps/8/logs/step1c

Alex

I will look at this when I have some time.
But I need to deepen my knowledge first about the OE ptest.

I think it can be very useful to run the gstreamer meson test infrastructure. I don't know why but I will try to do it.

Signature · 2 lines
best regards,
José Quaresma
#31 lore raw

PATCH v5 6/22 gstreamer1.0-plugins-good: disable new meson options

In reply to Jose Quaresma
---
 .../gstreamer/gstreamer1.0-plugins-good_1.18.0.bb                | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb +1 -0
index c112f336b2..ad3eabd0be 100644
@@ -60,6 +60,7 @@ EXTRA_OEMESON += " \
     -Doss4=disabled \
     -Dosxaudio=disabled \
     -Dosxvideo=disabled \
+    -Drpicamsrc=disabled \
     -Dshout2=disabled \
     -Dtwolame=disabled \
     -Dwaveform=disabled \
Signature · 1 line
2.29.1
#32 lore raw

PATCH v5 7/22 gstreamer1.0-plugins-good: add new meson option as PACKAGECONFIG

In reply to Jose Quaresma
---
 .../gstreamer/gstreamer1.0-plugins-good_1.18.0.bb               | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb +2 -0
index ad3eabd0be..860b31106f 100644
@@ -20,6 +20,7 @@ RPROVIDES_${PN}-soup += "${PN}-souphttpsrc"
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
+    ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \
     bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \
 "
 
@@ -27,6 +28,7 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
 X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled -Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
 X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"
 
+PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm"
 PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
 PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"
 PACKAGECONFIG[dv1394]     = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394"
Signature · 1 line
2.29.1
#33 lore raw

PATCH v5 8/22 gstreamer1.0-plugins-bad: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch Removed since these are included in 1.18.0

PACKAGECONFIG:
- vdpau has been removed upstream
- vulkan needs now needs shaderc-native to build

EXTRA_OEMESON:
- yadif has been removed upstream
- nvdec and nvenc has been replaced with nvcodec

FILES:
- add new files for transcode plugin

---
 ...alized-warnings-when-compiling-with.patch} |  8 ++--
 ...even-when-cross-compiling-if-introsp.patch | 36 ----------------
 ...avoid-including-sys-poll.h-directly.patch} |  8 ++--
 ...sentinals-for-gst_structure_get-etc.patch} | 43 ++++++++++---------
 ...ssing-opencv-data-dir-in-yocto-buil.patch} |  8 ++--
 ....bb => gstreamer1.0-plugins-bad_1.18.0.bb} | 28 ++++++------
 6 files changed, 48 insertions(+), 83 deletions(-)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch => 0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch} (80%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{avoid-including-sys-poll.h-directly.patch => 0002-avoid-including-sys-poll.h-directly.patch} (79%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{ensure-valid-sentinels-for-gst_structure_get-etc.patch => 0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch} (69%)
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch => 0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch} (91%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.16.2.bb => gstreamer1.0-plugins-bad_1.18.0.bb} (88%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch +4 -4
similarity index 80%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch
index 73681f1002..13a673cd50 100644
@@ -1,7 +1,7 @@
-From a67781000e82bd9ae3813da29401e8c0c852328a Mon Sep 17 00:00:00 2001
+From f08ab3ac2ce43ac91d3bf65b26f26436690f499b Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Tue, 26 Jan 2016 15:16:01 -0800
-Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
+Subject: [PATCH 1/4] fix maybe-uninitialized warnings when compiling with -Os
 
 Upstream-Status: Pending
 
@@ -11,7 +11,7 @@ Signed-off-by: Andre McCurdy <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
-index fd16ee0..ddb890c 100644
+index 2c60ced..e8226d8 100644
 --- a/gst-libs/gst/codecparsers/gstvc1parser.c
 +++ b/gst-libs/gst/codecparsers/gstvc1parser.c
 @@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
@@ -24,5 +24,5 @@ index fd16ee0..ddb890c 100644
    guint8 structB[12] = { 0, };
    GstBitReader br;
 -- 
-1.9.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted +0 -36
deleted file mode 100644
index 1321852023..0000000000
@@ -1,36 +0,0 @@
-From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Fri, 18 Oct 2019 00:39:12 +0100
-Subject: [PATCH 1/2] meson: build gir even when cross-compiling if
- introspection was enabled explicitly
-
-This can be made to work in certain circumstances when
-cross-compiling, so default to not building g-i stuff
-when cross-compiling, but allow it if introspection was
-enabled explicitly via -Dintrospection=enabled.
-
-See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
-
-Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19]
-
-Signed-off-by: Carlos Rafael Giani <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 67aeeb4d0..7b3314bd9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -411,7 +411,7 @@ python3 = import('python').find_installation()
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
-     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
--- 
-2.17.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch +4 -4
similarity index 79%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch
index 32261279a5..ead6897f67 100644
@@ -1,7 +1,7 @@
-From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001
+From 3b05e91720c10fcf6e0e408595b7217f6fa145c2 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Wed, 3 Feb 2016 18:05:41 -0800
-Subject: [PATCH] avoid including <sys/poll.h> directly
+Subject: [PATCH 2/4] avoid including <sys/poll.h> directly
 
 musl libc generates warnings if <sys/poll.h> is included directly.
 
@@ -13,7 +13,7 @@ Signed-off-by: Andre McCurdy <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
-index b93255f..49f145a 100644
+index ca6b92a..b2772db 100644
 --- a/sys/dvb/gstdvbsrc.c
 +++ b/sys/dvb/gstdvbsrc.c
 @@ -97,7 +97,7 @@
@@ -26,5 +26,5 @@ index b93255f..49f145a 100644
  #include <errno.h>
  #include <stdio.h>
 -- 
-1.9.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch +23 -20

75 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +4 -4
similarity index 91%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
index 4b6591c0d8..b816709066 100644
@@ -1,7 +1,7 @@
-From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001
+From f19ff66640f2f472c4e9d9055253032d34e125c6 Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <[email protected]>
 Date: Mon, 27 Jan 2020 10:22:35 +0000
-Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
+Subject: [PATCH 4/4] opencv: resolve missing opencv data dir in yocto build
 
 When Yocto build is performed, opencv searches for data dir using simple
 'test' command, this fails because pkg-config provides an absolute
@@ -16,7 +16,7 @@ Signed-off-by: Andrey Zhizhikin <[email protected]>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index f38b55dfe..a26403482 100644
+index 0b0b3fc..0ed3344 100644
 --- a/ext/opencv/meson.build
 +++ b/ext/opencv/meson.build
 @@ -78,20 +78,21 @@ else
@@ -45,5 +45,5 @@ index f38b55dfe..a26403482 100644
          gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"'
        else
 -- 
-2.17.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb +13 -15
similarity index 88%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb
index 99176b2571..d209107805 100644
@@ -1,15 +1,13 @@
 require gstreamer1.0-plugins-common.inc
 
-SRC_URI = " \
-    https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
-    file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
-    file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
-    file://avoid-including-sys-poll.h-directly.patch \
-    file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
-    file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
-"
-SRC_URI[md5sum] = "ccc7404230afddec723bbdb63c89feec"
-SRC_URI[sha256sum] = "f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
+           file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
+           file://0002-avoid-including-sys-poll.h-directly.patch \
+           file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \
+           file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
+           "
+SRC_URI[md5sum] = "c1b5f2fb2d76ace6a3d04df73a8c72ea"
+SRC_URI[sha256sum] = "f382ab1caddd64aaa7acb7c4787487f63fd39bd0fde9c757655cbaa457c1185f"
 
 S = "${WORKDIR}/gst-plugins-bad-${PV}"
 
@@ -75,10 +73,9 @@ PACKAGECONFIG[srtp]            = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp"
 PACKAGECONFIG[tinyalsa]        = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa"
 PACKAGECONFIG[ttml]            = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo"
 PACKAGECONFIG[uvch264]         = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev"
-PACKAGECONFIG[vdpau]           = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
 PACKAGECONFIG[voaacenc]        = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc"
 PACKAGECONFIG[voamrwbenc]      = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc"
-PACKAGECONFIG[vulkan]          = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader"
+PACKAGECONFIG[vulkan]          = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native"
 PACKAGECONFIG[wayland]         = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm"
 PACKAGECONFIG[webp]            = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
 PACKAGECONFIG[webrtc]          = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
@@ -93,6 +90,7 @@ PACKAGECONFIG[zbar]            = "-Dzbar=enabled,-Dzbar=disabled,zbar"
 #   winscreencap wpe x265
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Ddecklink=enabled \
     -Ddvb=enabled \
     -Dfbdev=enabled \
@@ -118,8 +116,7 @@ EXTRA_OEMESON += " \
     -Dmpeg2enc=disabled \
     -Dmplex=disabled \
     -Dmusepack=disabled \
-    -Dnvdec=disabled \
-    -Dnvenc=disabled \
+    -Dnvcodec=disabled \
     -Dofa=disabled \
     -Dopenexr=disabled \
     -Dopenni2=disabled \
@@ -134,7 +131,6 @@ EXTRA_OEMESON += " \
     -Dwinscreencap=disabled \
     -Dwpe=disabled \
     -Dx265=disabled \
-    ${@bb.utils.contains("TUNE_FEATURES", "mx32", "-Dyadif=disabled", "", d)} \
 "
 
 export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
@@ -144,4 +140,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs"
 FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
+FILES_${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles"
 FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"
+
Signature · 1 line
2.29.1
#34 lore raw

PATCH v5 9/22 gstreamer1.0-plugins-bad: disable new meson options

In reply to Jose Quaresma
---
 .../gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb          | 8 ++++++++
 1 file changed, 8 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb +8 -0
index d209107805..903ca920f2 100644
@@ -100,9 +100,11 @@ EXTRA_OEMESON += " \
     -Daom=disabled \
     -Dandroidmedia=disabled \
     -Dapplemedia=disabled \
+    -Davtp=disabled \
     -Dbs2b=disabled \
     -Dchromaprint=disabled \
     -Dd3dvideosink=disabled \
+    -Dd3d11=disabled \
     -Ddirectsound=disabled \
     -Ddts=disabled \
     -Dfdkaac=disabled \
@@ -113,6 +115,9 @@ EXTRA_OEMESON += " \
     -Dkate=disabled \
     -Dladspa=disabled \
     -Dlv2=disabled \
+    -Dmagicleap=disabled \
+    -Dmediafoundation=disabled \
+    -Dmicrodns=disabled \
     -Dmpeg2enc=disabled \
     -Dmplex=disabled \
     -Dmusepack=disabled \
@@ -124,13 +129,16 @@ EXTRA_OEMESON += " \
     -Dsoundtouch=disabled \
     -Dspandsp=disabled \
     -Dsrt=disabled \
+    -Dsvthevcenc=disabled \
     -Dteletext=disabled \
     -Dwasapi=disabled \
+    -Dwasapi2=disabled \
     -Dwildmidi=disabled \
     -Dwinks=disabled \
     -Dwinscreencap=disabled \
     -Dwpe=disabled \
     -Dx265=disabled \
+    -Dzxing=disabled \
 "
 
 export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
Signature · 1 line
2.29.1
#35 lore raw

PATCH v5 10/22 gstreamer1.0-plugins-bad: add new meson options as PACKAGECONFIG

In reply to Jose Quaresma
---
 .../gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb                | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb +2 -0
index 903ca920f2..8f9036b8ec 100644
@@ -73,6 +73,7 @@ PACKAGECONFIG[srtp]            = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp"
 PACKAGECONFIG[tinyalsa]        = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa"
 PACKAGECONFIG[ttml]            = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo"
 PACKAGECONFIG[uvch264]         = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev"
+PACKAGECONFIG[va]              = "-Dva=enabled,-Dva=disabled,libva"
 PACKAGECONFIG[voaacenc]        = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc"
 PACKAGECONFIG[voamrwbenc]      = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc"
 PACKAGECONFIG[vulkan]          = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native"
@@ -81,6 +82,7 @@ PACKAGECONFIG[webp]            = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
 PACKAGECONFIG[webrtc]          = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
 PACKAGECONFIG[webrtcdsp]       = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing"
 PACKAGECONFIG[zbar]            = "-Dzbar=enabled,-Dzbar=disabled,zbar"
+PACKAGECONFIG[v4l2codecs]      = "-D-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev"
 
 # these plugins currently have no corresponding library in OE-core or meta-openembedded:
 #   aom androidmedia applemedia bs2b chromaprint d3dvideosink
Signature · 1 line
2.29.1
#36 lore raw

PATCH v5 11/22 gstreamer1.0-plugins-ugly: upgrade to version 1.18.0

In reply to Jose Quaresma
---
 ...ns-ugly_1.16.2.bb => gstreamer1.0-plugins-ugly_1.18.0.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.16.2.bb => gstreamer1.0-plugins-ugly_1.18.0.bb} (89%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb +3 -2
similarity index 89%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb
index be10800389..d38550c352 100644
@@ -9,8 +9,8 @@ LICENSE_FLAGS = "commercial"
 SRC_URI = " \
             https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
             "
-SRC_URI[md5sum] = "10283ff5ef1e34d462dde77042e329bd"
-SRC_URI[sha256sum] = "5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca"
+SRC_URI[md5sum] = "01d3a24152cfd5eb27b1787d44b524c6"
+SRC_URI[sha256sum] = "686644e45e08258ae240c4519376668ad8d34ea6d0f6ab556473c317bfb7e082"
 
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"
 
@@ -32,6 +32,7 @@ PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
 PACKAGECONFIG[x264]     = "-Dx264=enabled,-Dx264=disabled,x264"
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Dsidplay=disabled \
 "
 
Signature · 1 line
2.29.1
#37 lore raw

PATCH v5 12/22 gstreamer1.0-python: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-meson.build-fix-builds-with-python-3.8.patch Removed since these are included in 1.18.0

DEPENDS:
RDEPENDS:
- Upstream now depends gstreamer1.0-plugins-base

---
 ...son.build-fix-builds-with-python-3.8.patch | 24 -------------------
 ....16.2.bb => gstreamer1.0-python_1.18.0.bb} | 14 +++++------
 2 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.16.2.bb => gstreamer1.0-python_1.18.0.bb} (72%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch deleted +0 -24
deleted file mode 100644
index 053108ad50..0000000000
@@ -1,24 +0,0 @@
-From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 2 Dec 2019 18:16:41 +0100
-Subject: [PATCH] meson.build: fix builds with python 3.8
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 1da81d5..3e0db38 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
- 
- pymod = import('python')
- python = pymod.find_installation(get_option('python'))
--python_dep = python.dependency(required : true)
-+python_dep = dependency('python3-embed', required : true)
- 
- python_abi_flags = python.get_variable('ABIFLAGS', '')
- pylib_loc = get_option('libpython-dir')
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb +6 -8
similarity index 72%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.0.bb
index 9e024eb9f3..f13f9c5a44 100644
@@ -5,14 +5,12 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
-           file://0001-meson.build-fix-builds-with-python-3.8.patch \
-           "
-SRC_URI[md5sum] = "6ac709767334d8d0a71cb4e016f6abeb"
-SRC_URI[sha256sum] = "208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8"
-
-DEPENDS = "gstreamer1.0 python3-pygobject"
-RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
+SRC_URI[md5sum] = "2d55c22fcd57cae4fad55a07019aa334"
+SRC_URI[sha256sum] = "76bfe8b85a9c4a6ddfb81874f2635fd0da38c3f39d9d2a0b175213218516dd45"
+
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 
 PNREAL = "gst-python"
 
Signature · 1 line
2.29.1
#38 lore raw

PATCH v5 13/22 gstreamer1.0-python: install append is not need any more

In reply to Jose Quaresma
---
 .../gstreamer/gstreamer1.0-python_1.18.0.bb          | 12 ------------
 1 file changed, 12 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.0.bb +0 -12
index f13f9c5a44..8ad6e15306 100644
@@ -21,15 +21,3 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
 
 inherit meson pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check
-
-do_install_append() {
-
-    # Note that this particular find line is taken from the Debian packaging for
-    # gst-python1.0.
-    find "${D}" \
-        -name '*.pyc' -o \
-        -name '*.pyo' -o \
-        -name '*.la' -o \
-        -name 'libgstpythonplugin*' \
-        -delete
-}
Signature · 1 line
2.29.1
#39 lore raw

PATCH v5 14/22 gstreamer1.0-rtsp-server: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch Removed since these are included in 1.18.0

---
 ...even-when-cross-compiling-if-introsp.patch | 36 -------------------
 ....bb => gstreamer1.0-rtsp-server_1.18.0.bb} |  9 +++--
 2 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.16.2.bb => gstreamer1.0-rtsp-server_1.18.0.bb} (74%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted +0 -36
deleted file mode 100644
index 6962a50d6e..0000000000
@@ -1,36 +0,0 @@
-From 95ce953e34cd0e9f5d42ce7900a9572e7bc8ca47 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Fri, 18 Oct 2019 00:42:12 +0100
-Subject: [PATCH] meson: build gir even when cross-compiling if introspection
- was enabled explicitly
-
-This can be made to work in certain circumstances when
-cross-compiling, so default to not building g-i stuff
-when cross-compiling, but allow it if introspection was
-enabled explicitly via -Dintrospection=enabled.
-
-See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
-
-Upstream-Status: Backport [95ce953e34cd0e9f5d42ce7900a9572e7bc8ca47]
-
-Signed-off-by: Carlos Rafael Giani <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index e1e3b1d..3f45f0e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -173,7 +173,7 @@ endif
- 
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
-     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
--- 
-2.17.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb +4 -5
similarity index 74%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb
index 02c3c83840..0adfa2aac9 100644
@@ -8,18 +8,17 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
 
 PNREAL = "gst-rtsp-server"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
-           file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
-           "
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "8a998725820c771ba45be6e18bfdf73a"
-SRC_URI[sha256sum] = "de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e"
+SRC_URI[md5sum] = "77fe28c702a83566811ab5c7bbe99ab2"
+SRC_URI[sha256sum] = "2ad19311054cbf2df0d0622936bc703dedc06ced706df46a3d3a3ea5a4b7c70f"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
 
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Dexamples=disabled \
     -Dtests=disabled \
 "
Signature · 1 line
2.29.1
#40 lore raw

PATCH v5 15/22 gstreamer1.0-vaapi: upgrade to version 1.18.0

In reply to Jose Quaresma

* 0001-vaapsink-downgrade-to-marginal.patch
Removed since these are included in 1.18.0
https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/commit/13d090b5660a2e2e2c997db44ba9a391101e8bd6

API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc.
Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch.

---
 .../0001-vaapsink-downgrade-to-marginal.patch | 46 -------------------
 ...1.16.2.bb => gstreamer1.0-vaapi_1.18.0.bb} | 16 +++----
 2 files changed, 6 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.16.2.bb => gstreamer1.0-vaapi_1.18.0.bb} (82%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch deleted +0 -46
deleted file mode 100644
index 7945a923c9..0000000000
@@ -1,46 +0,0 @@
-From 0c28cf7bfa90f8947833722cddf23d513490c6c3 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <[email protected]>
-Date: Wed, 28 Nov 2018 15:08:48 +0800
-Subject: [PATCH] vaapsink: downgrade to marginal
-
-Using vaapisink with default poky configuration results in an
-unresponsive display as of today because DRI2 rendering is currently broken
-in non composited environments [1] and libva doesn't support DRI3 [2].
-
-Downgrade vaapisink to marginal for now so playbin (and in turn gst-play
-and gtk-play examples) use xvimagesink or others out of box.
-
-[1] https://gitlab.freedesktop.org/xorg/xserver/issues/13
-[2] https://github.com/intel/libva/issues/122
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <[email protected]>
----
- gst/vaapi/gstvaapi.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/gst/vaapi/gstvaapi.c b/gst/vaapi/gstvaapi.c
-index 9a82454..4d94f2b 100644
---- a/gst/vaapi/gstvaapi.c
-+++ b/gst/vaapi/gstvaapi.c
-@@ -195,7 +195,6 @@ plugin_init (GstPlugin * plugin)
- {
-   GstVaapiDisplay *display;
-   GArray *decoders;
--  guint rank;
- 
-   plugin_add_dependencies (plugin);
- 
-@@ -220,10 +219,7 @@ plugin_init (GstPlugin * plugin)
-   gst_element_register (plugin, "vaapidecodebin",
-       GST_RANK_PRIMARY + 2, GST_TYPE_VAAPI_DECODE_BIN);
- 
--  rank = GST_RANK_PRIMARY;
--  if (g_getenv ("WAYLAND_DISPLAY"))
--    rank = GST_RANK_MARGINAL;
--  gst_element_register (plugin, "vaapisink", rank, GST_TYPE_VAAPISINK);
-+  gst_element_register (plugin, "vaapisink", GST_RANK_MARGINAL, GST_TYPE_VAAPISINK);
- 
- #if USE_ENCODERS
-   gst_vaapiencode_register (plugin, display);
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb +6 -10
similarity index 82%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.0.bb
index 1bedf25128..60a975bf4d 100644
@@ -8,28 +8,24 @@ REALPN = "gstreamer-vaapi"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \
-           file://0001-vaapsink-downgrade-to-marginal.patch \
-           "
+SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "13f7cb6a64bde24e67f563377487dcce"
-SRC_URI[sha256sum] = "191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601"
+SRC_URI[md5sum] = "079a3739857e0cf4904afe92659d8a18"
+SRC_URI[sha256sum] = "c6efeb8c736f75bb1b53ab18413c60c4321300e7aee66641bcc07d59c2fe9e31"
 
 S = "${WORKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 
-inherit meson pkgconfig gtk-doc features_check upstream-version-is-even
+inherit meson pkgconfig features_check upstream-version-is-even
 
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Dexamples=disabled \
+    -Dtests=enabled \
 "
 
-GTKDOC_MESON_OPTION = "gtk_doc"
-GTKDOC_MESON_ENABLE_FLAG = "enabled"
-GTKDOC_MESON_DISABLE_FLAG = "disabled"
-
 PACKAGES =+ "${PN}-tests"
 
 # OpenGL packageconfig factored out to make it easy for distros
Signature · 1 line
2.29.1
#41 lore raw

PATCH v5 16/22 gst-examples: upgrade to version 1.18.0

In reply to Jose Quaresma

DEPENDS:
- Upstream now depends on libsoup-2.4 and json-glib

---
 ...001-Make-player-examples-installable.patch | 24 +++++++++----------
 ...mples_1.16.0.bb => gst-examples_1.18.0.bb} |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gst-examples_1.16.0.bb => gst-examples_1.18.0.bb} (91%)
meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch +11 -13
index 0338bad1c0..ab93c13244 100644
@@ -1,4 +1,4 @@
-From 755f6dab07565aca7b6aefacad8be65de364ff75 Mon Sep 17 00:00:00 2001
+From 7924016fce2d0b435891a335cdae52fc939c7e3b Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <[email protected]>
 Date: Thu, 17 Aug 2017 11:07:02 +0300
 Subject: [PATCH] Make player examples installable
@@ -7,16 +7,17 @@ Signed-off-by: Jussi Kukkonen <[email protected]>
 Upstream-Status: Denied [Upstream considers these code examples, for now a least]
 
 https://bugzilla.gnome.org/show_bug.cgi?id=777827
+
 ---
  playback/player/gst-play/meson.build | 1 +
  playback/player/gtk/meson.build      | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build
-index 719b55b..a56fe13 100644
+index 8ec021d..977cc5c 100644
 --- a/playback/player/gst-play/meson.build
 +++ b/playback/player/gst-play/meson.build
-@@ -8,5 +8,6 @@ executable('gst-play',
+@@ -2,5 +2,6 @@ executable('gst-play',
      ['gst-play.c',
       'gst-play-kb.c',
       'gst-play-kb.h'],
@@ -24,16 +25,13 @@ index 719b55b..a56fe13 100644
      dependencies : [gst_dep, gstplayer_dep, m_dep])
  
 diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build
-index 08aae4f..671a65d 100644
+index f7a7419..6281130 100644
 --- a/playback/player/gtk/meson.build
 +++ b/playback/player/gtk/meson.build
-@@ -18,5 +18,6 @@ executable('gtk-play',
-       gtk_play_resources,
-      'gtk-video-renderer.h',
-      'gtk-video-renderer.c'],
+@@ -13,5 +13,6 @@ if gtk_dep.found()
+         gtk_play_resources,
+        'gtk-video-renderer.h',
+        'gtk-video-renderer.c'],
 +    install: true,
-     dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep])
- 
--- 
-2.13.3
-
+       dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep])
+ endif
meta/recipes-multimedia/gstreamer/gst-examples_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb +2 -2
similarity index 91%
rename from meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb
rename to meta/recipes-multimedia/gstreamer/gst-examples_1.18.0.bb
index e23d23d9ca..66db2f4eb8 100644
@@ -2,14 +2,14 @@ SUMMARY = "GStreamer examples (including gtk-play, gst-play)"
 LICENSE = "LGPL-2.0+"
 LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9"
 
-DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 glib-2.0-native"
+DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native"
 
 SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https \
            file://0001-Make-player-examples-installable.patch \
            file://gst-player.desktop \
            "
 
-SRCREV = "d953c127c1146b50d5676618299933950685dcd7"
+SRCREV = "009290dc8784e6714dc2a29be123110c14a38123"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.29.1
#42 lore raw

PATCH v5 17/22 gstreamer1.0-omx: upgrade to version 1.18.0

In reply to Jose Quaresma
---
 ...{gstreamer1.0-omx_1.16.2.bb => gstreamer1.0-omx_1.18.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.16.2.bb => gstreamer1.0-omx_1.18.0.bb} (92%)
meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb +2 -2
similarity index 92%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.0.bb
index f1bdbd235d..c4855034e0 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "6362786d2b6cce34de08c86b7847f782"
-SRC_URI[sha256sum] = "11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439"
+SRC_URI[md5sum] = "dcff9e4f055a2b1ecadc9f49f5b60a2e"
+SRC_URI[sha256sum] = "302c65e04578991364f7605e04cfb54dfd75268d51080d35f221ee1a8b341fad"
 
 S = "${WORKDIR}/gst-omx-${PV}"
 
Signature · 1 line
2.29.1
#43 lore raw

PATCH v5 18/22 gstreamer1.0-libav: upgrade to version 1.18.0

In reply to Jose Quaresma

License-Update: All code is now LGPL-2.1+

Starting with 1.17, we will not ship a copy of FFmpeg in our release tarballs, and all the remaining code is LGPL2.
https://gitlab.freedesktop.org/gstreamer/gst-libav/-/commit/c437e175ad9c82732ac46e36ccc398ad041bf13b

---
 .../gstreamer/gstreamer1.0-libav_1.16.2.bb    | 35 -------------------
 .../gstreamer/gstreamer1.0-libav_1.18.0.bb    | 21 +++++++++++
 2 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb deleted +0 -35
deleted file mode 100644
index 2fdefc925e..0000000000
@@ -1,35 +0,0 @@
-SUMMARY = "Libav-based GStreamer 1.x plugin"
-HOMEPAGE = "http://gstreamer.freedesktop.org/"
-SECTION = "multimedia"
-
-LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
-LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
-                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c"
-
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
-           "
-SRC_URI[md5sum] = "eacebd0136ede3a9bd3672eeb338806b"
-SRC_URI[sha256sum] = "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
-
-S = "${WORKDIR}/gst-libav-${PV}"
-
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
-
-inherit meson pkgconfig upstream-version-is-even
-
-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
-
-delete_unused_libav_copy() {
-        # When building with meson, the internal libav copy is not used.
-        # It is only present for legacy autotools based builds. In future
-        # GStreamer versions, the autotools scripts will be gone, and so
-        # will this internal copy. Until then, it will be present. In order
-        # to make sure this copy is not included in the -src package, just
-        # manually delete the copy.
-        rm -rf "${S}/gst-libs/ext/libav/"
-}
-
-do_unpack[postfuncs] += " delete_unused_libav_copy"
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb new file +21 -0
new file mode 100644
index 0000000000..a50f65e981
@@ -0,0 +1,21 @@
+SUMMARY = "Libav-based GStreamer 1.x plugin"
+HOMEPAGE = "http://gstreamer.freedesktop.org/"
+SECTION = "multimedia"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    "
+
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
+SRC_URI[md5sum] = "fe2f07356fa37445837cdde274027117"
+SRC_URI[sha256sum] = "42f93f5ce9a3fc22051e5f783a4574b56ebf213f331f75dcbc3552459bd3a06a"
+
+S = "${WORKDIR}/gst-libav-${PV}"
+
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
+
+inherit meson pkgconfig upstream-version-is-even
+
+FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
Signature · 1 line
2.29.1
#44 lore raw

PATCH v5 19/22 gst-devtools: add version 1.18.0 (gst-validate -> gst-devtools)

In reply to Jose Quaresma

The gst-validate tarball has been superseded by the gst-devtools tarball for consistency with the git module name.

---
 ...ct-has-a-different-signature-on-musl.patch | 10 ++---
 .../gstreamer/gst-devtools_1.18.0.bb          | 43 +++++++++++++++++++
 .../gstreamer/gst-validate_1.16.2.bb          | 25 -----------
 3 files changed, 48 insertions(+), 30 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gst-validate => gst-devtools}/0001-connect-has-a-different-signature-on-musl.patch (76%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-devtools_1.18.0.bb
 delete mode 100644 meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb
meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch renamed from meta/recipes-multimedia/gstreamer/gst-validate/0001-connect-has-a-different-signature-on-musl.patch +5 -5
similarity index 76%
rename from meta/recipes-multimedia/gstreamer/gst-validate/0001-connect-has-a-different-signature-on-musl.patch
rename to meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
index a0d215c5a0..c0e4581358 100644
@@ -1,4 +1,4 @@
-From 0bd8004d8dddc486d3961a5316d24e8f2645e4c8 Mon Sep 17 00:00:00 2001
+From 73b1002eda17451db1f58431b42c25203f1d3097 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sun, 9 Sep 2018 17:38:10 -0700
 Subject: [PATCH] connect has a different signature on musl
@@ -12,13 +12,13 @@ Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
 ---
- plugins/fault_injection/socket_interposer.c | 7 ++++++-
+ validate/plugins/fault_injection/socket_interposer.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/plugins/fault_injection/socket_interposer.c b/plugins/fault_injection/socket_interposer.c
+diff --git a/validate/plugins/fault_injection/socket_interposer.c b/validate/plugins/fault_injection/socket_interposer.c
 index 53c1ebb..ad7adf8 100644
---- a/plugins/fault_injection/socket_interposer.c
-+++ b/plugins/fault_injection/socket_interposer.c
+--- a/validate/plugins/fault_injection/socket_interposer.c
++++ b/validate/plugins/fault_injection/socket_interposer.c
 @@ -100,10 +100,15 @@ socket_interposer_set_callback (struct sockaddr_in *addrin,
  }
  
meta/recipes-multimedia/gstreamer/gst-devtools_1.18.0.bb new file +43 -0

43 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb deleted +0 -25
deleted file mode 100644
index 35492fe861..0000000000
@@ -1,25 +0,0 @@
-SUMMARY = "Gstreamer validation tool"
-DESCRIPTION = "A Tool to test GStreamer components"
-HOMEPAGE = "https://gstreamer.freedesktop.org/releases/gst-validate/1.12.3.html"
-SECTION = "multimedia"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \
-           file://0001-connect-has-a-different-signature-on-musl.patch \
-           "
-SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c"
-SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca"
-
-DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
-RRECOMMENDS_${PN} = "git"
-
-FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"
-
-inherit pkgconfig gettext autotools gobject-introspection gtk-doc upstream-version-is-even
-
-# With gtk-doc enabled this recipe fails to build, so forcibly disable it:
-# WORKDIR/build/docs/validate/gst-validate-scan: line 117:
-# WORKDIR/build/docs/validate/.libs/lt-gst-validate-scan: No such file or directory
-GTKDOC_ENABLED = "False"
Signature · 1 line
2.29.1
#45 lore raw

PATCH v5 20/22 orc: Upgrade 0.4.31 -> 0.4.32

In reply to Jose Quaresma
---
 meta/recipes-devtools/orc/{orc_0.4.31.bb => orc_0.4.32.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/orc/{orc_0.4.31.bb => orc_0.4.32.bb} (86%)
meta/recipes-devtools/orc/orc_0.4.32.bb renamed from meta/recipes-devtools/orc/orc_0.4.31.bb +1 -2
similarity index 86%
rename from meta/recipes-devtools/orc/orc_0.4.31.bb
rename to meta/recipes-devtools/orc/orc_0.4.32.bb
index cd4dc31d70..a55b43b8ef 100644
@@ -4,8 +4,7 @@ LICENSE = "BSD-2-Clause & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1400bd9d09e8af56b9ec982b3d85797e"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/orc/orc-${PV}.tar.xz"
-SRC_URI[md5sum] = "b6b95a47eff713e91873e2c2b1a5b3ad"
-SRC_URI[sha256sum] = "a0ab5f10a6a9ae7c3a6b4218246564c3bf00d657cbdf587e6d34ec3ef0616075"
+SRC_URI[sha256sum] = "a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0"
 
 inherit meson pkgconfig gtk-doc
 
Signature · 1 line
2.29.1
#46 lore raw

PATCH v5 21/22 gstreamer1.0-plugins-good: on wayland qt5 needs qtwayland

In reply to Jose Quaresma

The code in ext/qt/meson.build looks for the Qt5WaylandClient pkg-config file. Without this module, qmlglsink will not work with Wayland.
This can be tested by checking whether or not HAVE_QT_WAYLAND has been added to the cflags in the autogenerated ninja file.

Writen by:
Carlos Rafael Giani
https://lists.openembedded.org/g/openembedded-core/message/143574

---
 .../gstreamer/gstreamer1.0-plugins-good_1.18.0.bb             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.bb +3 -1
index 860b31106f..4eb0dd7e05 100644
@@ -28,6 +28,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
 X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled -Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
 X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"
 
+QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+
 PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm"
 PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
 PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"
@@ -43,7 +45,7 @@ PACKAGECONFIG[libpng]     = "-Dpng=enabled,-Dpng=disabled,libpng"
 PACKAGECONFIG[libv4l2]    = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils"
 PACKAGECONFIG[mpg123]     = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
 PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
-PACKAGECONFIG[qt5]        = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native"
+PACKAGECONFIG[qt5]        = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}"
 PACKAGECONFIG[soup]       = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4"
 PACKAGECONFIG[speex]      = "-Dspeex=enabled,-Dspeex=disabled,speex"
 PACKAGECONFIG[taglib]     = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
Signature · 1 line
2.29.1
#47 lore raw

PATCH v5 22/22 gstreamer1.0-libav: add comercial license flags as ffmpeg needs this

In reply to Jose Quaresma
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb +2 -0
index a50f65e981..9fe7957daa 100644
@@ -2,6 +2,8 @@ SUMMARY = "Libav-based GStreamer 1.x plugin"
 HOMEPAGE = "http://gstreamer.freedesktop.org/"
 SECTION = "multimedia"
 
+# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency
+LICENSE_FLAGS = "commercial"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
                     file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
Signature · 1 line
2.29.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#49 lore raw

Re: [OE-core] [PATCH v5 02/22] gstreamer1.0: upgrade to version 1.18.0

Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia quinta, 29/10/2020 à(s) 14:28:

Quoted 22 lines

* 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch Submited
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669

* 0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch Removed since these are included in 1.18.0

* 0003-meson-Add-valgrind-feature.patch
Removed because upstream don't depend anymore on valgrind
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595

* 0002-Remove-unused-valgrind-detection.patch
Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/a2cbf75523cdf8a4df1baa7007d86ef455972245

API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc.
Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch.

Quoted 8 lines
---
 ...der.c-when-env-var-is-set-do-not-fal.patch |  16 +--
 ...002-Remove-unused-valgrind-detection.patch | 112 ++++++++++++++++++
 ...even-when-cross-compiling-if-introsp.patch |  36 ------
 ...eson-Add-option-for-installed-tests.patch} |  20 ++--
 .../0003-meson-Add-valgrind-feature.patch     |  74 ------------
 .../gstreamer/gstreamer1.0/0004-capfix.patch  |  48 ++++++++

I forgot to remove the ../gstreamer/gstreamer1.0/0004-capfix.patch This is not need any more and its dropped on the last commit

Quoted 489 lines
 ...er1.0_1.16.2.bb => gstreamer1.0_1.18.0.bb} |  24 ++--
 7 files changed, 188 insertions(+), 142 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch
 rename meta/recipes-multimedia/gstreamer/gstreamer1.0/{0004-meson-Add-option-for-installed-tests.patch => 0003-meson-Add-option-for-installed-tests.patch} (97%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-valgrind-feature.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-capfix.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.16.2.bb => gstreamer1.0_1.18.0.bb} (78%)
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch +9 -7
index 67a872cddb..17f8a0beb7 100644
@@ -1,7 +1,7 @@
-From a1d7c582392c8bc87fa9411af77b20e011944357 Mon Sep 17 00:00:00 2001
+From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 25 Jan 2018 17:55:02 +0200
-Subject: [PATCH] gst/gstpluginloader.c: when env var is set do not fall
+Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall
  through to system plugin scanner
 
 If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that.
@@ -9,17 +9,19 @@ If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that
 Falling through to the one installed on the system is problamatic in cross-compilation
 environemnts, regardless of whether one pointed to by the env var succeeded or failed.
 
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
+written by: Alexander Kanavin <[email protected]>
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669]
+Signed-off-by: Jose Quaresma <[email protected]>
 ---
  gst/gstpluginloader.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
-index 430829d..3a75731 100644
+index d1e404d..2e00c3c 100644
 --- a/gst/gstpluginloader.c
 +++ b/gst/gstpluginloader.c
-@@ -471,9 +471,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
+@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
      helper_bin = g_strdup (env);
      res = gst_plugin_loader_try_helper (loader, helper_bin);
      g_free (helper_bin);
@@ -31,5 +33,5 @@ index 430829d..3a75731 100644
 
  #ifdef G_OS_WIN32
 --
-2.15.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch new file +112 -0
new file mode 100644
index 0000000000..c8bd58d471
@@ -0,0 +1,112 @@
+From 355dd938bfb2cd36d6c3c4ed59ba1dcafdc78d95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
+Date: Fri, 14 Aug 2020 16:38:26 +0100
+Subject: [PATCH 2/4] Remove unused valgrind detection
+
+Having this just to log a debug message in case we're
+running inside valgrind doesn't seem very useful, and
+the code that used to use this no longer exists it seems.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595>
+
+Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
+
+Signed-off-by: Jose Quaresma <[email protected]>
+---
+ gst/gst_private.h |  2 --
+ gst/gstinfo.c     | 39 ---------------------------------------
+ meson.build       |  1 -
+ 3 files changed, 42 deletions(-)
+
+diff --git a/gst/gst_private.h b/gst/gst_private.h
+index 1b0f02b..a8897e1 100644
+--- a/gst/gst_private.h
++++ b/gst/gst_private.h
+@@ -116,8 +116,6 @@ G_GNUC_INTERNAL  gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin
+
+ G_GNUC_INTERNAL  gboolean _priv_plugin_deps_files_changed (GstPlugin * plugin);
+
+-G_GNUC_INTERNAL  gboolean _priv_gst_in_valgrind (void);
+-
+ /* init functions called from gst_init(). */
+ G_GNUC_INTERNAL  void  _priv_gst_quarks_initialize (void);
+ G_GNUC_INTERNAL  void  _priv_gst_mini_object_initialize (void);
+diff --git a/gst/gstinfo.c b/gst/gstinfo.c
+index 37987d3..15f522e 100644
+--- a/gst/gstinfo.c
++++ b/gst/gstinfo.c
+@@ -304,36 +304,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT;
+ static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT;
+ static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON;
+
+-/* FIXME: export this? */
+-gboolean
+-_priv_gst_in_valgrind (void)
+-{
+-  static enum
+-  {
+-    GST_VG_UNCHECKED,
+-    GST_VG_NO_VALGRIND,
+-    GST_VG_INSIDE
+-  }
+-  in_valgrind = GST_VG_UNCHECKED;
+-
+-  if (in_valgrind == GST_VG_UNCHECKED) {
+-#ifdef HAVE_VALGRIND_VALGRIND_H
+-    if (RUNNING_ON_VALGRIND) {
+-      GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside valgrind");
+-      in_valgrind = GST_VG_INSIDE;
+-    } else {
+-      GST_CAT_LOG (GST_CAT_GST_INIT, "not doing extra valgrind stuff");
+-      in_valgrind = GST_VG_NO_VALGRIND;
+-    }
+-#else
+-    in_valgrind = GST_VG_NO_VALGRIND;
+-#endif
+-    g_assert (in_valgrind == GST_VG_NO_VALGRIND ||
+-        in_valgrind == GST_VG_INSIDE);
+-  }
+-  return (in_valgrind == GST_VG_INSIDE);
+-}
+-
+ static gchar *
+ _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token,
+     guint val)
+@@ -462,9 +432,6 @@ _priv_gst_debug_init (void)
+   _priv_GST_CAT_PROTECTION =
+       _gst_debug_category_new ("GST_PROTECTION", 0, "protection");
+
+-  /* print out the valgrind message if we're in valgrind */
+-  _priv_gst_in_valgrind ();
+-
+   env = g_getenv ("GST_DEBUG_OPTIONS");
+   if (env != NULL) {
+     if (strstr (env, "full_tags") || strstr (env, "full-tags"))
+@@ -2502,12 +2469,6 @@ gst_debug_construct_win_color (guint colorinfo)
+   return 0;
+ }
+
+-gboolean
+-_priv_gst_in_valgrind (void)
+-{
+-  return FALSE;
+-}
+-
+ void
+ _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
+     const gchar * func, gint line, GObject * obj, const gchar * msg,
+diff --git a/meson.build b/meson.build
+index f95b4f7..143c043 100644
+--- a/meson.build
++++ b/meson.build
+@@ -200,7 +200,6 @@ check_headers = [
+   'sys/wait.h',
+   'ucontext.h',
+   'unistd.h',
+-  'valgrind/valgrind.h',
+   'sys/resource.h',
+   'sys/uio.h',
+ ]
+--
+2.28.0
+
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted +0 -36
deleted file mode 100644
index 1ed7198a5c..0000000000
@@ -1,36 +0,0 @@
-From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Thu, 17 Oct 2019 12:13:35 +0100
-Subject: [PATCH] meson: build gir even when cross-compiling if introspection
- was enabled explicitly
-
-This can be made to work in certain circumstances when
-cross-compiling, so default to not building g-i stuff
-when cross-compiling, but allow it if introspection was
-enabled explicitly via -Dintrospection=enabled.
-
-Fixes #454 and #381.
-
-Upstream-Status: Backport [35db4a2433fbdf8612cf98b5aab5b14aeb5372f8]
-
-Signed-off-by: Carlos Rafael Giani <[email protected]>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 90d98d8eb..a47e7f34e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -466,7 +466,7 @@ rt_lib = cc.find_library('rt', required : false)
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
-
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
-     'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
---
-2.17.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-meson-Add-option-for-installed-tests.patch +10 -10
similarity index 97%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-meson-Add-option-for-installed-tests.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch
index 0e6c44ea32..1c0e1f8171 100644
@@ -1,7 +1,7 @@
-From b843400284751968862751dfe93853f151551c64 Mon Sep 17 00:00:00 2001
+From 24867db22a5cc35e7643bc218e959ce56c306aca Mon Sep 17 00:00:00 2001
 From: Carlos Rafael Giani <[email protected]>
 Date: Fri, 25 Oct 2019 00:06:26 +0200
-Subject: [PATCH] meson: Add option for installed tests
+Subject: [PATCH 3/4] meson: Add option for installed tests
 
 This adds an option for producing installed versions of the unit tests.
 These versions don't need meson to run (only a small shell script). This
@@ -77,10 +77,10 @@ index 0000000..5da86fb
 +write_template(args.output, build_template(args.test_execdir, args.testname))
 +os.chmod(args.output, 0o755)
 diff --git a/meson_options.txt b/meson_options.txt
-index 8afde39..8884dcc 100644
+index 72c3997..346c423 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -16,6 +16,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
+@@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
  option('memory-alignment', type: 'combo',
         choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],
         value: 'malloc')
@@ -90,10 +90,10 @@ index 8afde39..8884dcc 100644
  # Feature options
  option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 04da83f..2db7f76 100644
+index 372ea41..bb0dcfa 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -118,11 +118,17 @@ if add_languages('cpp', required : false)
+@@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false)
    ]
  endif
 
@@ -109,10 +109,10 @@ index 04da83f..2db7f76 100644
    '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
 -  '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
 +  '-DTESTFILE="@0@"'.format(test_files_path + '/testfile'),
-   '-DGST_USE_UNSTABLE_API',
    '-DGST_DISABLE_DEPRECATED',
  ]
-@@ -137,6 +143,14 @@ endif
+
+@@ -138,6 +144,14 @@ endif
  glib_deps = [gio_dep, gobject_dep, gmodule_dep, glib_dep]
  gst_deps = [gst_dep, gst_base_dep, gst_check_dep, gst_net_dep, gst_controller_dep]
 
@@ -127,7 +127,7 @@ index 04da83f..2db7f76 100644
  foreach t : core_tests
    fname = t[0]
    test_name = fname.split('.')[0].underscorify()
-@@ -150,8 +164,38 @@ foreach t : core_tests
+@@ -151,8 +165,38 @@ foreach t : core_tests
          include_directories : [configinc],
          link_with : link_with_libs,
          dependencies : test_deps + glib_deps + gst_deps,
@@ -253,5 +253,5 @@ index 0000000..89954e0
 +................................................................................
 +................................................................................
 --
-2.17.1
+2.28.0
 
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-valgrind-feature.patch deleted +0 -74
deleted file mode 100644
index f553340f4d..0000000000
@@ -1,74 +0,0 @@
-From f6c7973c03d9ba7dab60c496e768c5e6c4ee824c Mon Sep 17 00:00:00 2001
-From: Carlos Rafael Giani <[email protected]>
-Date: Sun, 20 Oct 2019 10:36:44 +0200
-Subject: [PATCH] meson: Add valgrind feature
-
-This allows for enabling/disabling Valgrind support. Since Valgrind is
-an external dependency, such a feature is needed by build environemnts
-such as Yocto to make sure builds are deterministic. These changes also
-add more Valgrind specific configure log output.
-
-Upstream-Status: Pending
-
-Signed-off-by: Carlos Rafael Giani <[email protected]>
----
- meson.build       | 23 ++++++++++++++++++++++-
- meson_options.txt |  1 +
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b55ecc5..4751761 100644
---- a/meson.build
-+++ b/meson.build
-@@ -199,7 +199,6 @@ check_headers = [
-   'sys/wait.h',
-   'ucontext.h',
-   'unistd.h',
--  'valgrind/valgrind.h',
-   'sys/resource.h',
- ]
-
-@@ -214,6 +213,28 @@ foreach h : check_headers
-   endif
- endforeach
-
-+valgrind_option = get_option('valgrind')
-+if valgrind_option.disabled()
-+  message('Valgrind support not requested; disabled.')
-+else
-+  valgrind_header = 'valgrind/valgrind.h'
-+  has_valgrind_header = cc.has_header(valgrind_header)
-+  if has_valgrind_header
-+    message('Valgrind support requested, and header ' + valgrind_header + \
-+        ' found. Enabled Valgrind support.')
-+    define = 'HAVE_' + valgrind_header.underscorify().to_upper()
-+    cdata.set(define, 1)
-+  else
-+    if valgrind_option.enabled()
-+      error('Valgrind support requested and set as required, but header ' + \
-+        valgrind_header + ' not found.')
-+    else
-+      message('Valgrind support requested, but header ' + valgrind_header + \
-+        ' not found. Disabling Valgrind support.')
-+    endif
-+  endif
-+endif
-+
- if cc.has_member('struct tm', 'tm_gmtoff', prefix : '#include <time.h>')
-   cdata.set('HAVE_TM_GMTOFF', 1)
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index e7ff7ba..8afde39 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -19,6 +19,7 @@ option('memory-alignment', type: 'combo',
-
- # Feature options
- option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
-+option('valgrind', type : 'feature', value : 'auto', description : 'Enable Valgrind support')
- option('libunwind', type : 'feature', value : 'auto', description : 'Use libunwind to generate backtraces')
- option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind')
- option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces')
---
-2.17.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-capfix.patch new file +48 -0
new file mode 100644
index 0000000000..32e9610cff
@@ -0,0 +1,48 @@
+From 9607e9858d681f5ad2e1677f5dbbb1fb61bd8846 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <[email protected]>
+Date: Sun, 18 Oct 2020 10:40:59 +0100
+Subject: [PATCH 4/4] Currently gstreamer configuration depends on whether
+ setcap is found on the host system. Turn this into a configure option to make
+ builds deterinistic.
+
+RP 2020/2/19
+Signed-off-by: Richard Purdie <[email protected]>
+Upstream-Status: Pending
+---
+ libs/gst/helpers/meson.build | 7 ++++++-
+ meson_options.txt            | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libs/gst/helpers/meson.build b/libs/gst/helpers/meson.build
+index 9e5a4ae..c2e540f 100644
+--- a/libs/gst/helpers/meson.build
++++ b/libs/gst/helpers/meson.build
+@@ -66,7 +66,12 @@ if have_ptp
+       description : 'getifaddrs() and AF_LINK is available')
+   endif
+
+-  setcap_prog = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  setcap_feature = get_option('setcap')
++  if setcap_feature.disabled()
++    setcap_prog = find_program('dontexist', required : false)
++  else
++    setcap_prog = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  endif
+   cap_dep = dependency('libcap', required: false)
+
+   # user/group to change to in gst-ptp-helper
+diff --git a/meson_options.txt b/meson_options.txt
+index 346c423..03338ad 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -25,6 +25,7 @@ option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to ge
+ option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces')
+ option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
+ option('coretracers', type : 'feature', value : 'auto', description : 'Build coretracers plugin')
++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap')
+
+ # Common feature options
+ option('examples', type : 'feature', value : 'auto', yield : true)
+--
+2.28.0
+
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb +9 -16
similarity index 78%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.bb
index 9d92fe1439..d382655bcb 100644
@@ -8,22 +8,20 @@ LICENSE = "LGPLv2+"
 
 DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"
 
-inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
+inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
 S = "${WORKDIR}/gstreamer-${PV}"
 
-SRC_URI = " \
-    https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-    file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
-    file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
-    file://0003-meson-Add-valgrind-feature.patch \
-    file://0004-meson-Add-option-for-installed-tests.patch \
-"
-SRC_URI[md5sum] = "0e661ed5bdf1d8996e430228d022628e"
-SRC_URI[sha256sum] = "e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
+           file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
+           file://0002-Remove-unused-valgrind-detection.patch \
+           file://0003-meson-Add-option-for-installed-tests.patch \
+           "
+SRC_URI[md5sum] = "25d683630ff8b82b2c878aa3edd3c491"
+SRC_URI[sha256sum] = "0ff09245b06c0aeb5d9a156edcab088a7e8213a0bf9c84a1ff0318f9c00c7805"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    check \
@@ -34,7 +32,6 @@ PACKAGECONFIG[debug] = "-Dgst_debug=true,-Dgst_debug=false"
 PACKAGECONFIG[tracer-hooks] = "-Dtracer_hooks=true,-Dtracer_hooks=false"
 PACKAGECONFIG[check] = "-Dcheck=enabled,-Dcheck=disabled"
 PACKAGECONFIG[tests] = "-Dtests=enabled -Dinstalled-tests=true,-Dtests=disabled -Dinstalled-tests=false"
-PACKAGECONFIG[valgrind] = "-Dvalgrind=enabled,-Dvalgrind=disabled,valgrind,"
 PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
@@ -51,15 +48,12 @@ def gettext_oemeson(d):
     return '-Dnls=enabled'
 
 EXTRA_OEMESON += " \
+    -Ddoc=disabled \
     -Dexamples=disabled \
     -Ddbghelp=disabled \
     ${@gettext_oemeson(d)} \
 "
 
-GTKDOC_MESON_OPTION = "gtk_doc"
-GTKDOC_MESON_ENABLE_FLAG = "enabled"
-GTKDOC_MESON_DISABLE_FLAG = "disabled"
-
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
 
--

2.29.1

Signature · 2 lines
best regards,
José Quaresma