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...
This commit is contained in:
Stefano Ragni 2021-02-18 14:34:07 +01:00 committed by Érico Nogueira Rolim
parent fa0d3a8682
commit ee33341eda
4 changed files with 11 additions and 85 deletions

View file

@ -1,3 +1,3 @@
WARNING: pipewire>=0.3.19 changed the config file format. If WARNING: pipewire frequently changes the config file format. If
you edited /etc/pipewire/pipewire.conf you must recreate it from you edited /etc/pipewire/pipewire.conf you must recreate it from
/etc/pipewire/pipewire.conf.new-0.3.19_1 with your changes on top. /etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top.

View file

@ -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)
{

View file

@ -1,11 +1,11 @@
--- meson.build.orig 2021-01-05 18:40:24.345620177 +0100 --- meson.build.orig 2021-02-18 14:35:42.028024846 +0100
+++ meson.build 2021-01-05 18:40:43.209619527 +0100 +++ meson.build 2021-02-18 14:39:53.808039159 +0100
@@ -325,7 +325,7 @@ @@ -311,7 +311,7 @@
pthread_lib = dependency('threads') pthread_lib = dependency('threads')
dbus_dep = dependency('dbus-1') 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('ncurses', required : false)
+ncurses_dep = dependency('ncursesw', 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') if get_option('gstreamer')

View file

@ -1,11 +1,11 @@
# Template file for 'pipewire' # Template file for 'pipewire'
pkgname=pipewire pkgname=pipewire
version=0.3.21 version=0.3.22
revision=2 revision=1
build_style=meson build_style=meson
configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
-Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
-Dudevrulesdir=/usr/lib/udev/rules.d" -Dvulkan=true -Dudevrulesdir=/usr/lib/udev/rules.d"
hostmakedepends="doxygen graphviz pkg-config xmltoman gettext" hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
# LDAC support can be enabled when ldacbt is packaged # LDAC support can be enabled when ldacbt is packaged
makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
@ -18,7 +18,7 @@ license="MIT"
homepage="https://pipewire.org/" homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
checksum=228e744f7acfac92e4c7a2606ed7f6ecd7460f53ec735e7c01176539e386432b checksum=5db2caf41af79cd9e343d07a3804c63b8b243c1d74e926181058e29771d4b691
conf_files="/etc/pipewire/pipewire.conf" conf_files="/etc/pipewire/pipewire.conf"
replaces="libpulseaudio-pipewire>=0" replaces="libpulseaudio-pipewire>=0"