diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-09-11 15:54:34 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-11 15:54:34 -0300 |
commit | 16e0d07d36787d14e9d00ff8123419863d1f19d2 (patch) | |
tree | 36a413f5702cd2d29b5023ec0762b71c27e4fac3 /recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch | |
parent | 25e9cbddbd32802634bafef62ba08da9821c604d (diff) | |
parent | b821d72e7b7fc250eb80fa43a79ce31b88863239 (diff) | |
download | meta-freescale-16e0d07d36787d14e9d00ff8123419863d1f19d2.tar.gz |
Merge pull request #859 from angolini/hardknott+bsp
Backport NXP BSP 5.10.35_2.0.0 to Hardknott
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch deleted file mode 100644 index 7ca3d5ad..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Currently gstreamer configuration depends on whether setcap is found on the host | ||
2 | system. Turn this into a configure option to make builds deterinistic. | ||
3 | |||
4 | RP 2020/2/19 | ||
5 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: gstreamer-1.16.1/libs/gst/helpers/meson.build | ||
9 | =================================================================== | ||
10 | --- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build | ||
11 | +++ gstreamer-1.16.1/libs/gst/helpers/meson.build | ||
12 | @@ -73,7 +73,12 @@ if have_ptp | ||
13 | endif | ||
14 | endif | ||
15 | |||
16 | - setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) | ||
17 | + setcap_feature = get_option('setcap') | ||
18 | + if setcap_feature.disabled() | ||
19 | + setcap = find_program('dontexist', required : false) | ||
20 | + else | ||
21 | + setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) | ||
22 | + endif | ||
23 | |||
24 | # user/group to change to in gst-ptp-helper | ||
25 | ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') | ||
26 | Index: gstreamer-1.16.1/meson_options.txt | ||
27 | =================================================================== | ||
28 | --- gstreamer-1.16.1.orig/meson_options.txt | ||
29 | +++ gstreamer-1.16.1/meson_options.txt | ||
30 | @@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va | ||
31 | option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') | ||
32 | option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') | ||
33 | option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') | ||
34 | +option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') | ||
35 | |||
36 | # Common feature options | ||
37 | option('examples', type : 'feature', value : 'auto', yield : true) | ||