gentoo resync : 25.08.2020

3 files changed, 15 insertions, 15 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e56369ea10ec..aa4c69564478 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,6 @@
 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.6.tar.gz 968858 BLAKE2B 342b935ce1f68282cb6a1684855c7efacf24759359ca2079aade27b7d7d2699135e07c1e52afefb8924d9c8274b4cdbda98cc6c19d8aa0bf14b7202c0e0923f4 SHA512 a8d67bb6135432705d6de026074325f0cae7f01e3fe0b65fa7dafb128e5984ce126f8b4635bfbd9746777514df6f0880a78149fd007c7c1432ac29f95655ddcc
+DIST pipewire-0.3.7.tar.gz 1095307 BLAKE2B 31f266d39683f53ea8cd7823d40b241bae29a59c2658f390fb9178dbdbbe1f7145638b5bd1bdae0dc13a30c1d8d2f44ff224f230211e75ab5936cfb8ccacc928 SHA512 2adaa8689b77c5a3a4710f979d23a737daa66f37ebfca9cf95f6c6a1dad770c52a2998959d52c45540b5b885568146b42981d106a2653ff8f167e0b531ee92f9
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
-EBUILD pipewire-0.3.6.ebuild 3307 BLAKE2B 2f7ff2c07b2bfd27dd1bfe64048b60b650bb9515f5df62d929a37103360d6b991ada116a36a9b318a671a4825522e897c482f3a897bdf1c57c42f4e74e89dc2d SHA512 961dee1d057b318f5b1eecccaf7ec9fb0bf38ffb499b86396dc3ee8b34b80a019d1b8675934c82c9d61a58f3ef57e9ac6b50e263d16e016418570dace0bb283c
-MISC metadata.xml 840 BLAKE2B a023f04c07bc9665f1379e6152ab5a831ca1977038e36263b5ab873195f8f8dc13fe8b036637831833b76406dab484ae40df4ff227991c2ec5bfaa87ecbd5e6c SHA512 8d8d7a10d8024d988356859da0430a69fd11e17cc1a854211bf0128f8dc2ce279ae23954bef39345cd0e94248de00388d7c0db5e166d6f4e0553992d3325bce3
+EBUILD pipewire-0.3.7.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
+MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index dafe4792ddc3..dc9635eee0fe 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -13,7 +13,6 @@
 		<remote-id type="github">PipeWire/pipewire</remote-id>
 	</upstream>
 	<use>
-		<flag name="alsa">Install PipeWire alsa device for playback and record</flag>
 		<flag name="jack">Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire</flag>
 		<flag name="pulseaudio">Enable emulation to be able to run PulseAudio applications on top of PipeWire</flag>
 		<flag name="vulkan">Enable vulkan spa plugin integration</flag>
diff --git a/media-video/pipewire/pipewire-0.3.6.ebuild b/media-video/pipewire/pipewire-0.3.7.ebuild
index c6920216b8d5..7396ae3ab65d 100644
--- a/media-video/pipewire/pipewire-0.3.6.ebuild
+++ b/media-video/pipewire/pipewire-0.3.7.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 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -19,7 +19,7 @@ HOMEPAGE="https://pipewire.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0.3"
-IUSE="+alsa bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
 
 BDEPEND="
 	app-doc/xmltoman
@@ -29,9 +29,9 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	media-libs/alsa-lib
+	>=media-libs/alsa-lib-1.1.7
 	media-libs/libsdl2
-	media-libs/libsndfile
+	>=media-libs/libsndfile-1.0.20
 	sys-apps/dbus
 	virtual/libudev
 	bluetooth? (
@@ -40,14 +40,14 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
+		>=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
+		>=media-sound/pulseaudio-11.1
 	)
 	systemd? ( sys-apps/systemd )
 	vulkan? ( media-libs/vulkan-loader )
@@ -86,7 +86,7 @@ src_configure() {
 		-Dspa-plugins=true
 		--buildtype=$(usex debug debugoptimized plain)
 		# alsa plugin and jack/pulseaudio emulation
-		$(meson_use alsa pipewire-alsa)
+		-Dpipewire-alsa=true
 		$(meson_use jack pipewire-jack)
 		$(meson_use pulseaudio pipewire-pulseaudio)
 		# spa-plugins
@@ -111,9 +111,10 @@ src_install() {
 
 	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
 
-	if use alsa; then
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
+# 	# 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() {