Control: merge 1087228 1072337
Hello,
I was about to file a third bug report :)
I see that something was done for libsoup, but we are still missing the
qt6-shader-baker build-dependency. On buildds I could force adding an
extra dependency but that's not longterm-proof :)
Also, hurd-amd64 also supports the qt build-deps.
Could you apply the attached changes?
Thanks,
Samuel
--- debian/control.original 2025-01-18 11:18:04.000000000 +0000
+++ debian/control 2025-01-18 11:18:28.000000000 +0000
@@ -45,16 +45,16 @@
libtwolame-dev (>= 0.3.10),
libopencore-amrnb-dev,
libopencore-amrwb-dev,
- qtbase5-dev [amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
- qtbase5-private-dev [amd64 arm64 armel armhf i386 mips64el
ppc64el riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
- qtdeclarative5-dev [amd64 arm64 armel armhf i386 mips64el
ppc64el riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
- qttools5-dev [amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
- qt6-base-private-dev [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
- qt6-declarative-dev [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
- qt6-shader-baker [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x powerpc ppc64 sparc64],
- qt6-tools-dev [amd64 arm64 armel armhf mips64el ppc64el riscv64
s390x hurd-i386 powerpc ppc64 sparc64],
+ qtbase5-dev [amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qtbase5-private-dev [amd64 arm64 armel armhf i386 mips64el
ppc64el riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qtdeclarative5-dev [amd64 arm64 armel armhf i386 mips64el
ppc64el riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qttools5-dev [amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qt6-base-private-dev [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qt6-declarative-dev [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qt6-shader-baker [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
+ qt6-tools-dev [amd64 arm64 armel armhf mips64el ppc64el riscv64
s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
qt6-wayland-dev [amd64 arm64 armel armhf mips64el ppc64el
riscv64 s390x powerpc ppc64 sparc64],
- libqt5x11extras5-dev [amd64 arm64 armel armhf i386 mips64el
ppc64el riscv64 s390x hurd-i386 powerpc ppc64 sparc64],
+ libqt5x11extras5-dev [amd64 arm64 armel armhf i386 mips64el
ppc64el riscv64 s390x hurd-amd64 hurd-i386 powerpc ppc64 sparc64],
libqt5waylandclient5-dev [amd64 arm64 armel armhf mips64el
ppc64el riscv64 s390x powerpc ppc64 sparc64],
libraw1394-dev (>= 2.0.0) [linux-any],
libiec61883-dev (>= 1.0.0) [linux-any],
@@ -86,7 +86,7 @@
This is a transitional package.
Package: gstreamer1.0-qt5
-Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x
hurd-i386 powerpc ppc64 sparc64
+Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x
hurd-amd64 hurd-i386 powerpc ppc64 sparc64
Multi-Arch: same
Section: graphics
Depends: ${misc:Depends},
@@ -111,7 +111,7 @@
This package contains the GStreamer plugin for Qt5.
Package: gstreamer1.0-qt6
-Architecture: amd64 arm64 armel armhf mips64el ppc64el riscv64 s390x hurd-i386
powerpc ppc64 sparc64
+Architecture: amd64 arm64 armel armhf mips64el ppc64el riscv64 s390x
hurd-amd64 hurd-i386 powerpc ppc64 sparc64
Multi-Arch: same
Section: graphics
Depends: ${misc:Depends},
--- debian/rules.original 2025-01-18 11:48:55.000000000 +0000
+++ debian/rules 2025-01-18 11:52:11.000000000 +0000
@@ -47,13 +47,13 @@
conf_flags += -Dqt6=disabled
endif
-# qtwayland-opensource-src isn't built on hurd-i386 or Ubuntu's i386
-ifneq (,$(filter $(DEB_HOST_ARCH), i386 hurd-i386))
+# qtwayland-opensource-src isn't built on hurd or Ubuntu's i386
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 hurd-amd64 hurd-i386))
conf_flags += -Dqt-wayland=disabled
endif
# qt-egl is not available on non-Linux
-ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386))
+ifneq (,$(filter $(DEB_HOST_ARCH_OS), hurd))
conf_flags += -Dqt-egl=disabled
endif
