* Re: [PR PATCH] [Updated] pipewire: update to 0.3.22
2021-02-18 14:57 [PR PATCH] pipewire: update to 0.3.22 st3r4g
@ 2021-02-18 15:41 ` st3r4g
2021-02-19 6:00 ` ericonr
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: st3r4g @ 2021-02-18 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1845 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.22
https://github.com/void-linux/void-packages/pull/28840
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...
NOTE: Released just a couple of hours ago, maybe let's wait a bit to see if any major issue pops up.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28840.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.22-28840.patch --]
[-- Type: text/x-diff, Size: 5360 bytes --]
From c93e7b38fd48e923bb267890b6ab98aa388b00fd 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..7072e95fa01 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"
+ -Dvulkan=true -Dudevrulesdir=/usr/lib/udev/rules.d"
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: pipewire: update to 0.3.22
2021-02-18 14:57 [PR PATCH] pipewire: update to 0.3.22 st3r4g
2021-02-18 15:41 ` [PR PATCH] [Updated] " st3r4g
@ 2021-02-19 6:00 ` ericonr
2021-02-19 22:35 ` [PR PATCH] [Updated] " st3r4g
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-19 6:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28840#issuecomment-781847117
Comment:
Please ping when you think it's good to merge.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] pipewire: update to 0.3.22
2021-02-18 14:57 [PR PATCH] pipewire: update to 0.3.22 st3r4g
2021-02-18 15:41 ` [PR PATCH] [Updated] " st3r4g
2021-02-19 6:00 ` ericonr
@ 2021-02-19 22:35 ` st3r4g
2021-02-19 22:52 ` st3r4g
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: st3r4g @ 2021-02-19 22:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1845 bytes --]
There is an updated pull request by st3r4g against master on the void-packages repository
https://github.com/st3r4g/void-packages pipewire-0.3.22
https://github.com/void-linux/void-packages/pull/28840
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...
NOTE: Released just a couple of hours ago, maybe let's wait a bit to see if any major issue pops up.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28840.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.22-28840.patch --]
[-- Type: text/x-diff, Size: 5940 bytes --]
From 71abae85a3962ae7ab91bd302bb6fd4db0c6e1a2 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...
---
srcpkgs/pipewire/INSTALL.msg | 4 +-
...0bea4167573d3d364e1a768605d11be241293.diff | 74 -------------------
srcpkgs/pipewire/patches/ncursesw.patch | 10 +--
srcpkgs/pipewire/template | 8 +-
4 files changed, 11 insertions(+), 85 deletions(-)
delete mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
index f7c4437683d..8475a2465b7 100644
--- a/srcpkgs/pipewire/INSTALL.msg
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -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
-/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.
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..7072e95fa01 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"
+ -Dvulkan=true -Dudevrulesdir=/usr/lib/udev/rules.d"
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: pipewire: update to 0.3.22
2021-02-18 14:57 [PR PATCH] pipewire: update to 0.3.22 st3r4g
` (2 preceding siblings ...)
2021-02-19 22:35 ` [PR PATCH] [Updated] " st3r4g
@ 2021-02-19 22:52 ` st3r4g
2021-02-19 22:54 ` st3r4g
2021-02-20 6:39 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: st3r4g @ 2021-02-19 22:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/28840#issuecomment-782429553
Comment:
@ericonr good to go. I also updated the INSTALL.msg since the config format keeps on changing.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: pipewire: update to 0.3.22
2021-02-18 14:57 [PR PATCH] pipewire: update to 0.3.22 st3r4g
` (3 preceding siblings ...)
2021-02-19 22:52 ` st3r4g
@ 2021-02-19 22:54 ` st3r4g
2021-02-20 6:39 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: st3r4g @ 2021-02-19 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/28840#issuecomment-782429553
Comment:
@ericonr good to go. I also updated the INSTALL.msg since the config format keeps on changing (and often breaks previous configs).
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: pipewire: update to 0.3.22
2021-02-18 14:57 [PR PATCH] pipewire: update to 0.3.22 st3r4g
` (4 preceding siblings ...)
2021-02-19 22:54 ` st3r4g
@ 2021-02-20 6:39 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-20 6:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1683 bytes --]
There's a merged pull request on the void-packages repository
pipewire: update to 0.3.22
https://github.com/void-linux/void-packages/pull/28840
Description:
* explicitly enable the vulkan plugin: it is now disabled by default due
to being useless at the moment, but we've already packaged it...
NOTE: Released just a couple of hours ago, maybe let's wait a bit to see if any major issue pops up.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread