From de447ce8ceab698f101b19ce65ceaff0f0c1f7b5 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Thu, 18 Feb 2021 14:34:07 +0100
Subject: [PATCH] pipewire: update to 0.3.22

* explicitly enable the vulkan plugin: it is now disabled by default due
to being useless at the moment, but we've already packaged it...
---
 ...0bea4167573d3d364e1a768605d11be241293.diff | 74 -------------------
 srcpkgs/pipewire/patches/ncursesw.patch       | 10 +--
 srcpkgs/pipewire/template                     |  8 +-
 3 files changed, 9 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff

diff --git a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
deleted file mode 100644
index 10cd090cce7..00000000000
--- a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-Fix https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/696
-diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
-index 5163d4a5e287d076160ee01bb8c1c1aac73ff35c..a7ead586db3d682b7ae0e6ba0069fec98458d69b 100644
---- pipewire-jack/src/pipewire-jack.c
-+++ pipewire-jack/src/pipewire-jack.c
-@@ -4719,7 +4719,12 @@ int jack_session_reply (jack_client_t        *client,
- SPA_EXPORT
- void jack_session_event_free (jack_session_event_t *event)
- {
--	pw_log_warn("not implemented");
-+	if (event) {
-+		free((void *)event->session_dir);
-+		free((void *)event->client_uuid);
-+		free(event->command_line);
-+		free(event);
-+	}
- }
- 
- SPA_EXPORT
-@@ -4732,6 +4737,54 @@ char *jack_client_get_uuid (jack_client_t *client)
- 	return spa_aprintf("%"PRIu64, client_make_uuid(c->node_id));
- }
- 
-+SPA_EXPORT
-+jack_session_command_t *jack_session_notify (
-+        jack_client_t*             client,
-+        const char                *target,
-+        jack_session_event_type_t  type,
-+        const char                *path)
-+{
-+	struct client *c = (struct client *) client;
-+	spa_return_val_if_fail(c != NULL, NULL);
-+	pw_log_warn("not implemented");
-+	return NULL;
-+}
-+
-+SPA_EXPORT
-+void jack_session_commands_free (jack_session_command_t *cmds)
-+{
-+	int i;
-+	if (cmds == NULL)
-+		return;
-+
-+	for (i = 0; cmds[i].uuid != NULL; i++) {
-+		free((char*)cmds[i].client_name);
-+		free((char*)cmds[i].command);
-+		free((char*)cmds[i].uuid);
-+	}
-+	free(cmds);
-+}
-+
-+SPA_EXPORT
-+int jack_reserve_client_name (jack_client_t *client,
-+                          const char    *name,
-+                          const char    *uuid)
-+{
-+	struct client *c = (struct client *) client;
-+	spa_return_val_if_fail(c != NULL, -1);
-+	pw_log_warn("not implemented");
-+	return 0;
-+}
-+
-+SPA_EXPORT
-+int jack_client_has_session_callback (jack_client_t *client, const char *client_name)
-+{
-+	struct client *c = (struct client *) client;
-+	spa_return_val_if_fail(c != NULL, -1);
-+	return 0;
-+}
-+
-+
- SPA_EXPORT
- int jack_client_real_time_priority (jack_client_t * client)
- {
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
index 92598546b11..09b8f071c41 100644
--- a/srcpkgs/pipewire/patches/ncursesw.patch
+++ b/srcpkgs/pipewire/patches/ncursesw.patch
@@ -1,11 +1,11 @@
---- meson.build.orig	2021-01-05 18:40:24.345620177 +0100
-+++ meson.build	2021-01-05 18:40:43.209619527 +0100
-@@ -325,7 +325,7 @@
+--- meson.build.orig	2021-02-18 14:35:42.028024846 +0100
++++ meson.build	2021-02-18 14:39:53.808039159 +0100
+@@ -311,7 +311,7 @@
  pthread_lib = dependency('threads')
  dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : false)
+ sdl_dep = dependency('sdl2', required : get_option('sdl2'))
 -ncurses_dep = dependency('ncurses', required : false)
 +ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false)
+ sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
  
  if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index f327ea67fb2..1b57f3ea9cc 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,11 +1,11 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.21
-revision=2
+version=0.3.22
+revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
- -Dudevrulesdir=/usr/lib/udev/rules.d"
+ -Dudevrulesdir=/usr/lib/udev/rules.d -Dvulkan=true"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 # LDAC support can be enabled when ldacbt is packaged
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=228e744f7acfac92e4c7a2606ed7f6ecd7460f53ec735e7c01176539e386432b
+checksum=5db2caf41af79cd9e343d07a3804c63b8b243c1d74e926181058e29771d4b691
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"