diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-multimedia/pulseaudio | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 4e226c616d..2fb107797a 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -133,20 +133,20 @@ set_cfg_value () { | |||
133 | fi | 133 | fi |
134 | } | 134 | } |
135 | 135 | ||
136 | do_compile_append () { | 136 | do_compile:append () { |
137 | if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then | 137 | if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then |
138 | set_cfg_value src/pulse/client.conf allow-autospawn-for-root yes | 138 | set_cfg_value src/pulse/client.conf allow-autospawn-for-root yes |
139 | fi | 139 | fi |
140 | } | 140 | } |
141 | 141 | ||
142 | do_install_append() { | 142 | do_install:append() { |
143 | install -d ${D}${sysconfdir}/default/volatiles | 143 | install -d ${D}${sysconfdir}/default/volatiles |
144 | install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse | 144 | install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse |
145 | } | 145 | } |
146 | 146 | ||
147 | USERADD_PACKAGES = "pulseaudio-server" | 147 | USERADD_PACKAGES = "pulseaudio-server" |
148 | GROUPADD_PARAM_pulseaudio-server = "--system pulse" | 148 | GROUPADD_PARAM:pulseaudio-server = "--system pulse" |
149 | USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \ | 149 | USERADD_PARAM:pulseaudio-server = "--system --home /var/run/pulse \ |
150 | --no-create-home --shell /bin/false \ | 150 | --no-create-home --shell /bin/false \ |
151 | --groups audio,pulse --gid pulse pulse" | 151 | --groups audio,pulse --gid pulse pulse" |
152 | 152 | ||
@@ -168,49 +168,49 @@ PACKAGES =+ "\ | |||
168 | PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}" | 168 | PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}" |
169 | 169 | ||
170 | #upgrade path: | 170 | #upgrade path: |
171 | RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" | 171 | RREPLACES:pulseaudio-server = "libpulse-bin libpulse-conf" |
172 | 172 | ||
173 | PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*" | 173 | PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*" |
174 | 174 | ||
175 | FILES_libpulsecore = "${libdir}/pulseaudio/libpulsecore*.so" | 175 | FILES:libpulsecore = "${libdir}/pulseaudio/libpulsecore*.so" |
176 | FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" | 176 | FILES:libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" |
177 | 177 | ||
178 | # client.conf configures the behaviour of libpulse, so it belongs in the same | 178 | # client.conf configures the behaviour of libpulse, so it belongs in the same |
179 | # package. | 179 | # package. |
180 | FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" | 180 | FILES:libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" |
181 | 181 | ||
182 | FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" | 182 | FILES:libpulse-simple = "${libdir}/libpulse-simple.so.*" |
183 | FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" | 183 | FILES:libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" |
184 | 184 | ||
185 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" | 185 | FILES:${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" |
186 | FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" | 186 | FILES:${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" |
187 | FILES_${PN}-pa-info = "${bindir}/pa-info" | 187 | FILES:${PN}-pa-info = "${bindir}/pa-info" |
188 | FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" | 188 | FILES:${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" |
189 | 189 | ||
190 | #SYSTEMD_PACKAGES = "${PN}-server" | 190 | #SYSTEMD_PACKAGES = "${PN}-server" |
191 | SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" | 191 | SYSTEMD_SERVICE:${PN}-server = "pulseaudio.service" |
192 | 192 | ||
193 | FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" | 193 | FILES:${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" |
194 | 194 | ||
195 | # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) | 195 | # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) |
196 | FILES_${PN} = "" | 196 | FILES:${PN} = "" |
197 | ALLOW_EMPTY_${PN} = "1" | 197 | ALLOW_EMPTY:${PN} = "1" |
198 | 198 | ||
199 | CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf" | 199 | CONFFILES:libpulse = "${sysconfdir}/pulse/client.conf" |
200 | 200 | ||
201 | CONFFILES_pulseaudio-server = "\ | 201 | CONFFILES:pulseaudio-server = "\ |
202 | ${sysconfdir}/pulse/default.pa \ | 202 | ${sysconfdir}/pulse/default.pa \ |
203 | ${sysconfdir}/pulse/daemon.conf \ | 203 | ${sysconfdir}/pulse/daemon.conf \ |
204 | ${sysconfdir}/pulse/system.pa \ | 204 | ${sysconfdir}/pulse/system.pa \ |
205 | " | 205 | " |
206 | 206 | ||
207 | pkg_postinst_${PN}-server() { | 207 | pkg_postinst:${PN}-server() { |
208 | if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then | 208 | if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then |
209 | ${sysconfdir}/init.d/populate-volatile.sh update | 209 | ${sysconfdir}/init.d/populate-volatile.sh update |
210 | fi | 210 | fi |
211 | } | 211 | } |
212 | 212 | ||
213 | python populate_packages_prepend() { | 213 | python populate_packages:prepend() { |
214 | plugindir = d.expand('${libdir}/pulse-${PV}/modules/') | 214 | plugindir = d.expand('${libdir}/pulse-${PV}/modules/') |
215 | do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) | 215 | do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) |
216 | do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) | 216 | do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) |
@@ -218,7 +218,7 @@ python populate_packages_prepend() { | |||
218 | 218 | ||
219 | # pa-info is a bash script that collects information about the audio setup. | 219 | # pa-info is a bash script that collects information about the audio setup. |
220 | # It's primarily useful for attaching an information dump when reporting bugs. | 220 | # It's primarily useful for attaching an information dump when reporting bugs. |
221 | RDEPENDS_${PN}-pa-info = "\ | 221 | RDEPENDS:${PN}-pa-info = "\ |
222 | alsa-utils-amixer \ | 222 | alsa-utils-amixer \ |
223 | alsa-utils-aplay \ | 223 | alsa-utils-aplay \ |
224 | alsa-utils-scripts \ | 224 | alsa-utils-scripts \ |
@@ -226,7 +226,7 @@ RDEPENDS_${PN}-pa-info = "\ | |||
226 | ${PN}-server \ | 226 | ${PN}-server \ |
227 | " | 227 | " |
228 | 228 | ||
229 | RDEPENDS_pulseaudio-server = " \ | 229 | RDEPENDS:pulseaudio-server = " \ |
230 | pulseaudio-module-filter-apply \ | 230 | pulseaudio-module-filter-apply \ |
231 | pulseaudio-module-filter-heuristics \ | 231 | pulseaudio-module-filter-heuristics \ |
232 | pulseaudio-module-udev-detect \ | 232 | pulseaudio-module-udev-detect \ |
@@ -252,23 +252,23 @@ RDEPENDS_pulseaudio-server = " \ | |||
252 | # If the server is installed, it's usually desirable to make ALSA applications | 252 | # If the server is installed, it's usually desirable to make ALSA applications |
253 | # use PulseAudio. alsa-plugins-pulseaudio-conf will install the configuration | 253 | # use PulseAudio. alsa-plugins-pulseaudio-conf will install the configuration |
254 | # that makes the PulseAudio plugin the default ALSA device. | 254 | # that makes the PulseAudio plugin the default ALSA device. |
255 | RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf" | 255 | RDEPENDS:pulseaudio-server += "alsa-plugins-pulseaudio-conf" |
256 | 256 | ||
257 | # pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG | 257 | # pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG |
258 | # but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES | 258 | # but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES |
259 | RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" | 259 | RDEPENDS:pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" |
260 | RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" | 260 | RDEPENDS:pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" |
261 | 261 | ||
262 | FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" | 262 | FILES:${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" |
263 | 263 | ||
264 | GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" | 264 | GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" |
265 | FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" | 265 | FILES:${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" |
266 | 266 | ||
267 | # The console-kit module is good to have on X11 systems (it keeps PulseAudio | 267 | # The console-kit module is good to have on X11 systems (it keeps PulseAudio |
268 | # running for the duration of the user login session). The device-manager and | 268 | # running for the duration of the user login session). The device-manager and |
269 | # x11-* modules are referenced from the start-pulseaudio-x11 script, so those | 269 | # x11-* modules are referenced from the start-pulseaudio-x11 script, so those |
270 | # modules must be installed when X11 is enabled. | 270 | # modules must be installed when X11 is enabled. |
271 | RDEPENDS_pulseaudio-server += "\ | 271 | RDEPENDS:pulseaudio-server += "\ |
272 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\ | 272 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\ |
273 | pulseaudio-module-device-manager \ | 273 | pulseaudio-module-device-manager \ |
274 | pulseaudio-module-x11-cork-request \ | 274 | pulseaudio-module-x11-cork-request \ |
@@ -276,6 +276,6 @@ RDEPENDS_pulseaudio-server += "\ | |||
276 | pulseaudio-module-x11-xsmp \ | 276 | pulseaudio-module-x11-xsmp \ |
277 | ', '', d)}" | 277 | ', '', d)}" |
278 | 278 | ||
279 | RDEPENDS_pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ | 279 | RDEPENDS:pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ |
280 | bb.utils.contains('DISTRO_FEATURES', 'systemd', 'pulseaudio-module-systemd-login', 'pulseaudio-module-console-kit', d), \ | 280 | bb.utils.contains('DISTRO_FEATURES', 'systemd', 'pulseaudio-module-systemd-login', 'pulseaudio-module-console-kit', d), \ |
281 | '', d)}" | 281 | '', d)}" |