gentoo resync : 25.11.2020

4 files changed, 278 insertions, 2 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index b843ad3de5ea..ee5556e3a78d 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,10 @@
 AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
 DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
+DIST pipewire-0.3.13.tar.gz 1176949 BLAKE2B 5a4c7f211c1ac3c823cc34cede2f42204a2a7c6d583237465e702936926fad924c37f0638c8bbdedc55ad70d59cc2796e64b2b3dea2c64f199383d4ed9c1c84a SHA512 38ce7d8808e69935db0148c077340cfbc1b85f5a016a0a57eff2c076560c42f0695cfe681c9f16ebf15796d773dd113c9a84631eb50ac44dfb09f91ed3fc61f0
+DIST pipewire-0.3.15.tar.gz 1227022 BLAKE2B 590c5275d98a38c238f8c63d5bcdc9dbab07e870aff0e7414e0894aeb93507c106b7b45cd70b0f44a077b2fc5bd916c764dc4e03a54926f90a3296d870b7bcaa SHA512 949f2e64a3e9ec06b3414cacfbd7cf4ef6b7bad484a5dea1b79b5d4310413ec5a7538b702431f2cf6fb580ffd430081bd568399faa9b819689a79bebc955ca33
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
-EBUILD pipewire-0.3.10.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
+EBUILD pipewire-0.3.10.ebuild 3386 BLAKE2B 4567234b2ff098c6fdb853fa7df9922d1712de2b50845f84d411ca73b46b38e601dc29589edcd7b181e175964101a8b182ab42e9333ba9de5dcc3ad0abaa7a5f SHA512 75714d9c10a79464cd017531900fb4100b83dae4a2858669444c25badeef4bcdbbe685ef7f73c817f102d3b776b55fdbcb64e3a7578a82d073d5f3cabfa2ece6
+EBUILD pipewire-0.3.13.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
+EBUILD pipewire-0.3.15.ebuild 3427 BLAKE2B c2ac1b35d25ecd0e79e04fe22b8d6947a1fba024bc788bbb2833bafa694f8ec0ffccaf8c36f507fefcecd266e42eb344560f817d21aada97a34bdf481223dc61 SHA512 3f2ab1b3cda626d7107f9b9d00bab2a4f7b27c5baa4a794fe9662d90fc1ddd7eb51b54b5214b85ca4e8e5007c332029bfd8d3b8b87aae4d71178b7e0ddfb27e4
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.10.ebuild b/media-video/pipewire/pipewire-0.3.10.ebuild
index 7396ae3ab65d..4e3f50346a9e 100644
--- a/media-video/pipewire/pipewire-0.3.10.ebuild
+++ b/media-video/pipewire/pipewire-0.3.10.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.13.ebuild b/media-video/pipewire/pipewire-0.3.13.ebuild
new file mode 100644
index 000000000000..7396ae3ab65d
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.13.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	media-libs/libsdl2
+	>=media-libs/libsndfile-1.0.20
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-11.1
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/pipewire/pipewire-0.3.15.ebuild b/media-video/pipewire/pipewire-0.3.15.ebuild
new file mode 100644
index 000000000000..ddd42bd689c4
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.15.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	media-libs/libsdl2
+	>=media-libs/libsndfile-1.0.20
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-11.1
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use gstreamer gstreamer-device-provider)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}