Merge updates from debian/bullseye-backports

375609b5 · Dylan Aïssi · 0d1eeb2b · bad88b72 · 375609b5 · 375609b5
Commit 375609b5 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: *
+Copyright: 2017-2022, Wim Taymans
+License: Expat
+
+Files: README.md
+Copyright: no-info-found
+License: Expat
+
+Files: debian/*
+Copyright: no-info-found
+License: Expat
+
+Files: debian/tests/gstreamer1.0-pipewire
+ debian/tests/libpipewire-0.3-dev
+Copyright: 2020, Collabora Ltd.
+License: Expat
+
+Files: doc/*
+Copyright: 2021, jothepro
+License: Expat
+
+Files: include/*
+Copyright: 2000-2017, Julian Seward.
+License: GPL-2
+
+Files: pipewire-jack/jack/*
+Copyright: 2004, 2010, 2013, Paul Davis
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/control.h
+Copyright: no-info-found
+License: GPL-2
+
+Files: pipewire-jack/jack/intclient.h
+Copyright: 2004, Jack OQuin
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/jack.h
+ pipewire-jack/jack/transport.h
+ pipewire-jack/jack/types.h
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/jslist.h
+Copyright: 2002, Kai Vehmanen.
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/metadata.h
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/midiport.h
+Copyright: 2004, Ian Esten
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/net.h
+ pipewire-jack/jack/systemdeps.h
+Copyright: 2004-2012, Grame
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/ringbuffer.h
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/session.h
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: pipewire-jack/jack/statistics.h
+Copyright: 2004, Rui Nuno Capela, Lee Revell
+License: LGPL-2.1+
+
+Files: spa/plugins/alsa/90-pipewire-alsa.rules
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: spa/plugins/alsa/acp/*
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: spa/plugins/alsa/acp/alsa-ucm.c
+ spa/plugins/alsa/acp/alsa-ucm.h
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: spa/plugins/alsa/acp/conf-parser.c
+ spa/plugins/alsa/acp/conf-parser.h
+ spa/plugins/alsa/acp/llist.h
+Copyright: 2004-2006, Lennart Poettering
+License: LGPL-2.1+
+
+Files: spa/plugins/alsa/mixer/*
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: spa/plugins/alsa/mixer/profile-sets/kinect-audio.conf
+Copyright: 2011, Antonio Ospite <ospite@studenti.unina.it>
+License: LGPL-2.1+
+
+Files: spa/plugins/bluez5/a2dp-codec-caps.h
+Copyright: no-info-found
+License: LGPL-2.1+
+
+Files: spa/plugins/bluez5/a2dp-codecs.c
+Copyright: 2016, 2017, Arkadiusz Bokowy
+License: Expat
+
+Files: spa/plugins/bluez5/rtp.h
+Copyright: 2004-2010, Marcel Holtmann <marcel@holtmann.org>
+License: LGPL-2.1+
+
+Files: spa/plugins/vulkan/shaders/disk-intersection.comp
+Copyright: 2013, Inigo Quilez
+License: Expat
+
+Files: src/modules/module-filter-chain/ladspa.h
+Copyright: 2000-2002, Richard W.E. Furse, Paul Barton-Davis
+License: LGPL-2.1+
+
+Files: src/modules/module-rt.c
+Copyright: 2022, Wim Taymans
+License: Expat
+
+Files: pipewire-alsa/* pipewire-alsa/alsa-plugins/* pipewire-jack/* pipewire-jack/src/control.c pipewire-v4l2/* spa/* spa/examples/* spa/examples/example-control.c spa/examples/local-v4l2.c spa/examples/example-control.c spa/examples/local-v4l2.c spa/include/spa/interfaces/* spa/include/spa/monitor/type-info.h spa/include/spa/utils/ansi.h spa/include/spa/utils/string.h spa/include/spa/utils/ansi.h spa/include/spa/utils/string.h spa/plugins/aec/* spa/plugins/aec/aec-null.c spa/plugins/alsa/alsa.h spa/plugins/audioconvert/biquad.c spa/plugins/audioconvert/biquad.h spa/plugins/audioconvert/crossover.c spa/plugins/audioconvert/crossover.h spa/plugins/audioconvert/biquad.h spa/plugins/audioconvert/crossover.c spa/plugins/audioconvert/crossover.h spa/plugins/audioconvert/biquad.h spa/plugins/audioconvert/crossover.c spa/plugins/audioconvert/crossover.h spa/plugins/libcamera/* spa/plugins/libcamera/libcamera-client.c spa/plugins/libcamera/libcamera-manager.cpp spa/plugins/libcamera/libcamera-manager.hpp spa/plugins/libcamera/libcamera.c spa/plugins/libcamera/libcamera.h spa/plugins/libcamera/libcamera.c spa/plugins/libcamera/libcamera.h spa/plugins/support/journal.c spa/plugins/support/log-patterns.c spa/plugins/vulkan/shaders/* src/* src/modules/module-echo-cancel.c src/modules/module-filter-chain/biquad.c src/modules/module-filter-chain/biquad.h src/modules/module-filter-chain/convolver.c src/modules/module-filter-chain/pffft.c src/modules/module-filter-chain/pffft.h src/modules/module-filter-chain/pffft.c src/modules/module-filter-chain/pffft.h src/modules/module-pipe-tunnel.c src/modules/module-protocol-pulse/collect.h src/modules/module-protocol-pulse/volume.h src/modules/module-protocol-pulse/collect.h src/modules/module-protocol-pulse/volume.h src/modules/module-protocol-pulse/log.h src/modules/module-protocol-pulse/module.c src/modules/module-protocol-pulse/module.h src/modules/module-protocol-pulse/module.c src/modules/module-protocol-pulse/module.h src/modules/module-protocol-pulse/modules/* src/modules/module-protocol-pulse/modules/module-combine-sink.c src/modules/module-protocol-pulse/modules/module-echo-cancel.c src/modules/module-protocol-pulse/modules/module-loopback.c src/modules/module-protocol-pulse/modules/module-combine-sink.c src/modules/module-protocol-pulse/modules/module-echo-cancel.c src/modules/module-protocol-pulse/modules/module-loopback.c src/modules/module-protocol-pulse/modules/module-combine-sink.c src/modules/module-protocol-pulse/modules/module-echo-cancel.c src/modules/module-protocol-pulse/modules/module-loopback.c src/modules/module-protocol-pulse/modules/module-null-sink.c src/modules/module-protocol-pulse/modules/module-pipe-sink.c src/modules/module-protocol-pulse/modules/module-pipe-source.c src/modules/module-protocol-pulse/modules/module-roc-sink-input.c src/modules/module-protocol-pulse/modules/module-roc-sink.c src/modules/module-protocol-pulse/modules/module-roc-source.c src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c src/modules/module-protocol-pulse/modules/module-pipe-sink.c src/modules/module-protocol-pulse/modules/module-pipe-source.c src/modules/module-protocol-pulse/modules/module-roc-sink-input.c src/modules/module-protocol-pulse/modules/module-roc-sink.c src/modules/module-protocol-pulse/modules/module-roc-source.c src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c src/modules/module-protocol-pulse/modules/module-pipe-sink.c src/modules/module-protocol-pulse/modules/module-pipe-source.c src/modules/module-protocol-pulse/modules/module-roc-sink-input.c src/modules/module-protocol-pulse/modules/module-roc-sink.c src/modules/module-protocol-pulse/modules/module-roc-source.c src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c src/modules/module-protocol-pulse/modules/module-pipe-sink.c src/modules/module-protocol-pulse/modules/module-pipe-source.c src/modules/module-protocol-pulse/modules/module-roc-sink-input.c src/modules/module-protocol-pulse/modules/module-roc-sink.c src/modules/module-protocol-pulse/modules/module-roc-source.c src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c src/modules/module-protocol-pulse/modules/module-pipe-sink.c src/modules/module-protocol-pulse/modules/module-pipe-source.c src/modules/module-protocol-pulse/modules/module-roc-sink-input.c src/modules/module-protocol-pulse/modules/module-roc-sink.c src/modules/module-protocol-pulse/modules/module-roc-source.c src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c src/modules/module-protocol-pulse/modules/module-pipe-sink.c src/modules/module-protocol-pulse/modules/module-pipe-source.c src/modules/module-protocol-pulse/modules/module-roc-sink-input.c src/modules/module-protocol-pulse/modules/module-roc-sink.c src/modules/module-protocol-pulse/modules/module-roc-source.c src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c src/modules/module-protocol-pulse/modules/module-switch-on-connect.c src/modules/module-protocol-simple.c src/modules/module-x11-bell.c src/modules/module-protocol-simple.c src/modules/module-x11-bell.c src/modules/module-roc-sink.c src/modules/module-roc-source.c src/modules/module-roc-sink.c src/modules/module-roc-source.c src/modules/module-session-manager.c src/modules/module-session-manager/* src/modules/spa/module-node.c src/pipewire/extensions/session-manager.h src/pipewire/extensions/session-manager/* src/pipewire/impl-module.c src/pipewire/impl-module.h src/pipewire/impl-module.c src/pipewire/impl-module.h src/tests/test-cpp.cpp src/tests/test-endpoint.c src/tools/pw-cat.c src/tools/pw-dot.c src/tools/pw-dump.c src/tools/pw-loopback.c src/tools/pw-dump.c src/tools/pw-loopback.c test/* test/test-array.c test/test-client.c test/test-context.c test/test-functional.c test/test-utils.c test/test-array.c test/test-client.c test/test-context.c test/test-functional.c test/test-utils.c test/test-array.c test/test-client.c test/test-context.c test/test-functional.c test/test-utils.c test/test-array.c test/test-client.c test/test-context.c test/test-functional.c test/test-utils.c test/test-array.c test/test-client.c test/test-context.c test/test-functional.c test/test-utils.c test/test-loop.c test/test-spa-json.c test/test-spa-node.c test/test-spa-pod.c test/test-loop.c test/test-spa-json.c test/test-spa-node.c test/test-spa-pod.c test/test-loop.c test/test-spa-json.c test/test-spa-node.c test/test-spa-pod.c test/test-loop.c test/test-spa-json.c test/test-spa-node.c test/test-spa-pod.c test/test-properties.c test/test-spa-buffer.c test/test-spa-utils.c test/test-spa-buffer.c test/test-spa-utils.c
+Copyright: 2009 Lennart Poettering
+ 2010 David Henningsson
+ 2013 Inigo Quilez
+ 2015-2020 Wim Taymans
+ 2016 Axis Communications
+ 2018-2020 Collabora Ltd.
+ 2020 Konsulko Group
+ 2020 Sergey Bugaev
+ 2020 Georges Basile Stavracas Neto
+License: Expat
+
+Files: spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h spa/plugins/alsa/acp/acp.c spa/plugins/alsa/acp/acp.h spa/plugins/alsa/acp/array.h spa/plugins/alsa/acp/dynarray.h spa/plugins/alsa/acp/hashmap.h spa/plugins/alsa/acp/idxset.h spa/plugins/alsa/acp/proplist.h
+Copyright: 1999 Tom Tromey
+ 2000 Red Hat, Inc.
+ 2004-2009 Lennart Poettering
+ 2006 Pierre Ossman
+ 2006 Pierre Ossman for Cendio AB
+ 2011 Intel Corporation
+ 2011 Collabora Multimedia
+ 2011 Arun Raghavan
+ 2011 Wolfson Microelectronics PLC
+ 2012 Feng Wei, Freescale Ltd.
+ 2015-2020 Wim Taymans
+License: LGPL-2+ and LGPL-2.1+ and Expat
+
+Files: spa/plugins/bluez5/a2dp-codec-faststream.c spa/plugins/bluez5/a2dp-codec-lc3plus.c spa/plugins/bluez5/a2dp-codec-faststream.c spa/plugins/bluez5/a2dp-codec-lc3plus.c spa/plugins/bluez5/a2dp-source.c spa/plugins/bluez5/backend-hsphfpd.c spa/plugins/bluez5/backend-ofono.c spa/plugins/bluez5/sco-io.c spa/plugins/bluez5/sco-sink.c spa/plugins/bluez5/sco-source.c spa/plugins/bluez5/backend-hsphfpd.c spa/plugins/bluez5/backend-ofono.c spa/plugins/bluez5/sco-io.c spa/plugins/bluez5/sco-sink.c spa/plugins/bluez5/sco-source.c spa/plugins/bluez5/backend-hsphfpd.c spa/plugins/bluez5/backend-ofono.c spa/plugins/bluez5/sco-io.c spa/plugins/bluez5/sco-sink.c spa/plugins/bluez5/sco-source.c spa/plugins/bluez5/backend-hsphfpd.c spa/plugins/bluez5/backend-ofono.c spa/plugins/bluez5/sco-io.c spa/plugins/bluez5/sco-sink.c spa/plugins/bluez5/sco-source.c spa/plugins/bluez5/backend-hsphfpd.c spa/plugins/bluez5/backend-ofono.c spa/plugins/bluez5/sco-io.c spa/plugins/bluez5/sco-sink.c spa/plugins/bluez5/sco-source.c spa/plugins/bluez5/backend-native.c spa/plugins/bluez5/hci.c spa/plugins/bluez5/player.c spa/plugins/bluez5/player.h spa/plugins/bluez5/quirks.c spa/plugins/bluez5/hci.c spa/plugins/bluez5/player.c spa/plugins/bluez5/player.h spa/plugins/bluez5/quirks.c spa/plugins/bluez5/hci.c spa/plugins/bluez5/player.c spa/plugins/bluez5/player.h spa/plugins/bluez5/quirks.c spa/plugins/bluez5/hci.c spa/plugins/bluez5/player.c spa/plugins/bluez5/player.h spa/plugins/bluez5/quirks.c
+Copyright: 2004-2010 Marcel Holtmann
+ 2006-2010 Nokia Corporation
+ 2016-2017 Arkadiusz Bokowy
+ 2018 Wim Taymans
+ 2019 Collabora Ltd.
+License: Expat and LGPL-2.1+
+
+Files: src/modules/module-client-node/v0/* src/modules/module-portal.c src/modules/module-protocol-native/v0/*
+Copyright: 2015-2017 Wim Taymans
+ 2019 Red Hat Inc.
+License: LGPL-2+
--- a/debian/apparmor.d/abstractions/pipewire
+++ b/debian/apparmor.d/abstractions/pipewire
+  #include <abstractions/freedesktop.org>
+  #include <abstractions/audio>
+
+  owner @{HOME}/.Xauthority		r,
+
+
+# Applications can launch pulse due to autolaunching in some cases
+  /usr/bin/pipewire                          rmPx,
+
+  # pulseaudio probes whether other processes exist so that it can
+  # know whether to clean up their shared memory segments.
+  signal (receive) set=("exists") peer=/usr/bin/pipewire,
--- a/debian/apparmor.d/usr.bin.pipewire
+++ b/debian/apparmor.d/usr.bin.pipewire
+#include <tunables/global>
+
+profile /usr/bin/pipewire {
+  #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 bus=system peer=(name=org.freedesktop.RealtimeKit1),
+
+  dbus (send, receive) bus=session peer=(label=unconfined),
+
+  @{HOME}/.ICEauthority                        r,
+  @{HOME}/.config/pipewire/                    rw,
+  @{HOME}/.config/pipewire/**                  rw,
+
+  /                                            r,
+  /etc/pipewire/                               r,
+  /etc/pipewire/*.conf                         r,
+  /dev/video*                                  rw,
+  /sys/devices/virtual/dmi/id/*                r,
+  /usr/bin/pactl                               ix,
+  owner @{PROC}/*/stat                         r,
+  owner @{PROC}/*/fd/                          r,
+  owner @{PROC}/*/fd/*                         r,
+
+  # This seems to be mediated as ptrace(trace), ptrace(traceby).
+  ptrace (read),
+
+  # tell systemd --user that we're ready
+  /run/user/*/systemd/notify w,
+
+  owner /run/user/*/pipewire*                  krw,
+  owner /run/user/*/pulse/{,*}                 krw,
+}
--- a/debian/apparmor.d/usr.bin.pipewire-pulse
+++ b/debian/apparmor.d/usr.bin.pipewire-pulse
+#include <tunables/global>
+
+# attach_disconnected flag is needed to open /proc/<pid>/root
+# when called from flatpak containers
+profile /usr/bin/pipewire-pulse flags=(attach_disconnected) {
+  #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
+       bus=session
+       path=/org/freedesktop/DBus
+       interface=org.freedesktop.DBus
+       member={RequestName,ReleaseName}
+       peer=(name=org.freedesktop.DBus),
+  dbus bind bus=session name=org.pulseaudio.Server,
+
+  capability sys_ptrace,
+
+  @{HOME}/.config/pulse/                       rw,
+  @{HOME}/.config/pulse/**                     rw,
+
+  /                                            r,
+  /etc/pipewire/*.conf                         r,
+  /sys/devices/virtual/dmi/id/*                r,
+  owner @{PROC}/*/stat                         r,
+  owner @{PROC}/*/fd/                          r,
+  owner @{PROC}/*/fd/*                         r,
+  /.flatpak-info                               r,
+
+
+  # This seems to be mediated as ptrace(trace), ptrace(traceby).
+  ptrace (read),
+
+  /run/user/*/pipewire*                        rw,
+}
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,20 @@ pipewire (0.3.53-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Fri, 01 Jul 2022 14:08:59 +0200

+pipewire (0.3.52-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+      - libfreeaptx-dev (proprietary codec, unknown legal status)
+      - libsdl2 (not needed)
+      - libxfixes-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Tue, 14 Jun 2022 21:25:36 +0200
+
 pipewire (0.3.52-1) unstable; urgency=medium

  [ Dylan Aïssi ]
@@ -98,6 +112,20 @@ pipewire (0.3.52-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 09 Jun 2022 22:17:03 +0200

+pipewire (0.3.51-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+      - libfreeaptx-dev (proprietary codec, unknown legal status)
+      - libsdl2 (not needed)
+      - libxfixes-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Thu, 05 May 2022 10:08:15 +0200
+
 pipewire (0.3.51-1) unstable; urgency=medium

  * Team upload.
@@ -135,6 +163,20 @@ pipewire (0.3.50-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 14 Apr 2022 10:11:53 +0200

+pipewire (0.3.49-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+      - libfreeaptx-dev (proprietary codec, unknown legal status)
+      - libxfixes-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Sat, 02 Apr 2022 15:09:55 +0000
+
 pipewire (0.3.49-1) unstable; urgency=medium

  * Team upload.
@@ -145,6 +187,31 @@ pipewire (0.3.49-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 30 Mar 2022 12:06:06 +0200

+pipewire (0.3.48-1+apertis3) apertis; urgency=medium
+
+  * apparmor: Fix pactl execution rights
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Wed, 16 Mar 2022 11:28:47 +0100
+
+pipewire (0.3.48-1+apertis2) apertis; urgency=medium
+
+  * Disable xfixes build depends
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Tue, 15 Mar 2022 12:23:03 +0100
+
+pipewire (0.3.48-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+      - libfreeaptx-dev (proprietary codec, unknown legal status)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Mon, 07 Mar 2022 08:40:06 +0000
+
 pipewire (0.3.48-1) unstable; urgency=medium

  * Team upload.
@@ -153,6 +220,19 @@ pipewire (0.3.48-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 03 Mar 2022 15:43:37 +0100

+pipewire (0.3.47-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+      - libfreeaptx-dev (proprietary codec, unknown legal status)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Mon, 21 Feb 2022 08:40:50 +0000
+
 pipewire (0.3.47-1) unstable; urgency=medium

  * Team upload.
@@ -176,6 +256,18 @@ pipewire (0.3.45-2) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Tue, 15 Feb 2022 11:18:05 +0100

+pipewire (0.3.45-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+    - Install AppArmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Thu, 10 Feb 2022 11:37:31 +0100
+
 pipewire (0.3.45-1) unstable; urgency=medium

  * Team upload.
@@ -197,6 +289,17 @@ pipewire (0.3.44-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 27 Jan 2022 16:24:40 +0100

+pipewire (0.3.43-2+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Thu, 13 Jan 2022 08:35:01 +0000
+
 pipewire (0.3.43-2) unstable; urgency=medium

  * Team upload.
@@ -214,6 +317,17 @@ pipewire (0.3.43-1) unstable; urgency=medium

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

+pipewire (0.3.42-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+      - liblilv-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Mon, 20 Dec 2021 12:48:58 +0000
+
 pipewire (0.3.42-1) unstable; urgency=medium

  * Team upload.
@@ -253,6 +367,16 @@ pipewire (0.3.40-2) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Wed, 24 Nov 2021 15:07:07 +0100

+pipewire (0.3.40-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Mon, 22 Nov 2021 15:08:20 +0100
+
 pipewire (0.3.40-1) unstable; urgency=medium

  * Team upload.
@@ -319,6 +443,23 @@ pipewire (0.3.39-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 21 Oct 2021 17:14:22 +0200

+pipewire (0.3.38-2+apertis2) apertis; urgency=medium
+
+  * Re-enable pipewire-jack support
+
+ -- Ryan Gonzalez <ryan.gonzalez@collabora.com>  Tue, 02 Nov 2021 08:42:00 -0600
+
+pipewire (0.3.38-2+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+    - Replace libreadline-dev by libeditreadline-dev in Build-Deps
+      - Add a patch to help meson to find libeditreadline-dev
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Tue, 05 Oct 2021 07:39:12 +0000
+
 pipewire (0.3.38-2) unstable; urgency=medium

  * Team upload.
@@ -336,6 +477,15 @@ pipewire (0.3.38-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Fri, 01 Oct 2021 10:07:52 +0200

+pipewire (0.3.37-2+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Wed, 29 Sep 2021 14:55:30 +0200
+
 pipewire (0.3.37-2) unstable; urgency=medium

  * Team upload.
@@ -368,6 +518,15 @@ pipewire (0.3.36-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 16 Sep 2021 21:50:44 +0200

+pipewire (0.3.35-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian unstable. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Mon, 13 Sep 2021 13:38:37 +0000
+
 pipewire (0.3.35-1) unstable; urgency=medium

  * Team upload.
@@ -378,6 +537,16 @@ pipewire (0.3.35-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Thu, 09 Sep 2021 21:49:29 +0200

+pipewire (0.3.34-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bookworm. Remaining Apertis specific changes:
+    - Continue to disable build-depends:
+      - libsdl2 (not needed)
+      - libjack-jackd2-dev (not needed)
+    - Add apparmor rules
+
+ -- Dylan Aïssi <dylan.aissi@collabora.com>  Tue, 31 Aug 2021 12:16:09 +0200
+
 pipewire (0.3.34-1) unstable; urgency=medium

  * Team upload.
@@ -397,6 +566,23 @@ pipewire (0.3.33-1) unstable; urgency=medium

 -- Dylan Aïssi <daissi@debian.org>  Mon, 16 Aug 2021 11:44:56 +0200

+pipewire (0.3.32-1+apertis2) apertis; urgency=medium
+
+  [ Frederic Danis ]
+  * Refresh the automatically detected licensing information
+
+  [ Frédéric Danis ]
+  * Fix AppArmor rules for AMD64 targets
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Thu, 05 Aug 2021 09:10:05 +0200
+
+pipewire (0.3.32-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Experimental
+    Remove merged patches
+
+ -- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>  Tue, 27 Jul 2021 18:39:12 +0530
+
 pipewire (0.3.32-1) experimental; urgency=medium

  * Team upload.
@@ -428,6 +614,26 @@ pipewire (0.3.30-1) experimental; urgency=medium

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

+pipewire (0.3.28-1+apertis2) apertis; urgency=medium
+
+  * d/patches: Fix flatpak support
+  * Prepare AppArmor rule to support future protected clients
+  * Add PTrace capability in pipewire-pulse AppArmor rule
+  * Fix AppArmor rule for access from Flatpak container
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Fri, 04 Jun 2021 11:32:21 +0200
+
+pipewire (0.3.28-1+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Experimental
+  * Continue to disable build-depends
+    - libsdl2 (not needed)
+    - libjack-jackd2-dev (not needed)
+    - libopenaptx-dev (proprietary codec, unknown legal status)
+  * Add apparmor rules
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Tue, 27 May 2021 16:12:50 +0200
+
 pipewire (0.3.28-1) experimental; urgency=medium

  [ Frédéric Danis ]
@@ -451,6 +657,17 @@ pipewire (0.3.27-1) experimental; urgency=medium

 -- Sjoerd Simons <sjoerd@debian.org>  Wed, 12 May 2021 20:37:03 +0200

+pipewire (0.3.26-1apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Experimental
+  * Continue to disable build-depends
+    - libsdl2 (not needed)
+    - libjack-jackd2-dev (not needed)
+    - libopenaptx-dev (proprietary codec, unknown legal status)
+  * Continue to enable pipewire pulse units by default
+
+ -- Frédéric Danis <frederic.danis@collabora.com>  Wed, 12 May 2021 10:31:55 +0200
+
 pipewire (0.3.26-1) experimental; urgency=medium

  * New upstream release
@@ -460,6 +677,23 @@ pipewire (0.3.26-1) experimental; urgency=medium

 -- Sjoerd Simons <sjoerd@debian.org>  Sun, 25 Apr 2021 20:54:29 +0200

+pipewire (0.3.25-1apertis2) apertis; urgency=medium
+
+  * Enable pulseaudio compatibility later by default
+
+ -- Sjoerd Simons <sjoerd@collabora.com>  Tue, 20 Apr 2021 11:18:09 +0200
+
+pipewire (0.3.25-1apertis1) apertis; urgency=medium
+
+  * Disable build-depends
+    - libsdl2 (not needed)
+    - libjack-jackd2-dev (not needed)
+    - libopenaptx-dev (proprietary codec, unknown legal status)
+  * Drop debian/apertis/gitlab-ci.yml, no longer needed
+  * Enable pipewire pulse units by default
+
+ -- Sjoerd Simons <sjoerd@collabora.com>  Thu, 15 Apr 2021 14:40:14 +0000
+
 pipewire (0.3.25-1) experimental; urgency=medium

  * New upstream release

--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@alioth-lists.debian.
 Uploaders: Jeremy Bicha <jbicha@debian.org>,
           Dylan Aïssi <daissi@debian.org>
 Build-Depends: debhelper-compat (= 13),
+               dh-apparmor,
               doxygen <!nodoc>,
               graphviz <!nodoc>,
               libasound2-dev,
@@ -14,17 +15,17 @@ Build-Depends: debhelper-compat (= 13),
               libglib2.0-dev,
               libgstreamer-plugins-base1.0-dev,
               libgstreamer1.0-dev,
-               libjack-jackd2-dev,
+#              libjack-jackd2-dev,
               libcanberra-dev,
               libldacbt-abr-dev [!s390x !hppa !m68k !powerpc !ppc64 !sparc64],
               libldacbt-enc-dev [!s390x !hppa !m68k !powerpc !ppc64 !sparc64],
-               liblilv-dev,
+#              liblilv-dev,
               libncurses-dev,
 #               libfreeaptx-dev,
               libpulse-dev,
-               libreadline-dev,
+               libeditreadline-dev,
               libsbc-dev,
-               libsdl2-dev,
+#              libsdl2-dev,
               libsndfile1-dev,
               libssl-dev,
               libsystemd-dev [linux-any],
@@ -352,24 +353,24 @@ Description: libraries for the PipeWire multimedia server - bluetooth plugins
 to be experimental, and is disabled by default (even if installed) to
 avoid conflicts with equivalent functionality in PulseAudio.

-Package: libspa-0.2-jack
-Architecture: linux-any
-Multi-Arch: same
-Depends: libspa-0.2-modules (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: libraries for the PipeWire multimedia server - JACK client
- PipeWire is a server and user space API to deal with multimedia
- pipelines. This includes:
- .
-  - Making available sources of video (such as from a capture devices or
-    application provided streams) and multiplexing this with clients.
-  - Accessing sources of video for consumption.
-  - Generating graphs for audio and video processing.
- .
- This package contains a plugin to make PipeWire able to connect to a
- JACK server, which will be used for audio playback and recording.
- Using PipeWire for audio is considered to be experimental.
+#Package: libspa-0.2-jack
+#Architecture: linux-any
+#Multi-Arch: same
+#Depends: libspa-0.2-modules (= ${binary:Version}),
+#         ${misc:Depends},
+#         ${shlibs:Depends}
+#Description: libraries for the PipeWire multimedia server - JACK client
+# PipeWire is a server and user space API to deal with multimedia
+# pipelines. This includes:
+# .
+#  - Making available sources of video (such as from a capture devices or
+#    application provided streams) and multiplexing this with clients.
+#  - Accessing sources of video for consumption.
+#  - Generating graphs for audio and video processing.
+# .
+# This package contains a plugin to make PipeWire able to connect to a
+# JACK server, which will be used for audio playback and recording.
+# Using PipeWire for audio is considered to be experimental.

 Package: pipewire-audio-client-libraries
 Section: oldlibs

--- a/debian/libpipewire-0.3-0.install
+++ b/debian/libpipewire-0.3-0.install
 usr/lib/*/libpipewire*.so.*
+debian/apparmor.d/abstractions/pipewire etc/apparmor.d/abstractions/
--- a/debian/pipewire-bin.install
+++ b/debian/pipewire-bin.install
@@ -37,3 +37,4 @@ usr/share/man/man1/pw-mon.*
 usr/share/man/man1/pw-profiler.*
 usr/share/man/man1/pw-top.*
 usr/share/man/man5
+debian/apparmor.d/usr.bin.pipewire etc/apparmor.d/
--- a/debian/pipewire-pulse.install
+++ b/debian/pipewire-pulse.install
@@ -3,3 +3,4 @@ usr/bin/pipewire-pulse
 usr/lib/systemd/user/pipewire-pulse.service
 usr/lib/systemd/user/pipewire-pulse.socket
 usr/share/man/man1/pipewire-pulse.*
+debian/apparmor.d/usr.bin.pipewire-pulse etc/apparmor.d/
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ endif
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 LV2=disabled
 else
-LV2=enabled
+LV2=disabled
 endif

 override_dh_auto_configure:
@@ -46,6 +46,8 @@ override_dh_auto_configure:
 		-Dvideotestsrc=enabled \
 		-Dvolume=enabled \
 		-Dvulkan=disabled \
+		-Dsdl2=disabled \
+		-Djack=disabled \
 		-Dx11-xfixes=disabled \
 		$(NULL)
 	install -d debian/ld.so.conf.d
@@ -61,6 +63,10 @@ ifneq ($(filter mips%,$(DEB_HOST_ARCH_CPU)),)
 test_timeout_multiplier = 10
 endif

+override_dh_install:
+	dh_install
+	dh_apparmor -ppipewire --profile-name=usr.bin.pipewire
+
 override_dh_auto_test:
 	dh_auto_test \
 		-- \