avoid preferred provider warnings when compiling pulseaudio natively. Enabling native compilation was done in a separate bbappend file for pulseadio: ---- BBCLASSEXTEND += "native" ----
pulseaudio is a dependency of vorbis-tools, from which we like to use the native version of oggenc in order to convert wav to ogg files as part of the yocto build. Signed-off-by: Daniel Ottiger <daniel.otti...@schindler.com> --- .../pulseaudio/pulseaudio.inc | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ae16056d243..85515b3581f 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -145,9 +145,9 @@ do_install:append() { install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse } -USERADD_PACKAGES = "pulseaudio-server" -GROUPADD_PARAM:pulseaudio-server = "--system pulse" -USERADD_PARAM:pulseaudio-server = "--system --home /var/run/pulse \ +USERADD_PACKAGES = "${PN}-server" +GROUPADD_PARAM:${PN}-server = "--system pulse" +USERADD_PARAM:${PN}-server = "--system --home /var/run/pulse \ --no-create-home --shell /bin/false \ --groups audio,pulse --gid pulse pulse" @@ -166,12 +166,12 @@ PACKAGES =+ "\ # RDEPENDS we define for it in this recipe, and thereby ensure that when # adding the console-kit module to an image, we also get the necessary # consolekit package produced. -PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', '${PN}-module-console-kit', '', d)}" #upgrade path: -RREPLACES:pulseaudio-server = "libpulse-bin libpulse-conf" +RREPLACES:${PN}-server = "libpulse-bin libpulse-conf" -PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*" +PACKAGES_DYNAMIC += "^${PN}-lib-.* ^${PN}-module-.*" FILES:libpulsecore = "${libdir}/pulseaudio/libpulsecore*.so" FILES:libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" @@ -200,7 +200,7 @@ ALLOW_EMPTY:${PN} = "1" CONFFILES:libpulse = "${sysconfdir}/pulse/client.conf" -CONFFILES:pulseaudio-server = "\ +CONFFILES:${PN}-server = "\ ${sysconfdir}/pulse/default.pa \ ${sysconfdir}/pulse/daemon.conf \ ${sysconfdir}/pulse/system.pa \ @@ -228,38 +228,38 @@ RDEPENDS:${PN}-pa-info = "\ ${PN}-server \ " -RDEPENDS:pulseaudio-server = " \ - pulseaudio-module-filter-apply \ - pulseaudio-module-filter-heuristics \ - pulseaudio-module-udev-detect \ - pulseaudio-module-null-sink \ - pulseaudio-module-device-restore \ - pulseaudio-module-stream-restore \ - pulseaudio-module-card-restore \ - pulseaudio-module-augment-properties \ - pulseaudio-module-detect \ - pulseaudio-module-alsa-sink \ - pulseaudio-module-alsa-source \ - pulseaudio-module-alsa-card \ - pulseaudio-module-native-protocol-unix \ - pulseaudio-module-default-device-restore \ - pulseaudio-module-intended-roles \ - pulseaudio-module-rescue-streams \ - pulseaudio-module-always-sink \ - pulseaudio-module-suspend-on-idle \ - pulseaudio-module-position-event-sounds \ - pulseaudio-module-role-cork \ - pulseaudio-module-switch-on-port-available" +RDEPENDS:${PN}-server = " \ + ${PN}-module-filter-apply \ + ${PN}-module-filter-heuristics \ + ${PN}-module-udev-detect \ + ${PN}-module-null-sink \ + ${PN}-module-device-restore \ + ${PN}-module-stream-restore \ + ${PN}-module-card-restore \ + ${PN}-module-augment-properties \ + ${PN}-module-detect \ + ${PN}-module-alsa-sink \ + ${PN}-module-alsa-source \ + ${PN}-module-alsa-card \ + ${PN}-module-native-protocol-unix \ + ${PN}-module-default-device-restore \ + ${PN}-module-intended-roles \ + ${PN}-module-rescue-streams \ + ${PN}-module-always-sink \ + ${PN}-module-suspend-on-idle \ + ${PN}-module-position-event-sounds \ + ${PN}-module-role-cork \ + ${PN}-module-switch-on-port-available" # If the server is installed, it's usually desirable to make ALSA applications # use PulseAudio. alsa-plugins-pulseaudio-conf will install the configuration # that makes the PulseAudio plugin the default ALSA device. -RDEPENDS:pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" +RDEPENDS:${PN}-server += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" # pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG # but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES -RDEPENDS:pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit x11', 'consolekit', '', d)}" -RDEPENDS:pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" +RDEPENDS:${PN}-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit x11', 'consolekit', '', d)}" +RDEPENDS:${PN}-misc += "${PN}-module-cli-protocol-unix" FILES:${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" @@ -270,14 +270,14 @@ FILES:${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir} # running for the duration of the user login session). The device-manager and # x11-* modules are referenced from the start-pulseaudio-x11 script, so those # modules must be installed when X11 is enabled. -RDEPENDS:pulseaudio-server += "\ +RDEPENDS:${PN}-server += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\ - pulseaudio-module-device-manager \ - pulseaudio-module-x11-cork-request \ - pulseaudio-module-x11-publish \ - pulseaudio-module-x11-xsmp \ + ${PN}-module-device-manager \ + ${PN}-module-x11-cork-request \ + ${PN}-module-x11-publish \ + ${PN}-module-x11-xsmp \ ', '', d)}" -RDEPENDS:pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ - bb.utils.contains('DISTRO_FEATURES', 'systemd', 'pulseaudio-module-systemd-login', 'pulseaudio-module-console-kit', d), \ +RDEPENDS:${PN}-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ + bb.utils.contains('DISTRO_FEATURES', 'systemd', '${PN}-module-systemd-login', '${PN}-module-console-kit', d), \ '', d)}" -- 2.39.2 ***************************************************************** The information contained in this message is intended only for use of the individual(s) named above and may contain confidential, proprietary or legally privileged information. No confidentiality or privilege is waived or lost by any mistransmission. If you are not the intended recipient of this message you are hereby notified that you must not use, disseminate, copy it in any form or take any action in reliance of it. If you have received this message in error please delete it and any copies of it and notify the sender immediately. *****************************************************************
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197324): https://lists.openembedded.org/g/openembedded-core/message/197324 Mute This Topic: https://lists.openembedded.org/mt/105026949/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-