Bug#1069625: Acknowledgement (gstreamer1.0: Don't build ptp-helper on hppa)

[John Paul Adrian Glaubitz]

Hello,

the suggested patch is incomplete as it breaks the installation of ptp-helper
on architectures with Rust support by just removing it from the .install file.

I have improved the patch in this regard by employing dh-exec and extended it
for the remaining Debian Ports architectures without Rust support (alpha, m68k
and sh4). I intentionally omitted ia64 as it will be dropped from Debian Ports
within the next days.

NB: For dh-exec to work, the file libgstreamer1.0-0.install *must* be 
executable.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
diff -Nru old/gstreamer1.0-1.24.3/debian/changelog new/gstreamer1.0-1.24.3/debian/changelog
--- old/gstreamer1.0-1.24.3/debian/changelog	2024-04-30 10:40:18.0 +0200
+++ new/gstreamer1.0-1.24.3/debian/changelog	2024-05-28 07:57:26.535826780 +0200
@@ -1,3 +1,9 @@
+gstreamer1.0 (1.24.3-1+ports) unreleased; urgency=medium
+
+  * Disable rustc for unsupported architectures
+
+ -- John Paul Adrian Glaubitz   Tue, 28 May 2024 07:57:09 +0200
+
 gstreamer1.0 (1.24.3-1) unstable; urgency=medium
 
   * New upstream version 1.24.3
diff -Nru old/gstreamer1.0-1.24.3/debian/control new/gstreamer1.0-1.24.3/debian/control
--- old/gstreamer1.0-1.24.3/debian/control	2024-04-30 10:40:18.0 +0200
+++ new/gstreamer1.0-1.24.3/debian/control	2024-05-28 11:16:10.247257446 +0200
@@ -6,6 +6,7 @@
Sjoerd Simons ,
Marc Leeman ,
 Build-Depends: debhelper-compat (= 13),
+   dh-exec,
dh-sequence-gir,
meson (>= 0.62),
pkgconf,
@@ -18,7 +19,7 @@
libdw-dev [i386 amd64 armel armhf arm64 powerpc ppc64 ppc64el mipsel mips64el riscv64],
bison,
flex,
-   rustc,
+   rustc [!alpha !hppa !m68k !sh4],
libgirepository1.0-dev,
gir1.2-glib-2.0,
gir1.2-freedesktop,
diff -Nru old/gstreamer1.0-1.24.3/debian/libgstreamer1.0-0.install new/gstreamer1.0-1.24.3/debian/libgstreamer1.0-0.install
--- old/gstreamer1.0-1.24.3/debian/libgstreamer1.0-0.install	2024-04-30 10:37:47.0 +0200
+++ new/gstreamer1.0-1.24.3/debian/libgstreamer1.0-0.install	2024-05-28 07:55:56.540429867 +0200
@@ -1,5 +1,6 @@
+#!/usr/bin/dh-exec
 usr/lib/*/gstreamer-1.0/*.so
 usr/lib/*/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner
-usr/lib/*/gstreamer1.0/gstreamer-1.0/gst-ptp-helper
+[!alpha !hppa !m68k !sh4] usr/lib/*/gstreamer1.0/gstreamer-1.0/gst-ptp-helper
 usr/lib/*/*.so.*
 usr/share/locale
diff -Nru old/gstreamer1.0-1.24.3/debian/rules new/gstreamer1.0-1.24.3/debian/rules
--- old/gstreamer1.0-1.24.3/debian/rules	2024-04-30 10:37:47.0 +0200
+++ new/gstreamer1.0-1.24.3/debian/rules	2024-05-28 09:39:31.503804282 +0200
@@ -44,6 +44,10 @@
 conf_flags += -Dlibunwind=disabled -Dlibdw=disabled
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH),alpha hppa m68k sh4))
+conf_flags += -Dptp-helper=disabled
+endif
+
 infiles := \
 	libgstreamer1.0-0.postinst
 

Bug#1069625: Acknowledgement (gstreamer1.0: Don't build ptp-helper on hppa)

[John David Anglin]

Updated patch to fix install.

Dave

--
John David Anglin  dave.ang...@bell.net
--- control.save2024-04-21 15:25:15.368645225 +
+++ control 2024-04-21 15:14:58.183856344 +
@@ -18,7 +18,7 @@
libdw-dev [i386 amd64 armel armhf arm64 powerpc ppc64 ppc64el 
mipsel mips64el riscv64],
bison,
flex,
-   rustc,
+   rustc [!hppa],
libgirepository1.0-dev,
gir1.2-glib-2.0,
gir1.2-freedesktop,
--- libgstreamer1.0-0.install.save  2024-04-21 16:38:07.810032050 +
+++ libgstreamer1.0-0.install   2024-04-21 16:38:17.922110631 +
@@ -1,5 +1,4 @@
 usr/lib/*/gstreamer-1.0/*.so
 usr/lib/*/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner
-usr/lib/*/gstreamer1.0/gstreamer-1.0/gst-ptp-helper
 usr/lib/*/*.so.*
 usr/share/locale
--- rules.save  2024-04-21 15:25:23.96877 +
+++ rules   2024-04-21 16:40:18.347048541 +
@@ -44,6 +44,10 @@
 conf_flags += -Dlibunwind=disabled -Dlibdw=disabled
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH),hppa))
+conf_flags += -Dptp-helper=disabled
+endif
+
 infiles := \
libgstreamer1.0-0.postinst
 
--- libgstreamer1.0-0.postinst.in.save  2024-04-21 19:15:04.053817208 +
+++ libgstreamer1.0-0.postinst.in   2024-04-21 19:15:41.034100581 +
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = configure ]; then
+if [ "$1" = configure && test -f 
/usr/lib/@MULTIARCH@/gstreamer1.0/gstreamer-1.0/gst-ptp-helper ]; then
 # If we have setcap is installed, try setting 
cap_net_bind_service,cap_net_admin+ep,
 # which allows us to install our helper binary without the setuid bit.
 if command -v setcap > /dev/null; then