| 1 |
commit: ee9c817d4380a2651dda1955b6a352c3eb0ac6a4 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 20 22:47:37 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 20 22:53:00 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9c817d |
| 7 |
|
| 8 |
media-sound/pulseaudio: minor fixes |
| 9 |
|
| 10 |
- Make doxygen optional |
| 11 |
|
| 12 |
- dev-libs/libpcre is a DEPEND |
| 13 |
|
| 14 |
- dev-libs/check is a DEPEND |
| 15 |
|
| 16 |
- USE=tcpd is native feature |
| 17 |
|
| 18 |
- Add $EPREFIX to udevrulesdir option |
| 19 |
|
| 20 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 21 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 22 |
|
| 23 |
media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild | 16 ++++++---------- |
| 24 |
1 file changed, 6 insertions(+), 10 deletions(-) |
| 25 |
|
| 26 |
diff --git a/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild b/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild |
| 27 |
index 032227d4dc9..aa307be1068 100644 |
| 28 |
--- a/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild |
| 29 |
+++ b/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild |
| 30 |
@@ -72,22 +72,15 @@ REQUIRED_USE=" |
| 31 |
zeroconf? ( dbus ) |
| 32 |
" |
| 33 |
|
| 34 |
-# NOTE: |
| 35 |
-# - dev-libs/libpcre header will be used if found but no linking is done |
| 36 |
-# on non-Windows |
| 37 |
-# - meson is currently always checking for doxygen, |
| 38 |
-# see https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1226 |
| 39 |
BDEPEND=" |
| 40 |
- app-doc/doxygen |
| 41 |
- dev-libs/libpcre |
| 42 |
sys-devel/gettext |
| 43 |
sys-devel/m4 |
| 44 |
virtual/libiconv |
| 45 |
virtual/libintl |
| 46 |
virtual/pkgconfig |
| 47 |
+ doc? ( app-doc/doxygen ) |
| 48 |
orc? ( >=dev-lang/orc-0.4.15 ) |
| 49 |
system-wide? ( dev-util/unifdef ) |
| 50 |
- test? ( >=dev-libs/check-0.9.10 ) |
| 51 |
" |
| 52 |
|
| 53 |
# NOTE: |
| 54 |
@@ -145,6 +138,8 @@ COMMON_DEPEND=" |
| 55 |
DEPEND=" |
| 56 |
${COMMON_DEPEND} |
| 57 |
dev-libs/libatomic_ops |
| 58 |
+ dev-libs/libpcre:* |
| 59 |
+ test? ( >=dev-libs/check-0.9.10 ) |
| 60 |
X? ( x11-base/xorg-proto ) |
| 61 |
" |
| 62 |
|
| 63 |
@@ -181,11 +176,12 @@ multilib_src_configure() { |
| 64 |
--localstatedir="${EPREFIX}"/var |
| 65 |
-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P} |
| 66 |
-Dsystemduserunitdir=$(systemd_get_userunitdir) |
| 67 |
- -Dudevrulesdir="$(get_udevdir)"/rules.d |
| 68 |
+ -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" |
| 69 |
-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value |
| 70 |
$(meson_native_use_feature alsa) |
| 71 |
$(meson_native_use_bool bluetooth bluez5) |
| 72 |
$(meson_native_use_bool daemon) |
| 73 |
+ $(meson_native_use_bool doc doxygen) |
| 74 |
$(meson_native_use_bool native-headset bluez5-native-headset) |
| 75 |
$(meson_native_use_bool ofono-headset bluez5-ofono-headset) |
| 76 |
$(meson_native_use_feature glib gsettings) # Supposedly correct? |
| 77 |
@@ -209,7 +205,7 @@ multilib_src_configure() { |
| 78 |
$(meson_feature glib) # WARNING: toggling this likely changes ABI |
| 79 |
$(meson_feature asyncns) |
| 80 |
#$(meson_use cpu_flags_arm_neon neon-opt) |
| 81 |
- $(meson_feature tcpd tcpwrap) # TODO: system-wide specific? |
| 82 |
+ $(meson_native_use_feature tcpd tcpwrap) |
| 83 |
$(meson_feature dbus) |
| 84 |
$(meson_feature elogind) |
| 85 |
$(meson_feature X x11) |
Archives