SHA256
1
0
forked from pool/weston

weston 14

This commit is contained in:
Jan Engelhardt 2024-10-08 19:41:22 +02:00
parent b994ff279d
commit 499e88f732
7 changed files with 62 additions and 5 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a
size 1986684

Binary file not shown.

BIN
weston-14.0.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
weston-14.0.0.tar.xz.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 4 09:23:01 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to release 14
* Add support for FreeRDP 3.x
- Add wsp-deps.patch to resolve FTBFS
-------------------------------------------------------------------
Tue Apr 23 16:25:21 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@ -18,8 +18,8 @@
Name: weston
%define lname libweston0
%define major 13
Version: 13.0.1
%define major 14
Version: 14.0.0
Release: 0
Summary: Wayland Reference Compositor
License: CC-BY-SA-3.0 AND MIT
@ -29,6 +29,7 @@ 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
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: gcc-c++
BuildRequires: glibc-devel >= 2.27
@ -48,6 +49,7 @@ BuildRequires: pkgconfig(freerdp2)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(lcms2) >= 2.9
BuildRequires: pkgconfig(libdisplay-info)
BuildRequires: pkgconfig(libdrm) >= 2.4.108
BuildRequires: pkgconfig(libevdev)
BuildRequires: pkgconfig(libinput) >= 0.8.0

48
wsp-deps.patch Normal file
View File

@ -0,0 +1,48 @@
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