diff options
18 files changed, 379 insertions, 36 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch new file mode 100644 index 00000000..6891c600 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch | |||
@@ -0,0 +1,115 @@ | |||
1 | From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Takashi Iwai <tiwai@suse.de> | ||
3 | Date: Sat, 9 Sep 2023 17:42:03 +0200 | ||
4 | Subject: [PATCH] pcm: Fix segfault with 32bit libs | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7] | ||
7 | |||
8 | The recent rearrangement of header inclusion order caused a regression | ||
9 | showing segfaults on 32bit Arm. The primary reason is the | ||
10 | inconsistent compile condition depending on the inclusion of config.h; | ||
11 | while most of other code include pcm_local.h (that implicitly includes | ||
12 | config.h) at first, pcm_direct.c doesn't do it, hence the access with | ||
13 | direct plugins crashes. | ||
14 | |||
15 | For fixing it, we need to include config.h at the beginning. But, | ||
16 | it's better to include pcm_local.h for all relevant code for | ||
17 | consistency. The patch does it, and also it adds the guard in | ||
18 | pcm_local.h for double inclusions. | ||
19 | |||
20 | Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first") | ||
21 | Link: https://github.com/alsa-project/alsa-lib/issues/352 | ||
22 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | ||
23 | --- | ||
24 | src/pcm/pcm_direct.c | 1 + | ||
25 | src/pcm/pcm_dmix.c | 2 +- | ||
26 | src/pcm/pcm_dshare.c | 1 + | ||
27 | src/pcm/pcm_dsnoop.c | 1 + | ||
28 | src/pcm/pcm_local.h | 5 +++++ | ||
29 | src/pcm/pcm_shm.c | 1 + | ||
30 | 6 files changed, 10 insertions(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c | ||
33 | index 040fc160..e53e5923 100644 | ||
34 | --- a/src/pcm/pcm_direct.c | ||
35 | +++ b/src/pcm/pcm_direct.c | ||
36 | @@ -19,6 +19,7 @@ | ||
37 | * | ||
38 | */ | ||
39 | |||
40 | +#include "pcm_local.h" | ||
41 | #include <stdio.h> | ||
42 | #include <stdlib.h> | ||
43 | #include <stddef.h> | ||
44 | diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c | ||
45 | index 7cd3c508..55cae3e7 100644 | ||
46 | --- a/src/pcm/pcm_dmix.c | ||
47 | +++ b/src/pcm/pcm_dmix.c | ||
48 | @@ -26,7 +26,7 @@ | ||
49 | * | ||
50 | */ | ||
51 | |||
52 | -#include "config.h" | ||
53 | +#include "pcm_local.h" | ||
54 | #include <stdio.h> | ||
55 | #include <stdlib.h> | ||
56 | #include <stddef.h> | ||
57 | diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c | ||
58 | index 454b39a9..c0329098 100644 | ||
59 | --- a/src/pcm/pcm_dshare.c | ||
60 | +++ b/src/pcm/pcm_dshare.c | ||
61 | @@ -26,6 +26,7 @@ | ||
62 | * | ||
63 | */ | ||
64 | |||
65 | +#include "pcm_local.h" | ||
66 | #include <stdio.h> | ||
67 | #include <stdlib.h> | ||
68 | #include <stddef.h> | ||
69 | diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c | ||
70 | index d3ce300c..bf67c68a 100644 | ||
71 | --- a/src/pcm/pcm_dsnoop.c | ||
72 | +++ b/src/pcm/pcm_dsnoop.c | ||
73 | @@ -26,6 +26,7 @@ | ||
74 | * | ||
75 | */ | ||
76 | |||
77 | +#include "pcm_local.h" | ||
78 | #include <stdio.h> | ||
79 | #include <stdlib.h> | ||
80 | #include <stddef.h> | ||
81 | diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h | ||
82 | index 6a0e71e7..152c92c3 100644 | ||
83 | --- a/src/pcm/pcm_local.h | ||
84 | +++ b/src/pcm/pcm_local.h | ||
85 | @@ -20,6 +20,9 @@ | ||
86 | * | ||
87 | */ | ||
88 | |||
89 | +#ifndef __PCM_LOCAL_H | ||
90 | +#define __PCM_LOCAL_H | ||
91 | + | ||
92 | #include "config.h" | ||
93 | |||
94 | #include <stdio.h> | ||
95 | @@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm) | ||
96 | #define snd_pcm_lock(pcm) do {} while (0) | ||
97 | #define snd_pcm_unlock(pcm) do {} while (0) | ||
98 | #endif /* THREAD_SAFE_API */ | ||
99 | + | ||
100 | +#endif /* __PCM_LOCAL_H */ | ||
101 | diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c | ||
102 | index f0bfd934..d9596547 100644 | ||
103 | --- a/src/pcm/pcm_shm.c | ||
104 | +++ b/src/pcm/pcm_shm.c | ||
105 | @@ -26,6 +26,7 @@ | ||
106 | * | ||
107 | */ | ||
108 | |||
109 | +#include "pcm_local.h" | ||
110 | #include <stdio.h> | ||
111 | #include <stdlib.h> | ||
112 | #include <stddef.h> | ||
113 | -- | ||
114 | 2.25.1 | ||
115 | |||
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch new file mode 100644 index 00000000..5ec0d2e9 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From aa4f56c3c952269c36464cc0da9db5a1381648fa Mon Sep 17 00:00:00 2001 | ||
2 | From: Jaroslav Kysela <perex@perex.cz> | ||
3 | Date: Wed, 9 Nov 2022 08:11:42 +0100 | ||
4 | Subject: [PATCH] pcm: rate - fix the crash in | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | snd_pcm_rate_may_wait_for_avail_min() | ||
9 | |||
10 | The pcm argument passed to the conversion function in | ||
11 | snd_pcm_plugin_may_wait_for_avail_min_conv() should be | ||
12 | pcm->fast_op_arg. | ||
13 | |||
14 | Test command: arecord -Dplughw:x -r12000 -c2 -fS16_LE -M temp.wav | ||
15 | |||
16 | Fixes: d9dbb57b ("pcm: rate - rewrite the may_wait_for_avail_min callback for the rate plugin") | ||
17 | |||
18 | BugLink: https://lore.kernel.org/alsa-devel/1667793912-18957-1-git-send-email-shengjiu.wang@nxp.com/ | ||
19 | Fixes: https://github.com/alsa-project/alsa-lib/issues/282 | ||
20 | Reported-by: Shengjiu Wang <shengjiu.wang@nxp.com> | ||
21 | Signed-off-by: Jaroslav Kysela <perex@perex.cz> | ||
22 | --- | ||
23 | src/pcm/pcm_plugin.c | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c | ||
27 | index 6bb90b8b..ec64604c 100644 | ||
28 | --- a/src/pcm/pcm_plugin.c | ||
29 | +++ b/src/pcm/pcm_plugin.c | ||
30 | @@ -622,7 +622,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv( | ||
31 | * This code is also used by extplug, but extplug does not allow to alter the sampling rate. | ||
32 | */ | ||
33 | if (conv) | ||
34 | - needed_slave_avail_min = conv(pcm, needed_slave_avail_min); | ||
35 | + needed_slave_avail_min = conv(pcm->fast_op_arg, needed_slave_avail_min); | ||
36 | |||
37 | if (slave->avail_min != needed_slave_avail_min) { | ||
38 | snd_pcm_sw_params_t *swparams; | ||
39 | -- | ||
40 | 2.34.1 | ||
41 | |||
diff --git a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch new file mode 100644 index 00000000..64e15be4 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch | |||
@@ -0,0 +1,107 @@ | |||
1 | From 97d5e09a4166b45c567026e51b8a25ef5d7d587d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chancel Liu <chancel.liu@nxp.com> | ||
3 | Date: Fri, 29 Jul 2022 16:12:37 +0800 | ||
4 | Subject: [PATCH] add conf for imx-cs42448 sound card | ||
5 | |||
6 | Upstream-Status: Inappropriate [i.MXÂ specific] | ||
7 | |||
8 | Signed-off-by: Chancel Liu <chancel.liu@nxp.com> | ||
9 | --- | ||
10 | src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++ | ||
11 | src/conf/cards/Makefile.am | 3 +- | ||
12 | src/conf/cards/aliases.conf | 1 + | ||
13 | 3 files changed, 61 insertions(+), 1 deletion(-) | ||
14 | create mode 100644 src/conf/cards/CS42448.conf | ||
15 | |||
16 | diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf | ||
17 | new file mode 100644 | ||
18 | index 00000000..28ba5c48 | ||
19 | --- /dev/null | ||
20 | +++ b/src/conf/cards/CS42448.conf | ||
21 | @@ -0,0 +1,58 @@ | ||
22 | +# | ||
23 | +# Configuration for the CS42448 chip | ||
24 | +# | ||
25 | + | ||
26 | +# default with dmix & dsnoop | ||
27 | +CS42448.pcm.default { | ||
28 | + @args [ CARD ] | ||
29 | + @args.CARD { | ||
30 | + type string | ||
31 | + } | ||
32 | + type asym | ||
33 | + playback.pcm { | ||
34 | + type plug | ||
35 | + slave.pcm { | ||
36 | + @func concat | ||
37 | + strings [ "dmix:" $CARD ",FORMAT=S32_LE" ] | ||
38 | + } | ||
39 | + } | ||
40 | + capture.pcm { | ||
41 | + type plug | ||
42 | + slave.pcm { | ||
43 | + @func concat | ||
44 | + strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ] | ||
45 | + } | ||
46 | + } | ||
47 | +} | ||
48 | + | ||
49 | +<confdir:pcm/surround51.conf> | ||
50 | + | ||
51 | +CS42448.pcm.surround51.0 { | ||
52 | + @args [ CARD ] | ||
53 | + @args.CARD { | ||
54 | + type string | ||
55 | + } | ||
56 | + type plug | ||
57 | + slave.pcm { | ||
58 | + type hw | ||
59 | + card $CARD | ||
60 | + } | ||
61 | + slave.channels 6 | ||
62 | +} | ||
63 | + | ||
64 | +<confdir:pcm/surround71.conf> | ||
65 | + | ||
66 | +CS42448.pcm.surround71.0 { | ||
67 | + @args [ CARD ] | ||
68 | + @args.CARD { | ||
69 | + type string | ||
70 | + } | ||
71 | + type plug | ||
72 | + slave.pcm { | ||
73 | + type hw | ||
74 | + card $CARD | ||
75 | + } | ||
76 | + slave.channels 8 | ||
77 | +} | ||
78 | + | ||
79 | +# vim: ft=alsaconf | ||
80 | diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am | ||
81 | index 70b9bab3..6aba20b4 100644 | ||
82 | --- a/src/conf/cards/Makefile.am | ||
83 | +++ b/src/conf/cards/Makefile.am | ||
84 | @@ -62,7 +62,8 @@ cfg_files = aliases.conf \ | ||
85 | CS42888.conf \ | ||
86 | IMX-HDMI.conf \ | ||
87 | AK4458.conf \ | ||
88 | - IMX-XCVR.conf | ||
89 | + IMX-XCVR.conf \ | ||
90 | + CS42448.conf | ||
91 | |||
92 | if BUILD_ALISP | ||
93 | cfg_files += aliases.alisp | ||
94 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf | ||
95 | index e824145d..a40d3731 100644 | ||
96 | --- a/src/conf/cards/aliases.conf | ||
97 | +++ b/src/conf/cards/aliases.conf | ||
98 | @@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888 | ||
99 | imx-hdmi-soc cards.IMX-HDMI | ||
100 | ak4458-audio cards.AK4458 | ||
101 | imx-audio-xcvr cards.IMX-XCVR | ||
102 | +imx-cs42448 cards.CS42448 | ||
103 | |||
104 | <confdir:ctl/default.conf> | ||
105 | <confdir:pcm/default.conf> | ||
106 | -- | ||
107 | 2.17.1 | ||
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 0b4ddc9b..4be0d7e1 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend | |||
@@ -4,7 +4,13 @@ IMX_PATCH = " \ | |||
4 | file://0001-add-conf-for-multichannel-support-in-imx.patch \ | 4 | file://0001-add-conf-for-multichannel-support-in-imx.patch \ |
5 | file://0005-add-ak4458-conf-for-multichannel-support.patch \ | 5 | file://0005-add-ak4458-conf-for-multichannel-support.patch \ |
6 | file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ | 6 | file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ |
7 | file://0007-add-conf-for-imx-cs42448-sound-card.patch \ | ||
8 | file://0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch \ | ||
9 | file://0001-pcm-Fix-segfault-with-32bit-libs.patch \ | ||
7 | " | 10 | " |
8 | SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}" | 11 | SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}" |
9 | 12 | ||
10 | PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}" | 13 | PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}" |
14 | |||
15 | GLIBC_64BIT_TIME_FLAGS = "" | ||
16 | INSANE_SKIP:append = " 32bit-time" | ||
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb index c4ccaab7..e2acf767 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb | |||
@@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers | |||
20 | PV = "1.0.26+${SRCPV}" | 20 | PV = "1.0.26+${SRCPV}" |
21 | 21 | ||
22 | SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" | 22 | SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" |
23 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 23 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
24 | SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331" | 24 | SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb index c9b2e621..3366a627 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb | |||
@@ -187,8 +187,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug | |||
187 | file://0002-avoid-including-sys-poll.h-directly.patch" | 187 | file://0002-avoid-including-sys-poll.h-directly.patch" |
188 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 188 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " |
189 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" | 189 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
190 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 190 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
191 | SRCREV = "e4edcda6b110f42eca1f2cc20bc935edf7e66d6d" | 191 | SRCREV = "9de821c50b4dd7af2407d9c3d078020704510a20" |
192 | 192 | ||
193 | S = "${WORKDIR}/git" | 193 | S = "${WORKDIR}/git" |
194 | 194 | ||
@@ -204,6 +204,11 @@ PACKAGECONFIG_REMOVE ?= " \ | |||
204 | PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" | 204 | PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" |
205 | PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress" | 205 | PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress" |
206 | 206 | ||
207 | PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}" | ||
208 | PACKAGECONFIG_G2D ??= "" | ||
209 | PACKAGECONFIG_G2D:imxgpu2d ??= "g2d" | ||
210 | |||
211 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" | ||
207 | PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress" | 212 | PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress" |
208 | 213 | ||
209 | EXTRA_OEMESON += " \ | 214 | EXTRA_OEMESON += " \ |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb index 29347f21..dd7869a9 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb | |||
@@ -118,16 +118,19 @@ SRC_URI:remove = " \ | |||
118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
119 | SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch" | 119 | SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch" |
120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" | 120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
121 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 121 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
122 | SRCREV = "53a12f4e39773ca5b052eccbf0476d4ebd3ac08e" | 122 | SRCREV = "c4333767ea122c182ba4e14cababe8dbe2a1b882" |
123 | 123 | ||
124 | S = "${WORKDIR}/git" | 124 | S = "${WORKDIR}/git" |
125 | 125 | ||
126 | inherit use-imx-headers | 126 | inherit use-imx-headers |
127 | 127 | ||
128 | PACKAGECONFIG_REMOVE ?= "jpeg" | ||
129 | PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" | 128 | PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" |
130 | PACKAGECONFIG:append:imxgpu2d = " g2d" | 129 | PACKAGECONFIG_REMOVE ?= "jpeg" |
130 | |||
131 | PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}" | ||
132 | PACKAGECONFIG_G2D ??= "" | ||
133 | PACKAGECONFIG_G2D:imxgpu2d ??= "g2d" | ||
131 | 134 | ||
132 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" | 135 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" |
133 | PACKAGECONFIG[viv-fb] = ",,virtual/libgles2" | 136 | PACKAGECONFIG[viv-fb] = ",,virtual/libgles2" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb index 1a6197d5..9e09ef93 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb | |||
@@ -97,6 +97,8 @@ LIC_FILES_CHKSUM = " \ | |||
97 | file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 97 | file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \ |
98 | file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ | 98 | file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ |
99 | " | 99 | " |
100 | # Enable pulsesink in gstreamer | ||
101 | PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | ||
100 | 102 | ||
101 | # fb implementation of v4l2 uses libdrm | 103 | # fb implementation of v4l2 uses libdrm |
102 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" | 104 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" |
@@ -109,8 +111,14 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu | |||
109 | 111 | ||
110 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
111 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" | 113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
112 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 114 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
113 | SRCREV = "a4631334ad32abc513bde8f73491ef345f865a48" | 115 | SRCREV = "d361360510c97dc23abbfcdd22dff8214890527d" |
116 | |||
117 | # set 32bit compile timer for 32-bit platform | ||
118 | GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = "" | ||
119 | GLIBC_64BIT_TIME_FLAGS:mx7-nxp-bsp = "" | ||
120 | INSANE_SKIP:mx6-nxp-bsp:append = " 32bit-time" | ||
121 | INSANE_SKIP:mx7-nxp-bsp:append = " 32bit-time" | ||
114 | 122 | ||
115 | S = "${WORKDIR}/git" | 123 | S = "${WORKDIR}/git" |
116 | 124 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb index bd0f723f..ce7b3f1d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb | |||
@@ -74,6 +74,8 @@ FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" | |||
74 | FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" | 74 | FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" |
75 | FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" | 75 | FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" |
76 | 76 | ||
77 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-5" | ||
78 | |||
77 | CVE_PRODUCT = "gstreamer" | 79 | CVE_PRODUCT = "gstreamer" |
78 | 80 | ||
79 | PTEST_BUILD_HOST_FILES = "" | 81 | PTEST_BUILD_HOST_FILES = "" |
@@ -93,8 +95,8 @@ LIC_FILES_CHKSUM = " \ | |||
93 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | 95 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" |
94 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 96 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
95 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" | 97 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
96 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 98 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
97 | SRCREV = "e51e577a730191911b7050216814bede1b9545ae" | 99 | SRCREV = "1a43c16272a7f4274eb8260e03206a57f317d823" |
98 | 100 | ||
99 | S = "${WORKDIR}/git" | 101 | S = "${WORKDIR}/git" |
100 | 102 | ||
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index d99fd320..a13cf30a 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb | |||
@@ -4,8 +4,8 @@ | |||
4 | # Released under the MIT license (see COPYING.MIT for the terms) | 4 | # Released under the MIT license (see COPYING.MIT for the terms) |
5 | 5 | ||
6 | DESCRIPTION = "Gstreamer freescale plugins" | 6 | DESCRIPTION = "Gstreamer freescale plugins" |
7 | LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only" | ||
8 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only" | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" |
10 | 10 | ||
11 | DEPENDS = " \ | 11 | DEPENDS = " \ |
@@ -19,7 +19,7 @@ DEPENDS = " \ | |||
19 | DEPENDS:append:mx6-nxp-bsp = " imx-lib" | 19 | DEPENDS:append:mx6-nxp-bsp = " imx-lib" |
20 | DEPENDS:append:mx7-nxp-bsp = " imx-lib" | 20 | DEPENDS:append:mx7-nxp-bsp = " imx-lib" |
21 | DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" | 21 | DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" |
22 | DEPENDS:append:mx9-nxp-bsp = " imx-lib" | 22 | DEPENDS:append:mx93-nxp-bsp = " imx-lib" |
23 | DEPENDS:append:imxvpu = " imx-vpuwrap" | 23 | DEPENDS:append:imxvpu = " imx-vpuwrap" |
24 | DEPENDS:append:imxfbdev:imxgpu = " libdrm" | 24 | DEPENDS:append:imxfbdev:imxgpu = " libdrm" |
25 | DEPENDS_IMXGPU = "" | 25 | DEPENDS_IMXGPU = "" |
@@ -27,13 +27,14 @@ DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}" | |||
27 | DEPENDS_IMX_OPENCL_CONVERTER = "" | 27 | DEPENDS_IMX_OPENCL_CONVERTER = "" |
28 | DEPENDS_IMX_OPENCL_CONVERTER:mx8-nxp-bsp = "imx-opencl-converter" | 28 | DEPENDS_IMX_OPENCL_CONVERTER:mx8-nxp-bsp = "imx-opencl-converter" |
29 | DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = "" | 29 | DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = "" |
30 | DEPENDS_IMX_OPENCL_CONVERTER:mx95-nxp-bsp = "imx-opencl-converter" | ||
30 | 31 | ||
31 | # For backwards compatibility | 32 | # For backwards compatibility |
32 | RREPLACES:${PN} = "gst1.0-fsl-plugin" | 33 | RREPLACES:${PN} = "gst1.0-fsl-plugin" |
33 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" | 34 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" |
34 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" | 35 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" |
35 | 36 | ||
36 | PV = "4.8.2+git${SRCPV}" | 37 | PV = "4.8.3+git${SRCPV}" |
37 | 38 | ||
38 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ | 39 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ |
39 | file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \ | 40 | file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \ |
@@ -48,8 +49,8 @@ SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch= | |||
48 | file://0010-provide-declaration-for-aiur_register_external_typef.patch \ | 49 | file://0010-provide-declaration-for-aiur_register_external_typef.patch \ |
49 | file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \ | 50 | file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \ |
50 | " | 51 | " |
51 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 52 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
52 | SRCREV = "a72df52acfec5f849ec93906e33cb50da01b0b2e" | 53 | SRCREV = "91c7fec888cf8932c91e354331aad94975cae3ff" |
53 | 54 | ||
54 | S = "${WORKDIR}/git" | 55 | S = "${WORKDIR}/git" |
55 | 56 | ||
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb b/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb index 0822d530..0a2c71e7 100644 --- a/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb +++ b/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb | |||
@@ -5,14 +5,14 @@ | |||
5 | DESCRIPTION = "Freescale Multimedia codec libs" | 5 | DESCRIPTION = "Freescale Multimedia codec libs" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" |
9 | 9 | ||
10 | # Backward compatibility | 10 | # Backward compatibility |
11 | PROVIDES += "libfslcodec" | 11 | PROVIDES += "libfslcodec" |
12 | 12 | ||
13 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 13 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
14 | SRC_URI[md5sum] = "1977bab8d89972f08d9eee0122a64603" | 14 | SRC_URI[md5sum] = "7ae1615aad2c0456b9be2ab804a6267e" |
15 | SRC_URI[sha256sum] = "b0744a91c265202a79a019c72f17cae01fd5b63a3ba451592b6c8349d95719e0" | 15 | SRC_URI[sha256sum] = "9facb3541903b4a6c6baa906f8c2c6cc01fc8c7b82a726c8da6d3681d4ed720b" |
16 | 16 | ||
17 | inherit fsl-eula-unpack autotools pkgconfig | 17 | inherit fsl-eula-unpack autotools pkgconfig |
18 | 18 | ||
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.6.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb index 5d31eae7..bc73bd9f 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.6.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb | |||
@@ -2,14 +2,14 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP" | 3 | DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" |
6 | 6 | ||
7 | inherit fsl-eula-unpack autotools pkgconfig | 7 | inherit fsl-eula-unpack autotools pkgconfig |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "d211febb231717649d35553d22a50578" | 11 | SRC_URI[md5sum] = "32251bc952ca7b9a4b12fadb9328a8c1" |
12 | SRC_URI[sha256sum] = "d5f312d742493aee7e1f1304916aca8264bcf8d3f7de7e1522d30ba33efb6a8a" | 12 | SRC_URI[sha256sum] = "0baa82410a77c68e39aaa987d91b41c94255d62294fa2f5a399169f3068862cc" |
13 | 13 | ||
14 | EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp" | 14 | EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp" |
15 | EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp" | 15 | EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp" |
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.6.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb index 3206420f..60761e6e 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.6.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb | |||
@@ -2,15 +2,15 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries" | 3 | DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" |
6 | 6 | ||
7 | 7 | ||
8 | inherit fsl-eula-unpack autotools pkgconfig | 8 | inherit fsl-eula-unpack autotools pkgconfig |
9 | 9 | ||
10 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 10 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
11 | 11 | ||
12 | SRC_URI[md5sum] = "07ff97f93abe2bc6117a120e534e70d4" | 12 | SRC_URI[md5sum] = "199f88716f289e93e0954fa6475a3cbc" |
13 | SRC_URI[sha256sum] = "5eab0259228746499990afe8de758a6ed505ec3fbd8a8adfc87a83c46a69bf2c" | 13 | SRC_URI[sha256sum] = "83eaef592de33b4d5e8fae63d798cc955bf3c414911c87afeb65a20af01fb0b6" |
14 | 14 | ||
15 | EXTRA_OECONF = " \ | 15 | EXTRA_OECONF = " \ |
16 | -datadir=${base_libdir}/firmware \ | 16 | -datadir=${base_libdir}/firmware \ |
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.1.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb index 89df60d6..3dc0a7ea 100644 --- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.1.bb +++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb | |||
@@ -2,17 +2,17 @@ | |||
2 | DESCRIPTION = "NXP Multimedia opencl converter lib" | 2 | DESCRIPTION = "NXP Multimedia opencl converter lib" |
3 | LICENSE = "Proprietary" | 3 | LICENSE = "Proprietary" |
4 | SECTION = "multimedia" | 4 | SECTION = "multimedia" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" |
6 | DEPENDS = "opencl-headers" | 6 | DEPENDS = "opencl-headers" |
7 | 7 | ||
8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
9 | SRC_URI[md5sum] = "426f4b1df6fe123f769aa8a0d7ef17d8" | 9 | SRC_URI[md5sum] = "dc668682189ce740fb46073e62f58066" |
10 | SRC_URI[sha256sum] = "16612be09675c2abe9c62337e6932b2e3fb788b1ec95ecede757350c4abf6870" | 10 | SRC_URI[sha256sum] = "9f283df500c57421b87d96d9af7022ab490bc241aa28d00755beaadabbcd754b" |
11 | 11 | ||
12 | inherit fsl-eula-unpack autotools pkgconfig meson | 12 | inherit fsl-eula-unpack autotools pkgconfig meson |
13 | 13 | ||
14 | FILES:${PN} += "${datadir}/" | 14 | FILES:${PN} += "${datadir}/" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE = "(^$)" | 16 | COMPATIBLE_MACHINE = "(^$)" |
17 | COMPATIBLE_MACHINE:imxgpu = "(mx8-nxp-bsp)" | 17 | COMPATIBLE_MACHINE:imxgpu = "(mx8-nxp-bsp|mx95-nxp-bsp)" |
18 | COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)" | 18 | COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)" |
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb b/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb index 4b59eb2f..4e580085 100644 --- a/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb +++ b/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb | |||
@@ -5,7 +5,7 @@ | |||
5 | DESCRIPTION = "Freescale Multimedia parser libs" | 5 | DESCRIPTION = "Freescale Multimedia parser libs" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" |
9 | 9 | ||
10 | # For backwards compatibility | 10 | # For backwards compatibility |
11 | PROVIDES += "libfslparser" | 11 | PROVIDES += "libfslparser" |
@@ -14,8 +14,8 @@ RPROVIDES:${PN} = "libfslparser" | |||
14 | RCONFLICTS:${PN} = "libfslparser" | 14 | RCONFLICTS:${PN} = "libfslparser" |
15 | 15 | ||
16 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 16 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
17 | SRC_URI[md5sum] = "2e862fce70bc82649057ed552473d982" | 17 | SRC_URI[md5sum] = "9bca484287f5592b86ed10c1761a3fcc" |
18 | SRC_URI[sha256sum] = "20f326821ced5d6855f81794b66ec1f0c334e9ec7a9be1368a9b4dc501b666c6" | 18 | SRC_URI[sha256sum] = "b25267eefb4618b2ba8d6aba46a5b4e09621a44115036fc896e0777006472043" |
19 | 19 | ||
20 | inherit fsl-eula-unpack autotools pkgconfig | 20 | inherit fsl-eula-unpack autotools pkgconfig |
21 | 21 | ||
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb index fb7e23c3..af15e7b1 100644 --- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb | |||
@@ -11,8 +11,8 @@ DEPENDS = "virtual/imxvpu" | |||
11 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" | 11 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" | 13 | SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" |
14 | SRCBRANCH = "MM_04.08.02_2310_L6.1.y" | 14 | SRCBRANCH = "MM_04.08.03_2312_L6.6.y" |
15 | SRCREV = "6f9b4c82e37688f50d756529d90b48c3cc80f2f6" | 15 | SRCREV = "f974cecdb00b4a214e4b5229f2279e772ee43306" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch b/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch new file mode 100644 index 00000000..ab34dc2f --- /dev/null +++ b/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Shengjiu Wang <shengjiu.wang@nxp.com> | ||
3 | Date: Tue, 28 Nov 2023 10:23:42 +0800 | ||
4 | Subject: [PATCH] launch: allow pipewire-pulse can be started by root. | ||
5 | |||
6 | revert commit 8942f6b40 ("launch: avoid autostarting pipewire-pulse | ||
7 | systemd units for root") | ||
8 | |||
9 | Upstream-Status: Inappropriate [i.MX specific] | ||
10 | Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> | ||
11 | --- | ||
12 | src/daemon/systemd/user/pipewire-pulse.service.in | 1 - | ||
13 | src/daemon/systemd/user/pipewire-pulse.socket | 1 - | ||
14 | 2 files changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in | ||
17 | index 73d22e532..da7728ee3 100644 | ||
18 | --- a/src/daemon/systemd/user/pipewire-pulse.service.in | ||
19 | +++ b/src/daemon/systemd/user/pipewire-pulse.service.in | ||
20 | @@ -14,7 +14,6 @@ Description=PipeWire PulseAudio | ||
21 | # After=pipewire-pulse.socket is not needed, as it is already implicit in the | ||
22 | # socket-service relationship, see systemd.socket(5). | ||
23 | Requires=pipewire-pulse.socket | ||
24 | -ConditionUser=!root | ||
25 | Wants=pipewire.service pipewire-session-manager.service | ||
26 | After=pipewire.service pipewire-session-manager.service | ||
27 | Conflicts=pulseaudio.service | ||
28 | diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket | ||
29 | index 1ae5edafb..d27fb0e26 100644 | ||
30 | --- a/src/daemon/systemd/user/pipewire-pulse.socket | ||
31 | +++ b/src/daemon/systemd/user/pipewire-pulse.socket | ||
32 | @@ -1,6 +1,5 @@ | ||
33 | [Unit] | ||
34 | Description=PipeWire PulseAudio | ||
35 | -ConditionUser=!root | ||
36 | Conflicts=pulseaudio.socket | ||
37 | |||
38 | [Socket] | ||
39 | -- | ||
40 | 2.34.1 | ||
41 | |||
diff --git a/recipes-multimedia/pipewire/pipewire_%.bbappend b/recipes-multimedia/pipewire/pipewire_%.bbappend new file mode 100644 index 00000000..7d84ee93 --- /dev/null +++ b/recipes-multimedia/pipewire/pipewire_%.bbappend | |||
@@ -0,0 +1,14 @@ | |||
1 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | SRC_URI:append:imx-nxp-bsp = " file://0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch" | ||
4 | |||
5 | SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable" | ||
6 | |||
7 | DEPENDS:append:mx95-nxp-bsp = " libdrm" | ||
8 | |||
9 | PACKAGECONFIG:remove:mx95-nxp-bsp = "libcamera" | ||
10 | PACKAGECONFIG:remove:imx-nxp-bsp = "gstreamer" | ||
11 | PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}" | ||
12 | |||
13 | # FIXME: Needs to qualify on PACKAGECONFIG | ||
14 | SYSTEMD_SERVICE:${PN}-pulse = "pipewire-pulse.service" | ||