From 0f414b3bc6614e540b267c4053999cd7fca6ca75 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Jul 28 2020 13:27:29 +0000
Subject: Update to 0.3.8


---

diff --git a/.gitignore b/.gitignore
index 435044c..d1aa8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /pipewire-0.3.5.tar.gz
 /pipewire-0.3.6.tar.gz
 /pipewire-0.3.7.tar.gz
+/pipewire-0.3.8.tar.gz
diff --git a/0001-jack-handle-NULL-keys.patch b/0001-jack-handle-NULL-keys.patch
deleted file mode 100644
index 6e23f01..0000000
--- a/0001-jack-handle-NULL-keys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d4d80c16c1bf49ac4083466ce3e49ccfa8ff0599 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 21 Jul 2020 16:47:58 +0200
-Subject: [PATCH 1/3] jack: handle NULL keys
-
----
- pipewire-jack/src/pipewire-jack.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
-index fa800344..6cb59f40 100644
---- a/pipewire-jack/src/pipewire-jack.c
-+++ b/pipewire-jack/src/pipewire-jack.c
-@@ -1954,10 +1954,10 @@ static int metadata_property(void *object, uint32_t id,
- 	uuid = jack_port_uuid_generate(id);
- 	update_property(c, uuid, key, type, value);
- 
--	if (strcmp(key, "default.audio.sink.name") == 0) {
-+	if (key && strcmp(key, "default.audio.sink.name") == 0) {
- 		free(c->metadata->default_audio_sink);
- 		c->metadata->default_audio_sink = value ? strdup(value) : NULL;
--	} else if (strcmp(key, "default.audio.source.name") == 0) {
-+	} else if (key && strcmp(key, "default.audio.source.name") == 0) {
- 		free(c->metadata->default_audio_source);
- 		c->metadata->default_audio_source = value ? strdup(value) : NULL;
- 	}
--- 
-2.26.2
-
diff --git a/pipewire.spec b/pipewire.spec
index bb7cf82..ba196ce 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -32,8 +32,8 @@
 
 Name:           pipewire
 Summary:        Media Sharing Server
-Version:        0.3.7
-Release:        2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Version:        0.3.8
+Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        MIT
 URL:            https://pipewire.org/
 %if 0%{?gitrel}
@@ -50,7 +50,6 @@ Source0:	https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/p
 
 ## fedora patches
 Patch0:		0001-conf-disable-bluez5.patch
-Patch1:		0001-jack-handle-NULL-keys.patch
 
 BuildRequires:  meson >= 0.49.0
 BuildRequires:  gcc
@@ -211,7 +210,6 @@ This package provides a PulseAudio implementation based on PipeWire
 %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
 
 %patch0 -p1 -b .0000
-%patch1 -p1 -b .0001
 
 %build
 %meson \
@@ -248,6 +246,11 @@ cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
         %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
 %endif
 
+# upstream should use udev.pc
+mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
+mv -fv %{buildroot}/lib/udev/rules.d/90-pipewire-alsa.rules %{buildroot}%{_prefix}/lib/udev/rules.d
+
+
 %check
 %ifarch s390x
 # FIXME: s390x FAIL: pw-test-stream, pw-test-endpoint
@@ -294,6 +297,11 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %doc README.md
 %{_libdir}/libpipewire-%{apiversion}.so.*
 %{_libdir}/pipewire-%{apiversion}/libpipewire-*.so
+%dir %{_datadir}/alsa-card-profile/
+%dir %{_datadir}/alsa-card-profile/mixer/
+%{_datadir}/alsa-card-profile/mixer/paths/
+%{_datadir}/alsa-card-profile/mixer/profile-sets/
+%{_prefix}/lib/udev/rules.d/90-pipewire-alsa.rules
 %dir %{_libdir}/spa-%{spaversion}
 %{_libdir}/spa-%{spaversion}/alsa/
 %{_libdir}/spa-%{spaversion}/audioconvert/
@@ -346,6 +354,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %if 0%{?enable_alsa}
 %files alsa
 %{_libdir}/alsa-lib/libasound_module_pcm_pipewire.so
+%{_libdir}/alsa-lib/libasound_module_ctl_pipewire.so
 %{_datadir}/alsa/alsa.conf.d/50-pipewire.conf
 %{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pipewire.conf
@@ -384,6 +393,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %endif
 
 %changelog
+* Tue Jul 28 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.8-1
+- Update to 0.3.8
+
 * Tue Jul 21 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.7-2
 - Add patch to avoid crash when clearing metadata
 
diff --git a/sources b/sources
index 4eb1c17..a6c5fba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pipewire-0.3.7.tar.gz) = 2adaa8689b77c5a3a4710f979d23a737daa66f37ebfca9cf95f6c6a1dad770c52a2998959d52c45540b5b885568146b42981d106a2653ff8f167e0b531ee92f9
+SHA512 (pipewire-0.3.8.tar.gz) = a652040ef474932d307294ae198c58caf16cfe9a7c473cad44a595badc1b33de9195b46de476e8ee2d75c1d9412f3b4d1590342f70ae7414a4c31f47b00f78a1