Dylan Aïssi pushed to branch debian-unstable at X Strike Force / wayland / weston
Commits:
-
904c821d
by Dylan Aïssi at 2024-02-26T17:52:34+01:00
-
87c0919b
by Dylan Aïssi at 2024-02-26T17:52:53+01:00
-
ea2cb803
by Dylan Aïssi at 2024-02-26T17:56:03+01:00
-
4dd376e8
by Dylan Aïssi at 2024-02-26T18:12:22+01:00
-
dea6a083
by Dylan Aïssi at 2024-02-26T18:12:22+01:00
5 changed files:
- debian/changelog
- debian/control
- debian/patches/Skip_xwayland_test.patch
- debian/rules
- debian/tests/control
Changes:
1 | +weston (13.0.0-3) unstable; urgency=medium
|
|
2 | + |
|
3 | + * Retrict architectures where tests are run
|
|
4 | + * Disable backend-rdp for i64 and backend-vnc for i64 and sparc64,
|
|
5 | + because of Build-Deps not available.
|
|
6 | + * Mark Skip_xwayland_test.patch as 'Forwarded: not-needed'
|
|
7 | + * Switch from pkg-config to pkgconf
|
|
8 | + |
|
9 | + -- Dylan Aïssi <daissi@debian.org> Mon, 26 Feb 2024 18:02:10 +0100
|
|
10 | + |
|
1 | 11 | weston (13.0.0-2) unstable; urgency=medium
|
2 | 12 | |
3 | 13 | * Mark libweston-13-dev as 'Multi-Arch: same'
|
... | ... | @@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>, |
7 | 7 | Emilio Pozuelo Monfort <pochu@debian.org>,
|
8 | 8 | Dylan Aïssi <daissi@debian.org>
|
9 | 9 | Build-Depends: debhelper-compat (= 13),
|
10 | - freerdp2-dev,
|
|
10 | + freerdp2-dev [!ia64],
|
|
11 | 11 | libcairo2-dev (>= 1.10.0),
|
12 | 12 | libcolord-dev (>= 0.1.27),
|
13 | 13 | libdbus-1-dev,
|
... | ... | @@ -48,7 +48,7 @@ Build-Depends: debhelper-compat (= 13), |
48 | 48 | libxml2-dev,
|
49 | 49 | mesa-common-dev,
|
50 | 50 | meson (>= 0.63.0),
|
51 | - pkg-config,
|
|
51 | + pkgconf,
|
|
52 | 52 | wayland-protocols (>= 1.31)
|
53 | 53 | Standards-Version: 4.6.2
|
54 | 54 | Rules-Requires-Root: no
|
... | ... | @@ -2,6 +2,7 @@ Description: Skip the xwayland test because it doesn't work on Debian at |
2 | 2 | build time, nor on the autopkgtest infrastructure. It fails with:
|
3 | 3 | > failed to bind to /tmp/.X11-unix/X0: No such file or directory
|
4 | 4 | Author: Dylan Aïssi <daissi@debian.org>
|
5 | +Forwarded: not-needed
|
|
5 | 6 | |
6 | 7 | --- a/tests/xwayland-test.c
|
7 | 8 | +++ b/tests/xwayland-test.c
|
... | ... | @@ -2,13 +2,34 @@ |
2 | 2 | |
3 | 3 | export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
4 | 4 | |
5 | +ifneq (,$(filter i64,$(DEB_HOST_ARCH)))
|
|
6 | +BACKEND_RDP=false
|
|
7 | +else
|
|
8 | +BACKEND_RDP=true
|
|
9 | +endif
|
|
10 | + |
|
11 | +ifneq (,$(filter i64 sparc64,$(DEB_HOST_ARCH)))
|
|
12 | +BACKEND_VNC=false
|
|
13 | +else
|
|
14 | +BACKEND_VNC=true
|
|
15 | +endif
|
|
16 | + |
|
5 | 17 | override_dh_auto_configure:
|
6 | - dh_auto_configure -- -Dscreenshare=true \
|
|
18 | + dh_auto_configure -- \
|
|
19 | + -Dbackend-rdp=$(BACKEND_RDP) \
|
|
20 | + -Dbackend-vnc=$(BACKEND_VNC) \
|
|
21 | + -Dscreenshare=true \
|
|
7 | 22 | -Dsystemd=true
|
8 | 23 | |
9 | 24 | override_dh_auto_test:
|
10 | 25 | mkdir -p $(CURDIR)/debian/tmp/tmp/xdgruntimedir
|
26 | +# Only make tests fatal for a subset of architectures
|
|
27 | +# https://gitlab.freedesktop.org/wayland/weston/-/issues/739
|
|
28 | +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel i386 ppc64el))
|
|
11 | 29 | XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test
|
30 | +else
|
|
31 | + XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir -dh_auto_test
|
|
32 | +endif
|
|
12 | 33 | |
13 | 34 | override_dh_missing:
|
14 | 35 | dh_missing --fail-missing -X.la
|
... | ... | @@ -3,3 +3,6 @@ |
3 | 3 | Test-Command: dh_auto_configure; dh_auto_build; dh_auto_test
|
4 | 4 | Depends: @builddeps@
|
5 | 5 | Restrictions: allow-stderr
|
6 | +Architecture: amd64 arm64 armel i386 ppc64el
|
|
7 | +# Tests fail on some Architectures
|
|
8 | +# https://gitlab.freedesktop.org/wayland/weston/-/issues/739 |