1 |
commit: 218b1bd507c45ed3f48c1abd1e479a15e6efb58f |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 23 16:34:26 2021 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 23 16:40:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218b1bd5 |
7 |
|
8 |
media-sound/pulseaudio: ebuild touchups |
9 |
|
10 |
List meson options in the same order as meson_options.txt as is |
11 |
standard for gnome@ packages. |
12 |
Disable unnecessary running-from-build-tree support. |
13 |
Pass some option flags explicitly. |
14 |
|
15 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
16 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
17 |
|
18 |
media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild | 51 ++++++++++++++---------- |
19 |
1 file changed, 31 insertions(+), 20 deletions(-) |
20 |
|
21 |
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild |
22 |
index 96dafe77206..3fb7ba2e269 100644 |
23 |
--- a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild |
24 |
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild |
25 |
@@ -179,46 +179,57 @@ src_prepare() { |
26 |
|
27 |
multilib_src_configure() { |
28 |
local emesonargs=( |
29 |
- -Dadrian-aec=false # Not packaged? |
30 |
--localstatedir="${EPREFIX}"/var |
31 |
+ |
32 |
+ $(meson_native_use_bool daemon) |
33 |
+ $(meson_native_use_bool doc doxygen) |
34 |
+ -Dgcov=false |
35 |
+ # tests involve random modules, so just do them for the native # TODO: tests should run always |
36 |
+ $(meson_native_use_bool test tests) |
37 |
+ -Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it |
38 |
+ -Dstream-restore-clear-old-devices=true |
39 |
+ -Drunning-from-build-tree=false |
40 |
+ |
41 |
+ # Paths |
42 |
-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P} |
43 |
-Dsystemduserunitdir=$(systemd_get_userunitdir) |
44 |
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" |
45 |
-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value |
46 |
+ |
47 |
+ # Optional features |
48 |
$(meson_native_use_feature alsa) |
49 |
+ $(meson_feature asyncns) |
50 |
+ $(meson_native_use_feature zeroconf avahi) |
51 |
$(meson_native_use_feature bluetooth bluez5) |
52 |
-Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet |
53 |
- $(meson_native_use_bool daemon) |
54 |
- $(meson_native_use_bool doc doxygen) |
55 |
$(meson_native_use_bool native-headset bluez5-native-headset) |
56 |
$(meson_native_use_bool ofono-headset bluez5-ofono-headset) |
57 |
+ $(meson_feature dbus) |
58 |
+ $(meson_native_use_feature elogind) |
59 |
+ $(meson_native_use_feature equalizer fftw) |
60 |
+ $(meson_feature glib) # WARNING: toggling this likely changes ABI |
61 |
$(meson_native_use_feature glib gsettings) # Supposedly correct? |
62 |
$(meson_native_use_feature gstreamer) |
63 |
$(meson_native_use_feature gtk) |
64 |
+ -Dhal-compat=true # Consider disabling on next revbump |
65 |
+ $(meson_use ipv6) |
66 |
$(meson_native_use_feature jack) |
67 |
- -Dsamplerate=disabled # Matches upstream |
68 |
- -Dstream-restore-clear-old-devices=true |
69 |
$(meson_native_use_feature lirc) |
70 |
+ $(meson_native_use_feature ssl openssl) |
71 |
$(meson_native_use_feature orc) |
72 |
$(meson_native_use_feature oss oss-output) |
73 |
- $(meson_native_use_feature ssl openssl) |
74 |
- # tests involve random modules, so just do them for the native # TODO: tests should run always |
75 |
- $(meson_native_use_bool test tests) |
76 |
- $(meson_native_use_feature udev) |
77 |
- $(meson_native_use_feature webrtc-aec) |
78 |
- $(meson_native_use_feature zeroconf avahi) |
79 |
- $(meson_native_use_feature equalizer fftw) |
80 |
+ -Dsamplerate=disabled # Matches upstream |
81 |
$(meson_native_use_feature sox soxr) |
82 |
- -Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it |
83 |
- $(meson_feature glib) # WARNING: toggling this likely changes ABI |
84 |
- $(meson_feature asyncns) |
85 |
- #$(meson_use cpu_flags_arm_neon neon-opt) |
86 |
+ -Dspeex=enabled |
87 |
+ $(meson_native_use_feature systemd) |
88 |
$(meson_native_use_feature tcpd tcpwrap) |
89 |
- $(meson_feature dbus) |
90 |
- $(meson_native_use_feature elogind) |
91 |
+ $(meson_native_use_feature udev) |
92 |
+ -Dvalgrind=auto |
93 |
$(meson_feature X x11) |
94 |
- $(meson_native_use_feature systemd) |
95 |
- $(meson_use ipv6) |
96 |
+ |
97 |
+ # Echo cancellation |
98 |
+ -Dadrian-aec=false # Not packaged? |
99 |
+ $(meson_native_use_feature webrtc-aec) |
100 |
) |
101 |
|
102 |
if multilib_is_native_abi; then |