Source: gst-plugins-bad1.0
Version: 1.24.10-2
Severity: important
Tags: ftbfs patch
User: debian-hurd@lists.debian.org
Usertags: hurd

Hello,

The newer upstream introduces more plugins that don't build on hurd-any.
The attached patch fixes this
The attached nodrm and nowayland patches are against upstream (and
submitted upstream)

Could you apply them? (or at least the debian changes, leaving the
upstream patch for upstream to merge in) Here is a changelog summary:

  * rules: Explicitly disable openni2, sctp, webrtc (needs sctp) plugins on 
non-linux.
  * rules: Disable uvcgadget, avtp plugins on hurd.
  * rules: Install webrtc, webrtcnice plugins only on Linux.
  * rules: Install avtp, gtkwayland, uvcgadget, plugins only on non-Hurd.
  * gstreamer1.0-plugins-bad.install: Do not install avtp, gtkwayland, webrtc,
    uvcgadget plugins on all ports.
  * libgstreamer-plugins-bad1.0-0.install.original: Do not install webrtcnice
    plugin on all ports.
  * patches/nowayland: Fix build without wayland.
  * patches/nodrm: Fix build without libdrm.

Thanks,
Samuel

-- System Information:
Debian Release: trixie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 
'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 
'oldstable-proposed-updates-debug'), (500, 'oldoldstable'), (500, 
'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 
'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, arm64

Kernel: Linux 6.12.5-amd64 (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-- 
Samuel
 La carte réseau fournie par cybercable (sn2000) ne va-t-elle que sur
 bus isa ou peut-on aussi la mettre sur bus PCI.
 Merci de m'éclairer.
 -+- JP in le Neuneu Pète un Câble : Une carte dans chaque port -+-
--- debian/rules.original       2024-12-30 20:19:11.000000000 +0000
+++ debian/rules        2024-12-30 20:53:33.000000000 +0000
@@ -68,10 +68,12 @@
 conf_flags += -Dbluez=disabled -Ddc1394=disabled -Dfbdev=disabled 
-Dsbc=disabled
 conf_flags += -Dva=disabled -Dv4l2codecs=disabled -Dwpe=disabled 
-Duvch264=disabled
 conf_flags += -Dvulkan=disabled -Dwayland=disabled -Ddvb=disabled
+conf_flags += -Dopenni2=disabled -Dsctp=disabled -Dwebrtc=disabled
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 conf_flags += -Dresindvd=disabled -Dnvcodec=disabled
+conf_flags += -Duvcgadget=disabled -Davtp=disabled
 endif
 
 # bookworm backport flags
@@ -118,6 +120,8 @@
        dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstv4l2codecs.so
        dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstopenni2.so
        dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstsctp.so
+       dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstwebrtc.so
+       dh_install -plibgstreamer-plugins-bad1.0-0 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgstwebrtcnice-1.0.so.* 
usr/lib/$(DEB_HOST_MULTIARCH)
 ifeq ($(DEB_HOST_ARCH),amd64)
        dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstqsv.so
 endif
@@ -126,6 +130,9 @@
 ifneq ($(DEB_HOST_ARCH_OS),hurd)
        dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstresindvd.so
        dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstnvcodec.so
+       dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstavtp.so
+       dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstgtkwayland.so
+       dh_install -pgstreamer1.0-plugins-bad 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0/libgstuvcgadget.so
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armel armhf i386 mips64el 
ppc64el riscv64 s390x alpha hppa hurd-i386 m68k powerpc ppc64 sparc64))
--- debian/libgstreamer-plugins-bad1.0-0.install.original       2024-12-30 
22:06:25.000000000 +0000
+++ debian/libgstreamer-plugins-bad1.0-0.install        2024-12-30 
20:53:07.000000000 +0000
@@ -13,7 +13,6 @@
 usr/lib/*/libgsttranscoder-1.0.so.*
 usr/lib/*/libgsturidownloader-1.0.so.*
 usr/lib/*/libgstwebrtc-1.0.so.*
-usr/lib/*/libgstwebrtcnice-1.0.so.*
 usr/lib/*/libgstanalytics-1.0.so.*
 usr/lib/*/libgstdxva-1.0.so.*
 usr/lib/*/libgstmse-1.0.so.*
--- debian/gstreamer1.0-plugins-bad.install.original    2024-12-30 
20:44:31.000000000 +0000
+++ debian/gstreamer1.0-plugins-bad.install     2024-12-30 20:51:22.000000000 
+0000
@@ -12,7 +12,6 @@
 usr/lib/*/gstreamer-1.0/libgstaudiomixmatrix.so
 usr/lib/*/gstreamer-1.0/libgstaudiovisualizers.so
 usr/lib/*/gstreamer-1.0/libgstautoconvert.so
-usr/lib/*/gstreamer-1.0/libgstavtp.so
 usr/lib/*/gstreamer-1.0/libgstbayer.so
 usr/lib/*/gstreamer-1.0/libgstbs2b.so
 usr/lib/*/gstreamer-1.0/libgstbz2.so
@@ -46,7 +45,6 @@
 usr/lib/*/gstreamer-1.0/libgstgeometrictransform.so
 usr/lib/*/gstreamer-1.0/libgstgme.so
 usr/lib/*/gstreamer-1.0/libgstgsm.so
-usr/lib/*/gstreamer-1.0/libgstgtkwayland.so
 usr/lib/*/gstreamer-1.0/libgsthls.so
 usr/lib/*/gstreamer-1.0/libgstid3tag.so
 usr/lib/*/gstreamer-1.0/libgstinter.so
@@ -116,7 +114,6 @@
 usr/lib/*/gstreamer-1.0/libgstvoaacenc.so
 usr/lib/*/gstreamer-1.0/libgstvoamrwbenc.so
 usr/lib/*/gstreamer-1.0/libgstwebp.so
-usr/lib/*/gstreamer-1.0/libgstwebrtc.so
 usr/lib/*/gstreamer-1.0/libgstwildmidi.so
 usr/lib/*/gstreamer-1.0/libgstx265.so
 usr/lib/*/gstreamer-1.0/libgsty4mdec.so
@@ -128,6 +125,5 @@
 usr/lib/*/gstreamer-1.0/libgstmse.so
 usr/lib/*/gstreamer-1.0/libgstsvtav1.so
 usr/lib/*/gstreamer-1.0/libgstunixfd.so
-usr/lib/*/gstreamer-1.0/libgstuvcgadget.so
 usr/share/gstreamer-1.0/presets/
 usr/share/locale
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8223

commit 6f7f4eec9930732be987ca4eb53e2d703f25d116
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Mon Dec 30 22:53:02 2024 +0100

    meson: Also disable drm on GNU/Hurd

diff --git a/meson.build b/meson.build
index 87c635f1de..80c969e893 100644
--- a/meson.build
+++ b/meson.build
@@ -399,7 +399,7 @@ if x11_dep.found()
 endif
 
 # Optional dep of msdk and va
-if host_system not in ['darwin', 'ios', 'android', 'windows']
+if host_system not in ['darwin', 'ios', 'android', 'windows', 'gnu']
   libdrm_dep = dependency('libdrm', version : '>=2.4.50',
     required : get_option('drm').enabled() or get_option('msdk').enabled(),
   )
commit 5cc93d5002f1f3f22738eddc28724191e28cbfb3
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Mon Dec 30 21:59:03 2024 +0100

    meson: Fix build with gtk3 but not wayland

diff --git a/ext/gtk/meson.build b/ext/gtk/meson.build
index 0c94a71dfc..ad9888056d 100644
--- a/ext/gtk/meson.build
+++ b/ext/gtk/meson.build
@@ -7,9 +7,11 @@ gtkwayland_sources = [
 ]
 
 gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
-gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : get_option('gtk3'))
+if use_wayland
+  gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : 
get_option('gtk3'))
+endif
 
-if gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
+if use_wayland and gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
   gstgtkwayland = library('gstgtkwayland',
     gtkwayland_sources,
     c_args :  gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
diff --git a/tests/examples/gtk/meson.build b/tests/examples/gtk/meson.build
index 1ed0dee5f1..97a29d5201 100644
--- a/tests/examples/gtk/meson.build
+++ b/tests/examples/gtk/meson.build
@@ -1,4 +1,4 @@
-if gtk_dep.found() and gtk_wayland_dep.found() and use_wayland
+if use_wayland and gtk_dep.found() and gtk_wayland_dep.found()
   executable('gtkwaylandsink',
     'gtkwaylandsink.c',
     extra_files: ['window.ui'],
diff --git a/tests/examples/meson.build b/tests/examples/meson.build
index c9053339e7..50b0ad719e 100644
--- a/tests/examples/meson.build
+++ b/tests/examples/meson.build
@@ -19,7 +19,9 @@ subdir('qsv')
 subdir('qt6d3d11')
 subdir('uvch264')
 subdir('va')
-subdir('waylandsink')
+if use_wayland
+  subdir('waylandsink')
+endif
 subdir('webrtc')
 subdir('wpe')
 

Reply via email to