diff options
Diffstat (limited to 'poky/meta/recipes-multimedia/pulseaudio')
| -rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 64 | ||||
| -rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch | 67 | ||||
| -rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch | 71 | ||||
| -rw-r--r-- | poky/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb (renamed from poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb) | 5 |
4 files changed, 33 insertions, 174 deletions
diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 4e226c616..4a1456d40 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -108,7 +108,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5' " PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" -PACKAGECONFIG[bluez5] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[bluez5] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0-native glib-2.0" PACKAGECONFIG[ofono] = "-Dbluez5-ofono-headset=true,-Dbluez5-ofono-headset=false,ofono" PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" @@ -133,20 +133,20 @@ set_cfg_value () { fi } -do_compile_append () { +do_compile:append () { if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then set_cfg_value src/pulse/client.conf allow-autospawn-for-root yes fi } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default/volatiles 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 \ +GROUPADD_PARAM:pulseaudio-server = "--system pulse" +USERADD_PARAM:pulseaudio-server = "--system --home /var/run/pulse \ --no-create-home --shell /bin/false \ --groups audio,pulse --gid pulse pulse" @@ -168,49 +168,49 @@ PACKAGES =+ "\ PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}" #upgrade path: -RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" +RREPLACES:pulseaudio-server = "libpulse-bin libpulse-conf" PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*" -FILES_libpulsecore = "${libdir}/pulseaudio/libpulsecore*.so" -FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" +FILES:libpulsecore = "${libdir}/pulseaudio/libpulsecore*.so" +FILES:libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" # client.conf configures the behaviour of libpulse, so it belongs in the same # package. -FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" +FILES:libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" -FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" -FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" +FILES:libpulse-simple = "${libdir}/libpulse-simple.so.*" +FILES:libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" -FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" -FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" -FILES_${PN}-pa-info = "${bindir}/pa-info" -FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" +FILES:${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" +FILES:${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" +FILES:${PN}-pa-info = "${bindir}/pa-info" +FILES:${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" #SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" +SYSTEMD_SERVICE:${PN}-server = "pulseaudio.service" -FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" +FILES:${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" +FILES:${PN} = "" +ALLOW_EMPTY:${PN} = "1" -CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf" +CONFFILES:libpulse = "${sysconfdir}/pulse/client.conf" -CONFFILES_pulseaudio-server = "\ +CONFFILES:pulseaudio-server = "\ ${sysconfdir}/pulse/default.pa \ ${sysconfdir}/pulse/daemon.conf \ ${sysconfdir}/pulse/system.pa \ " -pkg_postinst_${PN}-server() { +pkg_postinst:${PN}-server() { if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then ${sysconfdir}/init.d/populate-volatile.sh update fi } -python populate_packages_prepend() { +python populate_packages:prepend() { plugindir = d.expand('${libdir}/pulse-${PV}/modules/') do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) 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() { # pa-info is a bash script that collects information about the audio setup. # It's primarily useful for attaching an information dump when reporting bugs. -RDEPENDS_${PN}-pa-info = "\ +RDEPENDS:${PN}-pa-info = "\ alsa-utils-amixer \ alsa-utils-aplay \ alsa-utils-scripts \ @@ -226,7 +226,7 @@ RDEPENDS_${PN}-pa-info = "\ ${PN}-server \ " -RDEPENDS_pulseaudio-server = " \ +RDEPENDS:pulseaudio-server = " \ pulseaudio-module-filter-apply \ pulseaudio-module-filter-heuristics \ pulseaudio-module-udev-detect \ @@ -252,23 +252,23 @@ RDEPENDS_pulseaudio-server = " \ # 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 += "alsa-plugins-pulseaudio-conf" +RDEPENDS:pulseaudio-server += "alsa-plugins-pulseaudio-conf" # 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', 'x11', 'consolekit', '', d)}" -RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" +RDEPENDS:pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" +RDEPENDS:pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" -FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" +FILES:${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" -FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" +FILES:${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" # The console-kit module is good to have on X11 systems (it keeps PulseAudio # 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:pulseaudio-server += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\ pulseaudio-module-device-manager \ pulseaudio-module-x11-cork-request \ @@ -276,6 +276,6 @@ RDEPENDS_pulseaudio-server += "\ pulseaudio-module-x11-xsmp \ ', '', d)}" -RDEPENDS_pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ +RDEPENDS:pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ bb.utils.contains('DISTRO_FEATURES', 'systemd', 'pulseaudio-module-systemd-login', 'pulseaudio-module-console-kit', d), \ '', d)}" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch deleted file mode 100644 index d60a9a211..000000000 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6d202833a5ae241eeb648631cf95090c452198f9 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanuk@iki.fi> -Date: Fri, 14 Feb 2020 07:29:33 +0200 -Subject: [PATCH] build-sys: Add an option for enabling/disabling Valgrind - -In OpenEmbedded the PulseAudio recipe currently disables Valgrind -support by passing "ac_cv_header_valgrind_memcheck_h=no" to the -configure script (this was added to make it deterministic whether -Valgrdind support gets enabled or not). I'm converting the PulseAudio -recipe to use Meson, and I needed an option to disable Valgrind. - -Upstream-Status: Backport - -Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> ---- - meson.build | 6 +++++- - meson_options.txt | 3 +++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 658eeee57..258962724 100644 ---- a/meson.build -+++ b/meson.build -@@ -220,7 +220,6 @@ check_headers = [ - 'sys/un.h', - 'sys/wait.h', - 'syslog.h', -- 'valgrind/memcheck.h', - 'xlocale.h', - ] - -@@ -231,6 +230,10 @@ foreach h : check_headers - endif - endforeach - -+if cc.has_header('valgrind/memcheck.h', required: get_option('valgrind')) -+ cdata.set('HAVE_VALGRIND_MEMCHECK_H', 1) -+endif -+ - # FIXME: move this to the above set - if cc.has_header('pthread.h') - cdata.set('HAVE_PTHREAD', 1) -@@ -841,6 +844,7 @@ summary = [ - 'Enable SoXR (resampler): @0@'.format(soxr_dep.found()), - 'Enable WebRTC echo canceller: @0@'.format(webrtc_dep.found()), - 'Enable Gcov coverage: @0@'.format(get_option('gcov')), -+ 'Enable Valgrind: @0@'.format(cdata.has('HAVE_VALGRIND_MEMCHECK_H')), - 'Enable man pages: @0@'.format(get_option('man')), - 'Enable unit tests: @0@'.format(get_option('tests')), - '', -diff --git a/meson_options.txt b/meson_options.txt -index 824f24e08..115cc84af 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -138,6 +138,9 @@ option('systemd', - option('udev', - type : 'feature', value : 'auto', - description : 'Optional udev support') -+option('valgrind', -+ type : 'feature', value : 'auto', -+ description : 'Optional Valgrind support') - option('x11', - type : 'feature', value : 'auto', - description : 'Optional X11 support') --- -2.20.1 - diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch deleted file mode 100644 index 5d9370fb1..000000000 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 09f846fbdeb19193e778ce51baa77bd03c38372e Mon Sep 17 00:00:00 2001 -From: garrison <garrison@qemu15.qemu-network> -Date: Fri, 4 Jun 2021 22:13:02 +0000 -Subject: [PATCH] build-sys: meson: check if NEON code can be compiled on arm - -When Meson SIMD module returns HAVE_NEON=1 on arm host, do extra compile check -to verify compiler can actually handle NEON code. - -Related Meson issue #6361 https://github.com/mesonbuild/meson/issues/6361 - -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/574> - -Upstream-Status: Backport[https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/6d2a49a6a1eacc2096d0d9473a074421c181ab56] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - src/pulsecore/meson.build | 41 +++++++++++++++++++++++++++++---------- - 1 file changed, 31 insertions(+), 10 deletions(-) - -diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build -index 99a702e..d0b7990 100644 ---- a/src/pulsecore/meson.build -+++ b/src/pulsecore/meson.build -@@ -172,16 +172,37 @@ endif - - # FIXME: SIMD support (ORC) - simd = import('unstable-simd') --libpulsecore_simd = simd.check('libpulsecore_simd', -- mmx : ['remap_mmx.c', 'svolume_mmx.c'], -- sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'], -- neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'], -- c_args : [pa_c_args], -- include_directories : [configinc, topinc], -- implicit_include_directories : false, -- compiler : cc) --libpulsecore_simd_lib = libpulsecore_simd[0] --cdata.merge_from(libpulsecore_simd[1]) -+simd_variants = [ -+ { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] }, -+ { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] }, -+ { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }, -+] -+ -+libpulsecore_simd_lib = [] -+ -+foreach simd_kwargs : simd_variants -+ -+ if host_machine.cpu_family() == 'arm' and 'neon' in simd_kwargs -+ if not cc.compiles(''' -+ #include <arm_neon.h> -+ int main() { -+ return sizeof(uint8x8_t) + sizeof(int32x4_t) + sizeof(float32x4_t); -+ } -+ ''', name : 'neon code') -+ continue -+ endif -+ endif -+ -+ libpulsecore_simd = simd.check('libpulsecore_simd', -+ kwargs : simd_kwargs, -+ c_args : [pa_c_args], -+ include_directories : [configinc, topinc], -+ implicit_include_directories : false, -+ compiler : cc) -+ -+ libpulsecore_simd_lib += libpulsecore_simd[0] -+ cdata.merge_from(libpulsecore_simd[1]) -+endforeach - - # FIXME: Implement Windows support - #'mutex-win32.c', diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb index a7ea8cacc..239d31810 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb @@ -3,12 +3,9 @@ require pulseaudio.inc SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ - file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ - file://0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch \ " -SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" -SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" +SRC_URI[sha256sum] = "a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0" UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" |