Merge updates from debian/bookworm

efb9fc01 · Dylan Aïssi · 34ac7260 · 15d93991 · efb9fc01 · efb9fc01
Commit efb9fc01 authored 2 years ago by Dylan Aïssi
--- a/debian/apertis/component
+++ b/debian/apertis/component
+target
--- a/debian/apertis/copyright
+++ b/debian/apertis/copyright
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: debian/*
+Copyright: 2019-2021 Collabora Ltd.
+License: MIT
+
+Files: docs/*
+Copyright: no-info-found
+License: GPL-2+
+
+Files: * lib/wp/module.c lib/wp/module.h lib/wp/module.c lib/wp/module.h src/scripts/intended-roles.lua src/scripts/policy-bluetooth.lua src/scripts/policy-device-routes.lua src/scripts/restore-stream.lua src/scripts/policy-device-routes.lua src/scripts/restore-stream.lua
+Copyright: 2019-2021 Collabora Ltd.
+License: MIT
+
+Files: lib/wplua/sandbox.lua
+Copyright: 2013 Enrique García Cota,
+ 2020 Collabora Ltd.
+License: MIT
--- a/debian/apparmor.d/usr.bin.wireplumber
+++ b/debian/apparmor.d/usr.bin.wireplumber
+#include <tunables/global>
+
+profile /usr/bin/wireplumber {
+  #include <abstractions/chaiwala-base>
+  #include <abstractions/dbus-strict>
+  #include <abstractions/dbus-session-strict>
+  #include <abstractions/nameservice>
+  #include <abstractions/pipewire>
+  #include <abstractions/user-tmp>
+  #include <abstractions/orc>
+
+  dbus (send, receive) bus=system peer=(label=/usr/lib/bluetooth/bluetoothd),
+  dbus (send, receive) bus=system peer=(label=/usr/sbin/ofonod),
+  dbus (send, receive) bus=system peer=(label=/usr/bin/pipewire),
+  dbus (send, receive) bus=system peer=(label=unconfined),
+
+  dbus send
+       bus=session
+       path=/org/freedesktop/DBus
+       interface=org.freedesktop.DBus
+       member={RequestName,ReleaseName}
+       peer=(name=org.freedesktop.DBus),
+  dbus bind bus=session name=org.freedesktop.ReserveDevice*.Audio*,
+  dbus (send, receive) bus=session peer=(label=unconfined),
+
+  network bluetooth seqpacket,
+  network bluetooth stream,
+
+  @{HOME}/.config/wireplumber/                 rw,
+  @{HOME}/.config/wireplumber/**               rw,
+  @{HOME}/.local/state/                        w,
+  @{HOME}/.local/state/wireplumber/            rw,
+  @{HOME}/.local/state/wireplumber/**          rw,
+
+  /etc/wireplumber/**                          r,
+  /run/udev/data/+sound:*                      rw,
+  # Character device 81:x is video4linux
+  /run/udev/data/c81:*                         r,
+  # Character device 116:x is ALSA
+  /run/udev/data/c116:*                        r,
+  /dev/video*                                  rw,
+  /dev/snd/                                    r,
+  owner @{PROC}/*/stat			       r,
+  owner @{PROC}/*/fd/			       r,
+  owner @{PROC}/*/fd/*			       r,
+
+  /sys/bus/                                    r,
+  /sys/class/                                  r,
+  /sys/class/sound/                            r,
+  /sys/class/video4linux/                      r,
+  /sys/devices/**                              r,
+
+  # tell systemd --user that we're ready
+  /run/user/*/systemd/notify                   w,
+
+  # allow access for systemd login state
+  /run/systemd/users/*                         r,
+
+  /run/user/*/pipewire*                        rw,
+}
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,24 @@ wireplumber (0.4.10-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 11 May 2022 14:01:51 +0200

+wireplumber (0.4.9-1+apertis2) apertis; urgency=medium
+
+  [ Dylan Aïssi ]
+  * Refresh the automatically detected licensing information
+
+  [ Frédéric Danis ]
+  * d/patches: Add fallback sink script
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Mon, 04 Apr 2022 10:17:16 +0200
+
+wireplumber (0.4.9-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Remaining Apertis delta:
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Mon, 28 Mar 2022 07:50:58 +0000
+
 wireplumber (0.4.9-1) unstable; urgency=medium

  * Team upload.
@@ -22,6 +40,20 @@ wireplumber (0.4.9-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 23 Mar 2022 10:03:02 +0100

+wireplumber (0.4.8-4+apertis2) apertis; urgency=medium
+
+  * apparmor: Fix rules for /dev/snd/ access
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Wed, 16 Mar 2022 11:33:32 +0100
+
+wireplumber (0.4.8-4+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Remaining Apertis delta:
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Wed, 16 Mar 2022 09:25:02 +0000
+
 wireplumber (0.4.8-4) unstable; urgency=medium

  * Team upload
@@ -31,6 +63,14 @@ wireplumber (0.4.8-4) unstable; urgency=medium

 -- Simon McVittie <smcv@debian.org>  Fri, 11 Mar 2022 10:26:20 +0000

+wireplumber (0.4.8-3+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Remaining Apertis delta:
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Tue, 22 Feb 2022 13:10:09 +0000
+
 wireplumber (0.4.8-3) unstable; urgency=medium

  * Team upload.
@@ -39,6 +79,14 @@ wireplumber (0.4.8-3) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 16 Feb 2022 16:33:32 +0100

+wireplumber (0.4.8-2+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Drop patches included in upstream release:
+    - 01-policy-endpint-add-support-for-stream-audio-nodes-wi.patch
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Tue, 15 Feb 2022 16:06:42 +0100
+
 wireplumber (0.4.8-2) unstable; urgency=medium

  * Team upload.
@@ -56,6 +104,26 @@ wireplumber (0.4.8-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Mon, 07 Feb 2022 23:21:05 +0100

+wireplumber (0.4.7-1+apertis2) apertis; urgency=medium
+
+  * d/patches: Add support for stream audio nodes without media.role
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Thu, 03 Feb 2022 09:08:03 +0100
+
+wireplumber (0.4.7-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Drop patches included in upstream release:
+    - 0001-si-audio-adapter-clean-up-unneeded-code-when-setting.patch
+    - 0002-si-audio-adapter-always-return-task-error-if-set-por.patch
+    - 0003-si-standard-link-always-return-transition-error-if-a.patch
+  * Drop patch not needed anymore:
+    - 0004-si-standard-link-handle-proxy-destroyed-signal-when-.patch
+  * Remaining Apertis delta:
+    - Install AppArmor rules
+
+ -- Apertis CI <devel@lists.apertis.org>  Tue, 18 Jan 2022 07:51:24 +0000
+
 wireplumber (0.4.7-1) unstable; urgency=medium

  * Team upload.
@@ -73,6 +141,21 @@ wireplumber (0.4.6-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Mon, 10 Jan 2022 17:08:47 +0100

+wireplumber (0.4.5-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Drop patches included in upstream release:
+    - 0001-m-si-audio-endpoint-do-not-use-virtual-media-class-f.patch
+  * Add patches:
+    - 0001-si-audio-adapter-clean-up-unneeded-code-when-setting.patch
+    - 0002-si-audio-adapter-always-return-task-error-if-set-por.patch
+    - 0003-si-standard-link-always-return-transition-error-if-a.patch
+    - 0004-si-standard-link-handle-proxy-destroyed-signal-when-.patch
+  * Remaining Apertis delta:
+    - Install AppArmor rules
+
+ -- Apertis CI <devel@lists.apertis.org>  Tue, 23 Nov 2021 08:14:24 +0000
+
 wireplumber (0.4.5-1) unstable; urgency=medium

  * Team upload.
@@ -81,6 +164,14 @@ wireplumber (0.4.5-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 17 Nov 2021 20:34:51 +0100

+wireplumber (0.4.4-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+  * Remaining Apertis delta:
+    - Install AppArmor rules
+
+ -- Apertis CI <devel@lists.apertis.org>  Sat, 23 Oct 2021 07:43:31 +0000
+
 wireplumber (0.4.4-1) unstable; urgency=medium

  * Team upload.
@@ -90,6 +181,18 @@ wireplumber (0.4.4-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Mon, 18 Oct 2021 11:16:15 +0200

+wireplumber (0.4.3-1+apertis2) apertis; urgency=medium
+
+  * apparmor: Fix rules for systemd-logind
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Thu, 21 Oct 2021 13:57:07 +0200
+
+wireplumber (0.4.3-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+
+ -- Apertis CI <devel@lists.apertis.org>  Fri, 15 Oct 2021 08:25:08 +0000
+
 wireplumber (0.4.3-1) unstable; urgency=medium

  * Team upload.
@@ -102,6 +205,12 @@ wireplumber (0.4.3-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Fri, 08 Oct 2021 15:57:11 +0200

+wireplumber (0.4.2-5+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian bookworm
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Tue, 21 Sep 2021 10:22:16 +0200
+
 wireplumber (0.4.2-5) unstable; urgency=medium

  * Add upstream patches to prevent a failure to start when
@@ -116,6 +225,23 @@ wireplumber (0.4.2-4) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 01 Sep 2021 11:04:02 +0200

+wireplumber (0.4.2-3+apertis2) apertis; urgency=medium
+
+  [ Dylan Aïssi ]
+  * Refresh the automatically detected licensing information
+
+  [ Frédéric Danis ]
+  * Update apparmor rule
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Mon, 27 Sep 2021 11:32:04 +0200
+
+wireplumber (0.4.2-3+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Experimental
+     Remove patch merged upstream
+
+ -- Apertis CI <devel@lists.apertis.org>  Tue, 31 Aug 2021 12:34:43 +0000
+
 wireplumber (0.4.2-3) experimental; urgency=medium

  * Team upload.
@@ -151,6 +277,14 @@ wireplumber (0.4.1-1) experimental; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 22 Jul 2021 10:16:45 +0200

+wireplumber (0.4.0-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Experimental
+    Remove patches merged upstream
+  * d/patches: Fix audio sound in VirtualBox
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Wed, 24 Jun 2021 09:35:48 +0200
+
 wireplumber (0.4.0-1) experimental; urgency=medium

  * Team upload.
@@ -172,12 +306,44 @@ wireplumber (0.4.0-1) experimental; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 16 Jun 2021 12:09:12 +0200

-wireplumber (0.3.95-1) experimental; urgency=medium
+wireplumber (0.3.96-1+apertis3) apertis; urgency=medium

-  [ Frederic Danis ]
-  * Initial release (Closes: #988143)
+  * d/patches: Fix policy endpoints preventing to record sound
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Mon, 31 May 2021 15:07:50 +0200
+
+wireplumber (0.3.96-1+apertis2) apertis; urgency=medium
+
+  * d/patches: Fix build tests
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Thu, 27 May 2021 16:56:00 +0200
+
+wireplumber (0.3.96-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Experimental
+
+ -- Frederic Danis <frederic.danis@collabora.com>  Wed, 27 May 2021 14:20:29 +0200
+
+wireplumber (0.3.95-0+apertis2) apertis; urgency=medium
+
+  * d/patches: Backport systemd conflicts patch
+  * Add apparmor rule
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Fri, 21 May 2021 17:54:50 +0200
+
+wireplumber (0.3.95-0apertis1) apertis; urgency=medium
+
+  [ Andrej Shadura ]
+  * Set component to target
+  * Add automatically detected copyright and licensing information
+
+  [ Frédéric Danis ]
+  * d/patches: Backport 32bits fixes
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Fri, 14 May 2021 09:45:21 +0200
+
+wireplumber (0.3.95-0apertis0) apertis; urgency=medium

-  [ Sjoerd Simons ]
-  * Upload to experimental
+  * Initial release (Debian ITP: #988143)

- -- Sjoerd Simons <sjoerd@debian.org>  Tue, 18 May 2021 22:02:27 +0200
+ -- Frederic Danis <frederic.danis@collabora.com>  Wed, 05 May 2021 15:25:29 +0000
--- a/debian/patches/0001-scripts-Add-script-to-create-fallback-sink.patch
+++ b/debian/patches/0001-scripts-Add-script-to-create-fallback-sink.patch
+From 57769c20715873a06a756494f50bd2c6a9c71bea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
+Date: Thu, 31 Mar 2022 14:57:20 +0200
+Subject: [PATCH] scripts: Add script to create fallback sink
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+This script, base on PipeWire module fallback-sink will create a fallback
+sink node if there's no other sink available except the endpoints created
+by WirePlumber.
+---
+ src/scripts/fallback-sink.lua | 93 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 93 insertions(+)
+ create mode 100644 src/scripts/fallback-sink.lua
+
+diff --git a/src/scripts/fallback-sink.lua b/src/scripts/fallback-sink.lua
+new file mode 100644
+index 0000000..d7c3cfa
+--- /dev/null
+++ b/src/scripts/fallback-sink.lua
+@@ -0,0 +1,93 @@
+-- WirePlumber
+--
+-- Copyright © 2021 Collabora Ltd.
+--    @author Frédéric Danis <frederic.danis@collabora.com>
+--
+-- SPDX-License-Identifier: MIT
+
+local sink_ids = {}
+local fallback_node = nil
+
+node_om = ObjectManager {
+  Interest {
+    type = "node",
+    Constraint { "media.class", "matches", "Audio/Sink", type = "pw-global" },
+    -- Do not consider endpoints created by WirePlumber
+    Constraint { "wireplumber.is-endpoint", "!", true, type = "pw" },
+    -- or the fallback sink itself
+    Constraint { "wireplumber.is-fallback", "!", true, type = "pw" },
+  }
+}
+
+function createFallbackSink()
+  if fallback_node then
+    return
+  end
+
+  Log.info("Create fallback sink")
+
+  local properties = {}
+
+  properties["node.name"] = "auto_null"
+  properties["node.description"] = "Dummy Output"
+
+  properties["audio.rate"] = 48000
+  properties["audio.channels"] = 2
+  properties["audio.position"] = "FL,FR"
+
+  properties["media.class"] = "Audio/Sink"
+  properties["factory.name"] = "support.null-audio-sink"
+  properties["node.virtual"] = "true"
+  properties["monitor.channel-volumes"] = "true"
+
+  properties["wireplumber.is-fallback"] = "true"
+  properties["priority.session"] = 500
+
+  fallback_node = LocalNode("adapter", properties)
+  fallback_node:activate(Feature.Proxy.BOUND)
+end
+
+function checkSinks()
+  local sink_ids_items = 0
+  for _ in pairs(sink_ids) do sink_ids_items = sink_ids_items + 1 end
+
+  if sink_ids_items > 0 then
+    if fallback_node then
+      Log.info("Remove fallback sink")
+      fallback_node = nil
+    end
+  elseif not fallback_node then
+    createFallbackSink()
+  end
+end
+
+function checkSinksAfterTimeout()
+  if timeout_source then
+    timeout_source:destroy()
+  end
+  timeout_source = Core.timeout_add(1000, function ()
+    checkSinks()
+    timeout_source = nil
+  end)
+end
+
+node_om:connect("object-added", function (_, node)
+  Log.debug("object added: " .. node.properties["object.id"] .. " " ..
+      tostring(node.properties["node.name"]))
+
+  sink_ids[node.properties["object.id"]] = node.properties["node.name"]
+
+  checkSinksAfterTimeout()
+end)
+
+node_om:connect("object-removed", function (_, node)
+  Log.debug("object removed: " .. node.properties["object.id"] .. " " ..
+      tostring(node.properties["node.name"]))
+
+  sink_ids[node.properties["object.id"]] = nil
+  checkSinksAfterTimeout()
+end)
+
+node_om:activate()
+
+checkSinksAfterTimeout()
+-- 
+2.25.1
+
--- a/debian/patches/apertis-0001-scripts-Automatically-load-fallback-sink.patch
+++ b/debian/patches/apertis-0001-scripts-Automatically-load-fallback-sink.patch
+From c0659653b6b04a5aa2d00a04d153641a7f669c83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
+Date: Tue, 5 Apr 2022 09:38:06 +0200
+Subject: [PATCH] scripts: Automatically load fallback sink
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+---
+ src/config/main.lua.d/90-enable-all.lua | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/config/main.lua.d/90-enable-all.lua b/src/config/main.lua.d/90-enable-all.lua
+index d518805..86777e4 100644
+--- a/src/config/main.lua.d/90-enable-all.lua
+++ b/src/config/main.lua.d/90-enable-all.lua
+@@ -20,3 +20,6 @@ load_script("intended-roles.lua")
+ 
+ -- Automatically suspends idle nodes after 3 seconds
+ load_script("suspend-node.lua")
+
+-- Automatically create fallback sink node
+load_script("fallback-sink.lua")
+-- 
+2.25.1
+
--- a/debian/patches/series
+++ b/debian/patches/series
+0001-scripts-Add-script-to-create-fallback-sink.patch
+apertis-0001-scripts-Automatically-load-fallback-sink.patch
--- a/debian/wireplumber.install
+++ b/debian/wireplumber.install
@@ -2,3 +2,4 @@ usr/bin
 usr/lib/systemd
 usr/share/wireplumber
 usr/share/locale
+debian/apparmor.d/usr.bin.wireplumber etc/apparmor.d/