[neon/backports-focal/xdg-desktop-portal/Neon/unstable] debian: Re-enable pipewire now that 0.3.x is in experimental

Simon McVittie null at kde.org
Wed Jan 13 06:32:43 GMT 2021


Git commit 8c27a326a4dbfe71cc57897317256f2ceaf68355 by Simon McVittie.
Committed on 07/09/2020 at 18:40.
Pushed by ash into branch 'Neon/unstable'.

Re-enable pipewire now that 0.3.x is in experimental

This reverts commit 53d1d20077e3efc349c17f67f0591452ec8313e1.

M  +3    -0    debian/control
M  +6    -2    debian/rules

https://invent.kde.org/neon/backports-focal/xdg-desktop-portal/commit/8c27a326a4dbfe71cc57897317256f2ceaf68355

diff --git a/debian/control b/debian/control
index ffcecfc..3f8cf21 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Build-Depends:
  libfuse-dev,
  libglib2.0-dev,
  libjson-glib-dev,
+ libpipewire-0.3-dev (>= 0.3.10),
  libportal-dev (>= 0.3) <pkg.libportal.enable>,
+ pipewire (>= 0.3.10) <!nocheck pkg.libportal.enable>,
  procps <!nocheck>,
  python3 <!nocheck>,
  python3-gi <!nocheck>,
@@ -88,6 +90,7 @@ Depends:
  dbus,
  geoclue-2.0,
  libcap2-bin,
+ pipewire (>= 0.3.10),
  procps,
  python3,
  python3-gi,
diff --git a/debian/rules b/debian/rules
index 49231d2..eb12937 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,12 @@ export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
 
-# https://bugs.debian.org/954022
-CONFFLAGS += --disable-pipewire
+# pipewire is not in Ubuntu main yet https://launchpad.net/bugs/1802533
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+	CONFFLAGS += --disable-pipewire
+else
+	CONFFLAGS += --enable-pipewire
+endif
 
 # ITP #946605
 ifeq ($(filter pkg.libportal.enable,$(DEB_BUILD_PROFILES)),)



More information about the Neon-commits mailing list