From: "Jose Quaresma" <quaresma.jose@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Jose Quaresma <quaresma.jose@gmail.com>
Subject: [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap
Date: Thu, 29 Oct 2020 14:27:45 +0000 [thread overview]
Message-ID: <20201029142806.1830504-2-quaresma.jose@gmail.com> (raw)
In-Reply-To: <20201029142806.1830504-1-quaresma.jose@gmail.com>
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'
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
.../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
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
deleted file mode 100644
index 7ca3d5ad4a..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
+++ /dev/null
@@ -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 <richard.purdie@linuxfoundation.org>
-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)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb
index 50a872e292..9d92fe1439 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb
@@ -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):
--
2.29.1
next prev parent reply other threads:[~2020-10-29 14:28 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 14:27 [PATCH v5 00/22] Updates the gstreamer to version 1.18.0 Jose Quaresma
2020-10-29 14:27 ` Jose Quaresma [this message]
2020-10-29 15:32 ` [OE-core] [PATCH v5 01/22] gstreamer1.0: Fix reproducibility issue around libcap Richard Purdie
2020-10-29 16:13 ` Jose Quaresma
2020-10-29 16:43 ` Richard Purdie
2020-10-29 16:58 ` Jose Quaresma
[not found] ` <1642850E1E948AB3.32334@lists.openembedded.org>
2020-10-29 22:10 ` Jose Quaresma
2020-10-29 22:42 ` Richard Purdie
2020-10-29 14:27 ` [PATCH v5 02/22] gstreamer1.0: upgrade to version 1.18.0 Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 03/22] gstreamer1.0-plugins-base: " Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 04/22] gstreamer1.0-plugins-base: add new meson option as PACKAGECONFIG Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 05/22] gstreamer1.0-plugins-good: upgrade to version 1.18.0 Jose Quaresma
2020-10-29 16:06 ` [OE-core] " Richard Purdie
2020-10-29 22:14 ` Jose Quaresma
[not found] ` <1642964F5C513D13.27950@lists.openembedded.org>
2020-10-29 22:54 ` Jose Quaresma
[not found] ` <1642987B07D196A5.27950@lists.openembedded.org>
2020-10-30 16:47 ` Jose Quaresma
2020-10-30 17:45 ` Richard Purdie
2020-10-30 17:57 ` Jose Quaresma
[not found] ` <1642D6DB2EF0C3ED.10902@lists.openembedded.org>
2020-10-30 18:23 ` Jose Quaresma
2020-10-30 18:28 ` Alexander Kanavin
2020-10-30 18:35 ` Jose Quaresma
2020-10-30 19:23 ` Richard Purdie
2020-10-31 0:49 ` Richard Purdie
2020-10-31 11:49 ` Jose Quaresma
2020-10-31 18:54 ` Alexander Kanavin
2020-10-31 18:56 ` Alexander Kanavin
2020-11-01 21:08 ` Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 06/22] gstreamer1.0-plugins-good: disable new meson options Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 07/22] gstreamer1.0-plugins-good: add new meson option as PACKAGECONFIG Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 08/22] gstreamer1.0-plugins-bad: upgrade to version 1.18.0 Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 09/22] gstreamer1.0-plugins-bad: disable new meson options Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 10/22] gstreamer1.0-plugins-bad: add new meson options as PACKAGECONFIG Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 11/22] gstreamer1.0-plugins-ugly: upgrade to version 1.18.0 Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 12/22] gstreamer1.0-python: " Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 13/22] gstreamer1.0-python: install append is not need any more Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 14/22] gstreamer1.0-rtsp-server: upgrade to version 1.18.0 Jose Quaresma
2020-10-29 14:27 ` [PATCH v5 15/22] gstreamer1.0-vaapi: " Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 16/22] gst-examples: " Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 17/22] gstreamer1.0-omx: " Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 18/22] gstreamer1.0-libav: " Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 19/22] gst-devtools: add version 1.18.0 (gst-validate -> gst-devtools) Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 20/22] orc: Upgrade 0.4.31 -> 0.4.32 Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 21/22] gstreamer1.0-plugins-good: on wayland qt5 needs qtwayland Jose Quaresma
2020-10-29 14:28 ` [PATCH v5 22/22] gstreamer1.0-libav: add comercial license flags as ffmpeg needs this Jose Quaresma
[not found] ` <16427CDA53DAE3E8.561@lists.openembedded.org>
2020-10-29 22:14 ` [OE-core] [PATCH v5 02/22] gstreamer1.0: upgrade to version 1.18.0 Jose Quaresma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201029142806.1830504-2-quaresma.jose@gmail.com \
--to=quaresma.jose@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox