Compare commits
7 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 4cfa800ba5 | |||
| 449fb3d34f | |||
| 4886e9999e | |||
| bfba446b00 | |||
| 5e5358277f | |||
| 58301fdb1c | |||
| 499e88f732 |
BIN
weston-14.0.0.tar.xz
LFS
BIN
weston-14.0.0.tar.xz
LFS
Binary file not shown.
Binary file not shown.
BIN
weston-14.0.2.tar.xz
LFS
Normal file
BIN
weston-14.0.2.tar.xz
LFS
Normal file
Binary file not shown.
BIN
weston-14.0.2.tar.xz.sig
Normal file
BIN
weston-14.0.2.tar.xz.sig
Normal file
Binary file not shown.
28
weston-libdisplay-info-0.3.0.patch
Normal file
28
weston-libdisplay-info-0.3.0.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
From 394fcf054e3d1e94c254bf1915945fbb44551130 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Wed, 20 Aug 2025 15:27:15 +0200
|
||||
Subject: [PATCH] build: Allow libdisplay-info 0.3.0
|
||||
|
||||
There are no breaking changes for the high-level API that Weston uses.
|
||||
|
||||
Based on upstream change: https://gitlab.freedesktop.org/wayland/weston/-/commit/683eabb
|
||||
---
|
||||
libweston/backend-drm/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build
|
||||
index 002669e..a8f2ea5 100644
|
||||
--- a/libweston/backend-drm/meson.build
|
||||
+++ b/libweston/backend-drm/meson.build
|
||||
@@ -4,7 +4,7 @@ endif
|
||||
|
||||
dep_libdisplay_info = dependency(
|
||||
'libdisplay-info',
|
||||
- version: ['>= 0.1.1', '< 0.3.0'],
|
||||
+ version: ['>= 0.1.1', '< 0.4.0'],
|
||||
fallback: ['display-info', 'di_dep'],
|
||||
default_options: [
|
||||
'werror=false',
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 17 10:13:00 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Replace pkgconfig(freerdp2) with pkgconfig(freerdp3)
|
||||
BuildRequires, weston supports both, use the newer one.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 20 13:29:34 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Add patch to allow usage of libdisplay 0.3.0:
|
||||
* weston-libdisplay-info-0.3.0.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 26 22:08:27 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 14.0.2
|
||||
* Only build-relevant changes. (The VNC backend can be built with
|
||||
a newer neatvnc library.)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 21 16:36:16 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 14.0.1
|
||||
* libweston: Send seat name before announcing devices
|
||||
- Drop wsp-deps.patch (merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 4 09:23:01 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
26
weston.spec
26
weston.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package weston
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,10 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?suse_version} < 1600
|
||||
%define gcc_version 13
|
||||
%endif
|
||||
|
||||
Name: weston
|
||||
%define lname libweston0
|
||||
%define major 14
|
||||
Version: 14.0.0
|
||||
Version: 14.0.2
|
||||
Release: 0
|
||||
Summary: Wayland Reference Compositor
|
||||
License: CC-BY-SA-3.0 AND MIT
|
||||
@@ -29,9 +33,10 @@ URL: https://wayland.freedesktop.org/
|
||||
#Git-Web: https://cgit.freedesktop.org/wayland/weston/
|
||||
Source: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/%name-%version.tar.xz
|
||||
Source2: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/%name-%version.tar.xz.sig
|
||||
Patch1: wsp-deps.patch
|
||||
# PATCH-FIX-UPSTREAM -- weston-libdisplay-info-0.3.0.patch
|
||||
Patch0: weston-libdisplay-info-0.3.0.patch
|
||||
BuildRequires: Mesa-libGLESv3-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc%{?gcc_version}-c++ >= %gcc_version
|
||||
BuildRequires: glibc-devel >= 2.27
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libxml2-tools
|
||||
@@ -45,7 +50,11 @@ BuildRequires: pkgconfig(cairo-xcb)
|
||||
BuildRequires: pkgconfig(colord) >= 0.1.27
|
||||
BuildRequires: pkgconfig(dbus-1) >= 1.6
|
||||
BuildRequires: pkgconfig(egl)
|
||||
%if 0%{?suse_version} >= 1600
|
||||
BuildRequires: pkgconfig(freerdp3)
|
||||
%else
|
||||
BuildRequires: pkgconfig(freerdp2)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(gbm)
|
||||
BuildRequires: pkgconfig(glesv2)
|
||||
BuildRequires: pkgconfig(lcms2) >= 2.9
|
||||
@@ -125,6 +134,15 @@ to develop plugins for Weston.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# Leap 15.x's default gcc-7 is not knowledgable enough to see the constexpr-ness of:
|
||||
# >libweston/renderer-gl/gl-renderer.c:1369:5: error: initializer element is not constant
|
||||
# >{ x, z, y, 0, 0, 0, 0, 0 },
|
||||
# Either bump to newer gcc or un-static the matrix.
|
||||
#
|
||||
%if 0%{?gcc_version}
|
||||
export CC="gcc%{?gcc_version:-%{gcc_version}}" CXX="g++%{?gcc_version:-%{gcc_version}}"
|
||||
%endif
|
||||
|
||||
# includedir intentional, cf. bugzilla.opensuse.org/795968
|
||||
%meson -Ddemo-clients=false -Dremoting=false -Dsimple-clients= \
|
||||
-Dtest-junit-xml=false -Dpipewire=false -Dbackend-vnc=false \
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
From f86ff8c07d9951672cee089ad626eb0898815bf0 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Tue, 8 Oct 2024 19:18:24 +0200
|
||||
Subject: [PATCH] build: insert missing wayland-server-protocol dependency
|
||||
References: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1623
|
||||
|
||||
A new build error sprung up in weston-14 compared to 13.0.0.
|
||||
Fix it.
|
||||
|
||||
FAILED: tests/liblib_lcms_util.a.p/lcms_util.c.o
|
||||
cc -Itests/liblib_lcms_util.a.p -Itests -I../tests -I. -I.. -Iinclude
|
||||
-I../include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall
|
||||
-Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes
|
||||
-Wno-unused-parameter -Wno-shift-negative-value
|
||||
-Wno-missing-field-initializers -Wno-pedantic -Wundef
|
||||
-fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
|
||||
-fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
|
||||
-fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD
|
||||
-MQ tests/liblib_lcms_util.a.p/lcms_util.c.o -MF
|
||||
tests/liblib_lcms_util.a.p/lcms_util.c.o.d -o
|
||||
tests/liblib_lcms_util.a.p/lcms_util.c.o -c ../tests/lcms_util.c
|
||||
In file included from ../tests/lcms_util.c:35:
|
||||
../include/libweston/matrix.h:33:10: fatal error:
|
||||
wayland-server-protocol.h: No such file or directory
|
||||
|
||||
33 | #include <wayland-server-protocol.h>
|
||||
|
||||
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
||||
---
|
||||
tests/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/meson.build b/tests/meson.build
|
||||
index 45b475c3..f5f34b2b 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
@@ -74,7 +74,7 @@ lib_lcms_util = static_library(
|
||||
[ 'lcms_util.c' ],
|
||||
include_directories: common_inc,
|
||||
dependencies: [
|
||||
- dep_lcms2, dep_libm
|
||||
+ dep_lcms2, dep_libm, dep_wayland_server
|
||||
],
|
||||
build_by_default: false,
|
||||
install: false,
|
||||
--
|
||||
2.46.1
|
||||
|
||||
Reference in New Issue
Block a user