Source: wireplumber
Version: 0.5.6-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability
Control: affects 1060838 + src:wireplumber
Hi Dylan,
here is the patch we worked on together. We added a nogir profile, moved
the documentation to the indep build and got a nogir cross build to
work. The full cross build is stuck on #1060838 like so many other
packages.
Helmut
diff -Nru wireplumber-0.5.6/debian/changelog wireplumber-0.5.6/debian/changelog
--- wireplumber-0.5.6/debian/changelog 2024-11-02 10:43:19.000000000 +0100
+++ wireplumber-0.5.6/debian/changelog 2024-11-17 14:03:49.000000000 +0100
@@ -1,3 +1,12 @@
+wireplumber (0.5.6-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Improve cross building: (Closes: #-1)
+ + Skip documentation in arch-only build.
+ * Add nogir build profile (using dh-exec).
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 17 Nov 2024 14:03:49 +0100
+
wireplumber (0.5.6-2) unstable; urgency=medium
* Add dh-sequence-gir in Build-Deps to fill fields ${gir:*}
diff -Nru wireplumber-0.5.6/debian/control wireplumber-0.5.6/debian/control
--- wireplumber-0.5.6/debian/control 2024-11-02 10:43:19.000000000 +0100
+++ wireplumber-0.5.6/debian/control 2024-11-17 14:03:49.000000000 +0100
@@ -5,10 +5,11 @@
Uploaders: Sjoerd Simons <sjo...@debian.org>,
Dylan Aïssi <dai...@debian.org>
Build-Depends: debhelper-compat (= 13),
+ dh-exec,
dh-sequence-gir,
doxygen <!nodoc>,
- gobject-introspection,
- libgirepository1.0-dev,
+ gobject-introspection <!nogir>,
+ libgirepository1.0-dev <!nogir>,
libglib2.0-dev (>= 2.68),
liblua5.4-dev,
libpipewire-0.3-dev (>= 1.0.2),
@@ -19,8 +20,9 @@
systemd-dev,
dbus <!nocheck>,
pipewire (>= 1.0.2) <!nocheck>,
+ python3-lxml:native <!nogir>,
+Build-Depends-Indep:
python3-breathe <!nodoc>,
- python3-lxml <!nodoc>,
python3-sphinx <!nodoc>,
python3-sphinx-rtd-theme <!nodoc>,
Standards-Version: 4.7.0
@@ -102,6 +104,7 @@
Package: gir1.2-wp-0.5
Section: introspection
Architecture: linux-any
+Build-Profiles: <!nogir>
Multi-Arch: same
Depends: ${misc:Depends},
${gir:Depends},
diff -Nru wireplumber-0.5.6/debian/libwireplumber-0.5-dev.install
wireplumber-0.5.6/debian/libwireplumber-0.5-dev.install
--- wireplumber-0.5.6/debian/libwireplumber-0.5-dev.install 2024-11-02
10:43:19.000000000 +0100
+++ wireplumber-0.5.6/debian/libwireplumber-0.5-dev.install 2024-11-17
14:03:49.000000000 +0100
@@ -1,4 +1,5 @@
+#!/usr/bin/dh-exec
usr/include/wireplumber-*
usr/lib/*/libwireplumber*.so
usr/lib/*/pkgconfig/wireplumber*
-/usr/share/gir-1.0/*.gir
+/usr/share/gir-1.0/*.gir <!nogir>
diff -Nru wireplumber-0.5.6/debian/rules wireplumber-0.5.6/debian/rules
--- wireplumber-0.5.6/debian/rules 2024-11-02 10:43:19.000000000 +0100
+++ wireplumber-0.5.6/debian/rules 2024-11-17 14:03:49.000000000 +0100
@@ -3,10 +3,15 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs
-ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-DOC=disabled
+ifeq (,$(filter wireplumber-doc,$(shell dh_listpackages)))
+CONFIGURE_FLAGS = -Ddoc=disabled
else
-DOC=enabled
+CONFIGURE_FLAGS = -Ddoc=enabled
+endif
+ifeq (,$(filter nogir,$(DEB_BUILD_PROFILES)))
+CONFIGURE_FLAGS += -Dintrospection=enabled
+else
+CONFIGURE_FLAGS += -Dintrospection=disabled
endif
%:
@@ -14,8 +19,6 @@
override_dh_auto_configure:
dh_auto_configure -- \
- -Dintrospection=enabled \
- -Ddoc=$(DOC) \
-Dmodules=true \
-Ddaemon=true \
-Dtools=true \
@@ -24,6 +27,7 @@
-Dsystemd-user-service=true \
-Dtests=true \
-Ddbus-tests=true \
+ $(CONFIGURE_FLAGS) \
$(NULL)
override_dh_makeshlibs:
