gentoo resync : 25.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
commit: c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree: 620cbf137661399a3fb1eff92914204f9a970713 /media-sound/pulseaudio
parent: cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)
4 files changed, 84 insertions, 26 deletions
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 4d4fc9ef7fe2..4656f1c1df0e 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,6 +9,7 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD pulseaudio-13.0-r1.ebuild 11451 BLAKE2B 52399970366b0217262e323c5dd095785a013c900d8b195e0004994de746d0bcb833453cd93c56e43289ab0dc868a8c7c32c54f0eded761bd9d4bbb17d9b00da SHA512 40683ea13f4b53046579261042c3c1f74b58346b56e1bbaa3a2372275b2b8e35b19cc315e52b1b57ff3f4361d0614acfe989514375944e235c8656ae1b66fa5f
-EBUILD pulseaudio-15.0.ebuild 10592 BLAKE2B c7ddd059704a6e935301099f2b95499a81ff50ff810dbab03cbb85771f9b258b952b877d1e8f37bf5c6241850a29c96958cd1801a1213ebab7728f5a7ea24be0 SHA512 787a9b70844c7f530ce4aea07155ad9e035ef3ffce680b9030fbf467d758dbc96daa7e51b41ce7fc55b5ac0b808c3025ab4b931a5187af6572b3f6e9bcd3c419
+EBUILD pulseaudio-13.0-r1.ebuild 11453 BLAKE2B 87e52e6b724603770f5d8ed003ae0801c733c97e036445f7b0279fda84323cd4bc7f25e89ed1c71aebb51e16d448dc15f5d8e0b26eac225155fa6d9c9e299295 SHA512 60b553dfa5733975526c39c269f3169e9993128840d49e99fb6c164094e77d72f47046461e0d60351ac2b2225fa5702a18977f92af811f0ff2340854f9630d23
+EBUILD pulseaudio-15.0-r1.ebuild 11138 BLAKE2B 1b975161875288a5a27c02bd877948488e3c2cee5ee5bc2cddfad3daba3827ea1baca84244db45018efbe1c370e3012675e1168095cb0bdaadd1adc3476c4357 SHA512 c857248a0b959c4642d0d8ce4b383711c454ce02bf1433e4459968251cd7da08a11e08ead5610ea886260bcb78e31a932cb048356c558cd1ad4bc11f052da0d1
+EBUILD pulseaudio-15.0-r100.ebuild 1105 BLAKE2B a57a7c879c6a180c9a6495a5acbbfc2bad20173a6c971737f673835f57d730b5808bad5360f3b90af6629c92d968a4b38b181fc148ee9dbccaf2a60da163032e SHA512 d40c2271be2b359ffe8738a3f49d42e86acddec899ac93695bc66453920e2b118a001404ae96e49baab3184edb6c20db90b4a9674b774b4e093444e3fd751ed1
 MISC metadata.xml 3400 BLAKE2B 5e80f40f078e30e51975512fc465417c647106cdd5076c41f6bdd9b2a8757759a1e72391a2f8a90666c60b7ffa968e5b28b2b9aeae6906ef8837a7c959ace18a SHA512 6b81f6a80d6aaf72f56d00256e2715cd53758fc6adbd0a7a5b2836d9dc30ce61fd8a591e52ebb7e33288d6a87b172f75ae610dc9b13d4c28101eea5c2d2eb073
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index ee5b8c283111..98ed59a66526 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	media-libs/speexdsp
 	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
 	dev-libs/libltdl:0
diff --git a/media-sound/pulseaudio/pulseaudio-15.0.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
index a28a050fb041..cc9151b23f59 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
@@ -29,7 +29,7 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 
 # +alsa-plugin as discussed in bug #519530
-# TODO: Deal with bluez5-gstreamer
+# TODO: Deal with bluez5-gstreamer - requires ldacenc and rtpldacpay gstreamer elements
 # TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
 # NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
 IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
@@ -51,6 +51,7 @@ REQUIRED_USE="
 		!bluetooth
 		!equalizer
 		!gdbm
+		!gstreamer
 		!gtk
 		!jack
 		!lirc
@@ -73,6 +74,8 @@ REQUIRED_USE="
 "
 
 BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
 	sys-devel/gettext
 	sys-devel/m4
 	virtual/libiconv
@@ -123,7 +126,7 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	udev? ( >=virtual/udev-143[hwdb(+)] )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	X? (
 		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
 		daemon? (
@@ -136,6 +139,7 @@ COMMON_DEPEND="
 	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
 "
 
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libatomic_ops
@@ -177,45 +181,57 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dadrian-aec=false # Not packaged?
 		--localstatedir="${EPREFIX}"/var
+
+		$(meson_native_use_bool daemon)
+		$(meson_native_use_bool doc doxygen)
+		-Dgcov=false
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_native_use_bool test tests)
+		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
 		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
 		-Dsystemduserunitdir=$(systemd_get_userunitdir)
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
 		$(meson_native_use_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_native_use_feature zeroconf avahi)
 		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_bool daemon)
-		$(meson_native_use_bool doc doxygen)
+		-Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet
 		$(meson_native_use_bool native-headset bluez5-native-headset)
 		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
+		$(meson_feature dbus)
+		$(meson_native_use_feature elogind)
+		$(meson_native_use_feature equalizer fftw)
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
 		$(meson_native_use_feature glib gsettings) # Supposedly correct?
 		$(meson_native_use_feature gstreamer)
 		$(meson_native_use_feature gtk)
+		-Dhal-compat=true # Consider disabling on next revbump
+		$(meson_use ipv6)
 		$(meson_native_use_feature jack)
-		-Dsamplerate=disabled # Matches upstream
-		-Dstream-restore-clear-old-devices=true
 		$(meson_native_use_feature lirc)
+		$(meson_native_use_feature ssl openssl)
 		$(meson_native_use_feature orc)
 		$(meson_native_use_feature oss oss-output)
-		$(meson_native_use_feature ssl openssl)
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		$(meson_native_use_feature udev)
-		$(meson_native_use_feature webrtc-aec)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature equalizer fftw)
+		-Dsamplerate=disabled # Matches upstream
 		$(meson_native_use_feature sox soxr)
-		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_feature asyncns)
-		#$(meson_use cpu_flags_arm_neon neon-opt)
-		$(meson_native_use_feature tcpd tcpwrap)
-		$(meson_feature dbus)
-		$(meson_native_use_feature elogind)
-		$(meson_feature X x11)
+		-Dspeex=enabled
 		$(meson_native_use_feature systemd)
-		$(meson_use ipv6)
+		$(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
+		$(meson_native_use_feature udev)
+		-Dvalgrind=auto
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_native_use_feature webrtc-aec)
 	)
 
 	if multilib_is_native_abi; then
@@ -226,6 +242,7 @@ multilib_src_configure() {
 			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
 		fi
 	else
+		emesonargs+=( -Dman=false )
 		if ! use elibc_glibc; then
 			# Non-glibc multilib is probably non-existent but just in case:
 			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild
new file mode 100644
index 000000000000..bc04ffed9af7
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="metapackage"
+
+SLOT="0"
+
+IUSE="+alsa +alsa-plugin bluetooth +daemon +glib jack zeroconf"
+
+# TODO: Get rid of the REQUIRED_USE by adapting the consumers to the splits with correct USE deps and dropping IUSE here
+REQUIRED_USE="
+	!daemon? (
+		!alsa
+		!alsa-plugin
+		!bluetooth
+		!jack
+		!zeroconf
+	)
+"
+
+RDEPEND="
+	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
+	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[alsa?,bluetooth?,jack?,zeroconf?] )
+"
+DEPEND="${RDEPEND}"
+# TODO: Figure out alsa-plugin handling, where pulseaudio-daemon isn't a multilib-minimal package
+PDEPEND="alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )"
+BDEPEND=""
+
+S="${WORKDIR}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
commit	c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree	620cbf137661399a3fb1eff92914204f9a970713 /media-sound/pulseaudio
parent	cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)