Package: pipewire
Version: 0.3.19-1
Followup-For: Bug #979309
Dear Maintainer,
I have packaged a new version of pipewire 0.3.19 that should fix this bug.
I uploaded a new version there:
https://mentors.debian.net/debian/pool/main/p/pipewire/pipewire_0.3.19-0.1.dsc
This my first patch on Debian, I'm eager to learn more and improve the patch if
needed.
Regards,
François
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.10.0-1-amd64 (SMP w/16 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages pipewire depends on:
ii init-system-helpers 1.60
ii libpipewire-0.3-modules 0.3.19-1
ii pipewire-bin 0.3.19-1
pipewire recommends no packages.
pipewire suggests no packages.
-- no debconf information
>From dfedd4c61a8a31948fc3714a6689f42db86cfed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <franc...@2metz.fr>
Date: Sat, 16 Jan 2021 18:03:10 +0100
Subject: [PATCH] New upstream release
---
debian/changelog | 12 ++++++
debian/control | 1 +
debian/libpipewire-0.3-0.symbols | 1 +
...col-native-do-version-check-on-HELLO.patch | 42 -------------------
debian/patches/series | 1 -
.../pipewire-audio-client-libraries.install | 3 --
debian/pipewire-bin.install | 3 ++
debian/rules | 2 -
8 files changed, 17 insertions(+), 48 deletions(-)
delete mode 100644 debian/patches/protocol-native-do-version-check-on-HELLO.patch
delete mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index e49b6f2c..b3ae5cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pipewire (0.3.19-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release (Closes: #979309)
+ * Drop patch d/p/protocol-native-do-version-check-on-HELLO.patch
+ It was applied upstream.
+ * Add pipewire-pulse (Closes: #976654)
+ * Add pw-dump and pw-top tool
+ * Remove pipewire-libpulse as removed by upstream
+
+ -- François de Metz <franc...@2metz.fr> Sat, 16 Jan 2021 18:03:10 +0100
+
pipewire (0.3.15-1) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index 38b0a0ed..0a2699ed 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
libjack-jackd2-dev (>= 1.9.10),
+ libncurses-dev,
libpulse-dev (>= 11.1),
libsbc-dev,
libsdl2-dev,
diff --git a/debian/libpipewire-0.3-0.symbols b/debian/libpipewire-0.3-0.symbols
index 9467b811..fb9ed6e1 100644
--- a/debian/libpipewire-0.3-0.symbols
+++ b/debian/libpipewire-0.3-0.symbols
@@ -265,6 +265,7 @@ libpipewire-0.3.so.0 libpipewire-0.3-0 #MINVER#
pw_properties_setva@Base 0.3.1
pw_properties_update@Base 0.3.1
pw_properties_update_keys@Base 0.3.1
+ pw_properties_update_string@Base 0.3.19-1
pw_protocol_add_listener@Base 0.3.1
pw_protocol_add_marshal@Base 0.3.1
pw_protocol_destroy@Base 0.3.1
diff --git a/debian/patches/protocol-native-do-version-check-on-HELLO.patch b/debian/patches/protocol-native-do-version-check-on-HELLO.patch
deleted file mode 100644
index f8637928..00000000
--- a/debian/patches/protocol-native-do-version-check-on-HELLO.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Wim Taymans <wtaym...@redhat.com>
-Date: Wed, 4 Nov 2020 16:12:25 +0100
-Subject: protocol-native: do version check on HELLO
-
-Always do the version check on HELLO because the connection could
-have been moved from a v3 portal to a v0 client (like chrome)
-
-Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/270
-Origin: upstream, 0.3.16, commit:https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b8c7b36d3b8be16593f554964cf2f852c21b5c2c
----
- src/modules/module-protocol-native/connection.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c
-index 84fad68..1807833 100644
---- a/src/modules/module-protocol-native/connection.c
-+++ b/src/modules/module-protocol-native/connection.c
-@@ -72,7 +72,6 @@ struct impl {
-
- uint32_t version;
- size_t hdr_size;
-- unsigned int checked:1;
- };
-
- /** \endcond */
-@@ -319,7 +318,7 @@ static int prepare_packet(struct pw_protocol_native_connection *conn, struct buf
- buf->msg.opcode = p[1] >> 24;
- len = p[1] & 0xffffff;
-
-- if (!impl->checked) {
-+ if (buf->msg.id == 0 && buf->msg.opcode == 1) {
- if (p[3] >= 4) {
- pw_log_warn("old version detected");
- impl->version = 0;
-@@ -331,7 +330,6 @@ static int prepare_packet(struct pw_protocol_native_connection *conn, struct buf
- spa_hook_list_call(&conn->listener_list,
- struct pw_protocol_native_connection_events,
- start, 0, impl->version);
-- impl->checked = 1;
- }
- if (impl->version >= 3) {
- buf->msg.seq = p[2];
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4a4abafe..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-protocol-native-do-version-check-on-HELLO.patch
diff --git a/debian/pipewire-audio-client-libraries.install b/debian/pipewire-audio-client-libraries.install
index 6b54a024..121f69ab 100644
--- a/debian/pipewire-audio-client-libraries.install
+++ b/debian/pipewire-audio-client-libraries.install
@@ -1,10 +1,7 @@
usr/bin/pw-jack
-usr/bin/pw-pulse
usr/lib/*/alsa-lib/libasound_module_ctl_pipewire.so
usr/lib/*/alsa-lib/libasound_module_pcm_pipewire.so
usr/lib/*/pipewire-0.3/jack
-usr/lib/*/pipewire-0.3/pulse
usr/share/alsa/alsa.conf.d/50-pipewire.conf
usr/share/alsa/alsa.conf.d/99-pipewire-default.conf usr/share/doc/pipewire-client-libraries/examples/alsa.conf.d
usr/share/man/man1/pw-jack.*
-usr/share/man/man1/pw-pulse.*
diff --git a/debian/pipewire-bin.install b/debian/pipewire-bin.install
index 97c18bdc..ea1ca654 100644
--- a/debian/pipewire-bin.install
+++ b/debian/pipewire-bin.install
@@ -2,9 +2,11 @@ etc/pipewire
lib/udev/rules.d
usr/bin/pipewire
usr/bin/pipewire-media-session
+usr/bin/pipewire-pulse
usr/bin/pw-cat
usr/bin/pw-cli
usr/bin/pw-dot
+usr/bin/pw-dump
usr/bin/pw-metadata
usr/bin/pw-mididump
usr/bin/pw-midiplay
@@ -14,6 +16,7 @@ usr/bin/pw-play
usr/bin/pw-profiler
usr/bin/pw-record
usr/bin/pw-reserve
+usr/bin/pw-top
usr/bin/spa-*
usr/share/alsa-card-profile
usr/share/man/man1/pipewire.*
diff --git a/debian/rules b/debian/rules
index 29a26f4e..f49ead29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,11 +50,9 @@ override_dh_shlibdeps-arch:
dh_shlibdeps \
-ppipewire-audio-client-libraries \
-l/usr/lib/$(DEB_HOST_MULTIARCH)/pipewire-0.3 \
- -Xlibpulse-mainloop-glib \
-- \
-Ldebian/pipewire-audio-client-libraries.shlibs.local \
-dRecommends \
- -edebian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pipewire-0.3/pulse/libpulse-mainloop-glib.so.0 \
-dDepends \
$(NULL)
dh_shlibdeps \
--
2.30.0
