Dylan Aïssi pushed to branch debian-unstable at X Strike Force / wayland / weston
Commits: 06d6beef by Dylan Aïssi at 2024-03-11T11:55:43+01:00 Don't install disabled features on ia64 and sparc64 Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 1dcdeb21 by Dylan Aïssi at 2024-03-11T11:56:52+01:00 Do not check the upper limit for neatvnc version (Closes: #1065816) Signed-off-by: Dylan Aïssi <[email protected]> - - - - - 7 changed files: - debian/changelog - debian/control - debian/libweston-13-0.install - + debian/patches/Remove_upper_limit_of_required_neatvnc_version.patch - debian/patches/series - debian/rules - debian/weston.install Changes: ===================================== debian/changelog ===================================== @@ -7,7 +7,7 @@ weston (13.0.0-4) unstable; urgency=medium weston (13.0.0-3) unstable; urgency=medium * Retrict architectures where tests are run - * Disable backend-rdp for i64 and backend-vnc for i64 and sparc64, + * Disable backend-rdp for ia64 and backend-vnc for ia64 and sparc64, because of Build-Deps not available. * Mark Skip_xwayland_test.patch as 'Forwarded: not-needed' * Switch from pkg-config to pkgconf ===================================== debian/control ===================================== @@ -7,6 +7,7 @@ Uploaders: Mike Gabriel <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Dylan Aïssi <[email protected]> Build-Depends: debhelper-compat (= 13), + dh-exec, freerdp2-dev [!ia64], libcairo2-dev (>= 1.10.0), libcolord-dev (>= 0.1.27), ===================================== debian/libweston-13-0.install ===================================== @@ -1,3 +1,4 @@ +#! /usr/bin/dh-exec usr/lib/*/libweston-13.so.* usr/lib/*/libweston-13/color-lcms.so usr/lib/*/libweston-13/drm-backend.so @@ -7,7 +8,7 @@ usr/lib/*/libweston-13/pipewire-backend.so usr/lib/*/libweston-13/pipewire-plugin.so usr/lib/*/libweston-13/rdp-backend.so usr/lib/*/libweston-13/remoting-plugin.so -usr/lib/*/libweston-13/vnc-backend.so +[!ia64 !sparc64] usr/lib/*/libweston-13/vnc-backend.so usr/lib/*/libweston-13/wayland-backend.so usr/lib/*/libweston-13/x11-backend.so usr/lib/*/libweston-13/xwayland.so ===================================== debian/patches/Remove_upper_limit_of_required_neatvnc_version.patch ===================================== @@ -0,0 +1,19 @@ +Description: Remove upper limit of required neatvnc version. + neatvnc 0.8.1 was released with only 1 breaking change: + nvnc_client_get_hostname has been replaced with nvnc_client_get_address + Since it's not used in weston, let's not block on this limit. +Bug: https://gitlab.freedesktop.org/wayland/weston/-/issues/890 +Bug-Debian: http://bugs.debian.org/1065816 +Author: Dylan Aïssi <[email protected]> + +--- a/libweston/backend-vnc/meson.build ++++ b/libweston/backend-vnc/meson.build +@@ -3,7 +3,7 @@ + endif + + config_h.set('BUILD_VNC_COMPOSITOR', '1') +-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) ++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) + if not dep_neatvnc.found() + error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') + endif ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ Skip_xwayland_test.patch +Remove_upper_limit_of_required_neatvnc_version.patch ===================================== debian/rules ===================================== @@ -2,13 +2,13 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -ifneq (,$(filter i64,$(DEB_HOST_ARCH))) +ifneq (,$(filter ia64,$(DEB_HOST_ARCH))) BACKEND_RDP=false else BACKEND_RDP=true endif -ifneq (,$(filter i64 sparc64,$(DEB_HOST_ARCH))) +ifneq (,$(filter ia64 sparc64,$(DEB_HOST_ARCH))) BACKEND_VNC=false else BACKEND_VNC=true ===================================== debian/weston.install ===================================== @@ -1,4 +1,5 @@ -etc/pam.d/weston-remote-access +#! /usr/bin/dh-exec +[!ia64 !sparc64] etc/pam.d/weston-remote-access usr/bin/wcap-decode usr/bin/weston usr/bin/weston-* View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/compare/0dd716ea1c42d411b53dddf566325ef67582dbc6...1dcdeb21b95d81c6b93fa3014de55be195737aa2 -- View it on GitLab: https://salsa.debian.org/xorg-team/wayland/weston/-/compare/0dd716ea1c42d411b53dddf566325ef67582dbc6...1dcdeb21b95d81c6b93fa3014de55be195737aa2 You're receiving this email because of your account on salsa.debian.org.
