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 <dylan.aissi@collabora.com>
-
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 <dylan.aissi@collabora.com>
7 changed files:
Changes:
debian/changelog
| ... |
... |
@@ -7,7 +7,7 @@ weston (13.0.0-4) unstable; urgency=medium |
|
7
|
7
|
weston (13.0.0-3) unstable; urgency=medium
|
|
8
|
8
|
|
|
9
|
9
|
* Retrict architectures where tests are run
|
|
10
|
|
- * Disable backend-rdp for i64 and backend-vnc for i64 and sparc64,
|
|
|
10
|
+ * Disable backend-rdp for ia64 and backend-vnc for ia64 and sparc64,
|
|
11
|
11
|
because of Build-Deps not available.
|
|
12
|
12
|
* Mark Skip_xwayland_test.patch as 'Forwarded: not-needed'
|
|
13
|
13
|
* Switch from pkg-config to pkgconf
|
debian/control
| ... |
... |
@@ -7,6 +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
|
+ dh-exec,
|
|
10
|
11
|
freerdp2-dev [!ia64],
|
|
11
|
12
|
libcairo2-dev (>= 1.10.0),
|
|
12
|
13
|
libcolord-dev (>= 0.1.27),
|
debian/libweston-13-0.install
|
|
1
|
+#! /usr/bin/dh-exec
|
|
1
|
2
|
usr/lib/*/libweston-13.so.*
|
|
2
|
3
|
usr/lib/*/libweston-13/color-lcms.so
|
|
3
|
4
|
usr/lib/*/libweston-13/drm-backend.so
|
| ... |
... |
@@ -7,7 +8,7 @@ usr/lib/*/libweston-13/pipewire-backend.so |
|
7
|
8
|
usr/lib/*/libweston-13/pipewire-plugin.so
|
|
8
|
9
|
usr/lib/*/libweston-13/rdp-backend.so
|
|
9
|
10
|
usr/lib/*/libweston-13/remoting-plugin.so
|
|
10
|
|
-usr/lib/*/libweston-13/vnc-backend.so
|
|
|
11
|
+[!ia64 !sparc64] usr/lib/*/libweston-13/vnc-backend.so
|
|
11
|
12
|
usr/lib/*/libweston-13/wayland-backend.so
|
|
12
|
13
|
usr/lib/*/libweston-13/x11-backend.so
|
|
13
|
14
|
usr/lib/*/libweston-13/xwayland.so |
debian/patches/Remove_upper_limit_of_required_neatvnc_version.patch
|
|
1
|
+Description: Remove upper limit of required neatvnc version.
|
|
|
2
|
+ neatvnc 0.8.1 was released with only 1 breaking change:
|
|
|
3
|
+ nvnc_client_get_hostname has been replaced with nvnc_client_get_address
|
|
|
4
|
+ Since it's not used in weston, let's not block on this limit.
|
|
|
5
|
+Bug: https://gitlab.freedesktop.org/wayland/weston/-/issues/890
|
|
|
6
|
+Bug-Debian: http://bugs.debian.org/1065816
|
|
|
7
|
+Author: Dylan Aïssi <daissi@debian.org>
|
|
|
8
|
+
|
|
|
9
|
+--- a/libweston/backend-vnc/meson.build
|
|
|
10
|
++++ b/libweston/backend-vnc/meson.build
|
|
|
11
|
+@@ -3,7 +3,7 @@
|
|
|
12
|
+ endif
|
|
|
13
|
+
|
|
|
14
|
+ config_h.set('BUILD_VNC_COMPOSITOR', '1')
|
|
|
15
|
+-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
|
|
|
16
|
++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
|
|
|
17
|
+ if not dep_neatvnc.found()
|
|
|
18
|
+ error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
|
|
|
19
|
+ endif |
debian/patches/series
|
1
|
1
|
Skip_xwayland_test.patch
|
|
|
2
|
+Remove_upper_limit_of_required_neatvnc_version.patch |
debian/rules
| ... |
... |
@@ -2,13 +2,13 @@ |
|
2
|
2
|
|
|
3
|
3
|
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
|
4
|
4
|
|
|
5
|
|
-ifneq (,$(filter i64,$(DEB_HOST_ARCH)))
|
|
|
5
|
+ifneq (,$(filter ia64,$(DEB_HOST_ARCH)))
|
|
6
|
6
|
BACKEND_RDP=false
|
|
7
|
7
|
else
|
|
8
|
8
|
BACKEND_RDP=true
|
|
9
|
9
|
endif
|
|
10
|
10
|
|
|
11
|
|
-ifneq (,$(filter i64 sparc64,$(DEB_HOST_ARCH)))
|
|
|
11
|
+ifneq (,$(filter ia64 sparc64,$(DEB_HOST_ARCH)))
|
|
12
|
12
|
BACKEND_VNC=false
|
|
13
|
13
|
else
|
|
14
|
14
|
BACKEND_VNC=true
|
debian/weston.install
|
1
|
|
-etc/pam.d/weston-remote-access
|
|
|
1
|
+#! /usr/bin/dh-exec
|
|
|
2
|
+[!ia64 !sparc64] etc/pam.d/weston-remote-access
|
|
2
|
3
|
usr/bin/wcap-decode
|
|
3
|
4
|
usr/bin/weston
|
|
4
|
5
|
usr/bin/weston-*
|
|