Control: tags -1 + patch
On Thu, 16 Jul 2026 at 12:06:31 +0100, Simon McVittie wrote:
Unfortunately the autopkgtest that I added in #1033733 didn't have fully
correct dependencies (with my $WORK hat on, I was running it in a
non-minimal container) and it now fails:
122s + test_num=0
122s + pkg-config --cflags --libs libvkd3d
122s
/tmp/autopkgtest-lxc.wegk8psz/downtmp/build.WLq/src/debian/tests/libvkd3d-dev:
54: pkg-config: not found
122s + gcc -ot t.c
122s
/tmp/autopkgtest-lxc.wegk8psz/downtmp/build.WLq/src/debian/tests/libvkd3d-dev:
54: gcc: not found
I'll follow up with a patch when I've tested it.
Please consider the attached patches, also available at
<https://salsa.debian.org/smcv/vkd3d-temp/-/commits/bug1142191?ref_type=heads>
(`git fetch https://salsa.debian.org/smcv/vkd3d-temp.git bug1142191`).
smcv
>From 8301b739a0233e47eba2a37e85235c0e7c27043d Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 16 Jul 2026 13:14:44 +0100
Subject: [PATCH 1/3] d/control: Add missing dependency libvkd3d-headers ->
libvulkan-dev
This is required when including any headers, unless VKD3D_NO_VULKAN_H
is defined (assumed to be uncommon).
Signed-off-by: Simon McVittie <[email protected]>
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index f5be5ffc..e4f38462 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,7 @@ Multi-Arch: foreign
Architecture: all
Depends:
${misc:Depends},
+ libvulkan-dev,
Recommends:
libvkd3d-dev,
Breaks:
--
2.53.0
>From c316457136d52e052d5d6977b1ac4363de0490d9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 16 Jul 2026 12:07:09 +0100
Subject: [PATCH 2/3] d/tests/control: Add missing dependencies for -dev test
Closes: #1142191
Signed-off-by: Simon McVittie <[email protected]>
---
debian/tests/control | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/tests/control b/debian/tests/control
index 7c2b14f0..3b3db7bb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -5,6 +5,8 @@ Depends: vkd3d-compiler
Tests: libvkd3d-dev
Restrictions: allow-stderr, superficial
Depends:
+ build-essential,
libvkd3d-dev,
+ pkgconf,
xauth,
xvfb,
--
2.53.0
>From d26b92c5567f22316b81f290e690dfaf4beb5980 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 16 Jul 2026 12:09:57 +0100
Subject: [PATCH 3/3] d/tests/libvkd3d-dev: Use cross-compile-friendly
executable names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reference: https://salsa.debian.org/ci-team/autopkgtest/-/blob/master/doc/README.package-tests.rst?ref_type=heads
ยง(Foreign architecture testing)
Signed-off-by: Simon McVittie <[email protected]>
---
debian/tests/libvkd3d-dev | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/tests/libvkd3d-dev b/debian/tests/libvkd3d-dev
index e3707c82..52b1afb2 100755
--- a/debian/tests/libvkd3d-dev
+++ b/debian/tests/libvkd3d-dev
@@ -11,6 +11,14 @@ else
trap 'cd /; rm -fr "$WORKDIR"' 0 INT QUIT ABRT PIPE TERM
fi
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="${DEB_HOST_GNU_TYPE}-"
+else
+ CROSS_COMPILE=
+fi
+CC="${CROSS_COMPILE}gcc"
+PKG_CONFIG="${CROSS_COMPILE}pkgconf"
+
cat > "$WORKDIR/t.c" <<EOF
#include <stddef.h>
#include <vkd3d.h>
@@ -49,9 +57,9 @@ echo "TAP version 13"
test_num=0
for suffix in "" "-shader" "-utils"; do
- # Deliberately word-splitting pkg-config's output:
+ # Deliberately word-splitting:
# shellcheck disable=SC2046
- gcc -o"t$suffix" "t$suffix.c" $(pkg-config --cflags --libs "libvkd3d$suffix")
+ $CC -o"t$suffix" "t$suffix.c" $($PKG_CONFIG --cflags --libs "libvkd3d$suffix")
xvfb-run -a "./t$suffix" >&2
test_num=$(( test_num + 1 ))
echo "ok $test_num - libvkd3d$suffix"
--
2.53.0
