From 499e88f7322073b4b728e930c2a718a247c03d55e764bae324f78ec3637eea35 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 8 Oct 2024 19:41:22 +0200 Subject: [PATCH] weston 14 --- weston-13.0.1.tar.xz | 3 --- weston-13.0.1.tar.xz.sig | Bin 566 -> 0 bytes weston-14.0.0.tar.xz | 3 +++ weston-14.0.0.tar.xz.sig | Bin 0 -> 566 bytes weston.changes | 7 ++++++ weston.spec | 6 +++-- wsp-deps.patch | 48 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 5 deletions(-) delete mode 100644 weston-13.0.1.tar.xz delete mode 100644 weston-13.0.1.tar.xz.sig create mode 100644 weston-14.0.0.tar.xz create mode 100644 weston-14.0.0.tar.xz.sig create mode 100644 wsp-deps.patch diff --git a/weston-13.0.1.tar.xz b/weston-13.0.1.tar.xz deleted file mode 100644 index 61c2666..0000000 --- a/weston-13.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a -size 1986684 diff --git a/weston-13.0.1.tar.xz.sig b/weston-13.0.1.tar.xz.sig deleted file mode 100644 index b5cf68877f964037e2c60e865f60dc29f2fbfa175d3a34d08865d1abeadfe770..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+1GKYFTvFhXG+@1UOG!o_sN7nBJ0%j-KXaEWc5cV_@ z<_SmE@BL5^0NTrfBe7^Q9}0b6H>f?_9)gU;#QTPOBh{Ivp17BYsNFJL{Rmlt(Ifx} zyKk=GVO&&`3#(caB49czt?ONedt=LtTF*%DfKe+~ElUn|5ncTNcG&Lzb-M|O%TtNU ztK1c)NYC?_wH;vu(9!*=Wui8xrwV6)R4qs<-heuXBu2ptipaR`ROTf22%vqH?Y3>o zY_z+xC?~3nN;JX#7sNF(+=o&3gq6gPy5>7bfKA9rz5?eOHNKQlMq>IXL`1r z^4zjN;f$1GTo(#$6HPt^tyJ3QtSt~y zYa9G+2n;!@bL`tG$AA(@ls~K=2)I7+`*6`|r8i`E+b}~|1#WhjFMzkOHIpE<)B}!@ zN`BiBn^p+IwL6FE%)N>_#Fn>h>y64!Q8i4I(I^Q8L9YZ-@`$eO&Tch1O{m1}iCx7D zN*$!enG4Y^(`3QDsgE=nwzCnsv|s27ON40@eqkFBA`@S;Wwfm4MB@h^m23t*JecSB Ex0qcLO#lD@ diff --git a/weston-14.0.0.tar.xz b/weston-14.0.0.tar.xz new file mode 100644 index 0000000..ef5fb8d --- /dev/null +++ b/weston-14.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47fd0325b0b948e9b003a38fdf4eb3a8581f3fdc740b8932b35ae8793bf4e4a5 +size 2043020 diff --git a/weston-14.0.0.tar.xz.sig b/weston-14.0.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..7da9b93d51eba98b30680ecd3f8265609ed4f9a3a70a4febf468df5433110f41 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+1GKYFTvFhXG+@1UOG!o_sN7nBJ0%q7EzW@pe5cV_@ z<_SmE?+geJ{w%>f7vA*UqjK`7|IP`B4BSQ{s0#qTy=dQMAB@ur_AOZzOcU@Ynh2f) zU5XkP_b;=)nRJI8-n%{7?dU|+>JKwwhy+nIs+t()Noa@5DxX97sN@2c_ix*A0~YB^kx;-pC}iXb{>Igol1qz{7_QoD zN_3;1lnWV6Uramn`~)JH{&0-rX{# z8Ymk~G07s-Age6JVDjaH!*D`l;!RL55((b#>wr)?Ik z`>AG0-@ep$4VcB=L8kW;O;p@}IPgixHU@Px>cb_;T|QwwXCtmog}qNKT8p)1v!AOO z@XDBjNwfe8jH++Mbcp?Lt6kZ4w*=u-vn&cqSWozPz_r-&tUatcNb`^Z%v_W$M6mNR ztniKGdg-?#wjM{gCl827i4+U>>Ath|=$3fd4|wpROxr;&NEs z(2e>_ni^LHgv{s<(k0ChWP%Zz%96O(Apks&tbD;7nMuWESe<*xWm0c1Fm%f&{9+0> EXPY7y`v3p{ literal 0 HcmV?d00001 diff --git a/weston.changes b/weston.changes index 6146207..c30d2e5 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 4 09:23:01 UTC 2024 - Jan Engelhardt + +- 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 diff --git a/weston.spec b/weston.spec index 4db109e..28e3865 100644 --- a/weston.spec +++ b/weston.spec @@ -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 diff --git a/wsp-deps.patch b/wsp-deps.patch new file mode 100644 index 0000000..86cb2a3 --- /dev/null +++ b/wsp-deps.patch @@ -0,0 +1,48 @@ +From f86ff8c07d9951672cee089ad626eb0898815bf0 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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 + +Signed-off-by: Jan Engelhardt +--- + 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 +