Bug#1040330: Build without libffado on Ubuntu

2023-07-06 Thread Dylan Aïssi
Hi Sebastien,

Le mar. 4 juil. 2023 à 16:45, Sebastien Bacher  a écrit :
>
> The recent update added a depends on libffado, that component is
> currently in Ubuntu universe so it means we need to build without it
> there. Could you consider using the attached patch so we can keep the
> package in sync between the distributions?
>
> The .install change is a bit hackish but works, I can work on another
> variant with logic in the .rules instead of if you would prefer
>

Thanks for this patch. I applied the d/rules part, it would be wonderful
to have the logic in d/rules. I like to have the list of installed files
to make sure I don't miss anything.

Best regards,
Dylan



Bug#1040330: Build without libffado on Ubuntu

2023-07-04 Thread Sebastien Bacher

Package: pipewire
Version: 0.3.72-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu mantic ubuntu-patch

The recent update added a depends on libffado, that component is 
currently in Ubuntu universe so it means we need to build without it 
there. Could you consider using the attached patch so we can keep the 
package in sync between the distributions?


The .install change is a bit hackish but works, I can work on another 
variant with logic in the .rules instead of if you would prefer



Thanks,


diff -Nru pipewire-0.3.72/debian/changelog pipewire-0.3.72/debian/changelog
--- pipewire-0.3.72/debian/changelog	2023-07-03 09:59:54.0 +0200
+++ pipewire-0.3.72/debian/changelog	2023-07-04 16:15:26.0 +0200
@@ -1,3 +1,10 @@
+pipewire (0.3.72-3) UNRELEASED; urgency=medium
+
+  * Don't use libffafo in the Ubuntu build for now since the package
+is in universe
+
+ -- Sebastien Bacher   Tue, 04 Jul 2023 16:15:26 +0200
+
 pipewire (0.3.72-2) unstable; urgency=medium
 
   * Upload to unstable
diff -Nru pipewire-0.3.72/debian/libpipewire-0.3-modules.install pipewire-0.3.72/debian/libpipewire-0.3-modules.install
--- pipewire-0.3.72/debian/libpipewire-0.3-modules.install	2023-07-03 09:59:54.0 +0200
+++ pipewire-0.3.72/debian/libpipewire-0.3-modules.install	2023-07-04 16:15:26.0 +0200
@@ -5,9 +5,7 @@
 usr/lib/*/pipewire-0.3/libpipewire-module-client-node.so
 usr/lib/*/pipewire-0.3/libpipewire-module-combine-stream.so
 usr/lib/*/pipewire-0.3/libpipewire-module-echo-cancel.so
-usr/lib/*/pipewire-0.3/libpipewire-module-fallback-sink.so
-usr/lib/*/pipewire-0.3/libpipewire-module-ffado-driver.so
-usr/lib/*/pipewire-0.3/libpipewire-module-filter-chain.so
+usr/lib/*/pipewire-0.3/libpipewire-module-f*.so
 usr/lib/*/pipewire-0.3/libpipewire-module-jack-tunnel.so
 usr/lib/*/pipewire-0.3/libpipewire-module-jackdbus-detect.so
 usr/lib/*/pipewire-0.3/libpipewire-module-link-factory.so
diff -Nru pipewire-0.3.72/debian/rules pipewire-0.3.72/debian/rules
--- pipewire-0.3.72/debian/rules	2023-07-03 09:59:54.0 +0200
+++ pipewire-0.3.72/debian/rules	2023-07-04 16:15:26.0 +0200
@@ -28,9 +28,11 @@
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 LV2=disabled
 LIBMYSOFA=disabled
+LIBFFADO=disabled
 else
 LV2=enabled
 LIBMYSOFA=enabled
+LIBFFADO=enabled
 endif
 
 override_dh_auto_configure:
@@ -47,6 +49,7 @@
 		-Dbluez5-codec-opus=enabled \
 		-Dlibcamera=$(LIBCAMERA) \
 		-Dlibmysofa=$(LIBMYSOFA) \
+		-Dlibffado=$(LIBFFADO) \
 		-Ddocs=$(DOCS) \
 		-Dffmpeg=disabled \
 		-Dinstalled_tests=enabled \