From 62474187dd1e92ba1e97af2a16edd23c8554b4978946df1888511031d17cbc01 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 May 2023 21:14:54 +0000 Subject: [PATCH] - Update to release 12 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=111 --- build.patch | 64 +++++++++++++++++++++++++++++++++++++++ weston-11.0.2.tar.xz | 3 -- weston-11.0.2.tar.xz.sig | Bin 566 -> 0 bytes weston-12.0.0.tar.xz | 3 ++ weston-12.0.0.tar.xz.sig | Bin 0 -> 566 bytes weston.changes | 26 ++++++++++++++-- weston.spec | 9 ++++-- 7 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 build.patch delete mode 100644 weston-11.0.2.tar.xz delete mode 100644 weston-11.0.2.tar.xz.sig create mode 100644 weston-12.0.0.tar.xz create mode 100644 weston-12.0.0.tar.xz.sig diff --git a/build.patch b/build.patch new file mode 100644 index 0000000..6b5fd73 --- /dev/null +++ b/build.patch @@ -0,0 +1,64 @@ +From: Jan Engelhardt +Date: 2023-05-17 23:14:05.601257733 +0200 +References: https://lists.freedesktop.org/archives/wayland-devel/2023-May/042721.html + +[ 5s] FAILED: libweston/libgl-borders.a.p/gl-borders.c.o +[ 5s] cc -Ilibweston/libgl-borders.a.p -Ilibweston -I../libweston -I. -I.. -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1 -I/usr/include/cairo -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/webp -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 libweston/libgl-borders.a.p/gl-borders.c.o -MF libweston/libgl-borders.a.p/gl-borders.c.o.d -o libweston/libgl-borders.a.p/gl-borders.c.o -c ../libweston/gl-borders.c +[ 5s] In file included from ../libweston/renderer-gl/gl-renderer.h:32, +[ 5s] from ../libweston/gl-borders.h:28, +[ 5s] from ../libweston/gl-borders.c:31: +[ 5s] ../include/libweston/libweston.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory + +[ 4s] FAILED: shared/libshared.a.p/config-parser.c.o +[ 4s] cc -Ishared/libshared.a.p -Ishared -I../shared -I. -I.. -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1 -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 shared/libshared.a.p/config-parser.c.o -MF shared/libshared.a.p/config-parser.c.o.d -o shared/libshared.a.p/config-parser.c.o -c ../shared/config-parser.c +[ 4s] In file included from ../shared/config-parser.c:44: +[ 4s] ../include/libweston/libweston.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory + +[ 6s] FAILED: tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o +[ 6s] cc -Itests/libtest-xwayland-client.a.p -Itests -I../tests -I. -I.. -Iinclude -I../include -Iprotocol -I/usr/include/pixman-1 -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/libtest-xwayland-client.a.p/xcb-client-helper.c.o -MF tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o.d -o tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o -c ../tests/xcb-client-helper.c +[ 6s] ../tests/xcb-client-helper.c:39:10: fatal error: wayland-client.h: No such file or directory + +--- + libweston/meson.build | 1 + + shared/meson.build | 2 +- + tests/meson.build | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +Index: weston/libweston/meson.build +=================================================================== +--- weston.orig/libweston/meson.build ++++ weston/libweston/meson.build +@@ -255,6 +255,7 @@ lib_gl_borders = static_library( + dependencies: [ + dep_lib_cairo_shared, + dep_egl, # for gl-renderer.h ++ dep_xkbcommon, + ], + build_by_default: false, + install: false +Index: weston/shared/meson.build +=================================================================== +--- weston.orig/shared/meson.build ++++ weston/shared/meson.build +@@ -7,7 +7,7 @@ srcs_libshared = [ + 'process-util.c', + 'hash.c', + ] +-deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman] ++deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman, dep_xkbcommon] + + lib_libshared = static_library( + 'shared', +Index: weston/tests/meson.build +=================================================================== +--- weston.orig/tests/meson.build ++++ weston/tests/meson.build +@@ -322,7 +322,7 @@ if get_option('xwayland') + [ 'xcb-client-helper.c', weston_test_client_protocol_h ], + include_directories: common_inc, + dependencies: [ +- dep_pixman, dep_xcb_xwayland, ++ dep_pixman, dep_wayland_client, dep_xcb_xwayland, + xcb_dep, xcb_cursor_dep + ], + install: false, diff --git a/weston-11.0.2.tar.xz b/weston-11.0.2.tar.xz deleted file mode 100644 index 14d35c6..0000000 --- a/weston-11.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7240752cef0b7de622baf8bd5348e63fc6b19f02ef824961b2add177d9652952 -size 1901480 diff --git a/weston-11.0.2.tar.xz.sig b/weston-11.0.2.tar.xz.sig deleted file mode 100644 index 6293e9d59376882414cba4078c9845f3af448c82e3514bbbe9efd11cefe2a03e..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+1GKYFTvFhXG+@1UOG!o_sN7nBJ0%T;KmjDV05cV_@ z<_SmE@7Eg-|4+E1jSIW_sa4bJd5TKXLPsY`e!t88jl}o5w3VN#W!kt?%C7yQ0Oqv# zv(RlHX3%v`W#(dY{ zOR8A2ram+dBsu85Ju1+VM5d2Pne4e*y0>9!tN`a96_7|dDG<9 zmu3#JG6|L@_{b{k8?nQ2_Wh@`9qi%9KGi#Ffn!9#iA5GsI|D+L6_X&^k@FeTv~4By zlUWjym5pypn4o{f4k%OYE)2{|{%?BV{-q&7ab99xxWLKA97^2l`y9*_yb;^^ggor+ zs%B@oVyir5Hyd_s5ue^=Y05WskPhh}V?WrLloyH1bU4ITSPE#Q^_AnudFQmJ+|2>= zx4j!(Y+gx&)kF1W4~L)?`jrP3dqqr1L}0%V8;y5xYk?ZQ(S1_B*~6{G@G9Eg*Vdij zEg|a)S-=h4KtEJ2Ql=uqg&rgi;J5#_YID>STv}@MIdw>i9hB}2q~P`uFoIDNbx5y1 zaN%Y!)r4d|Sk+pN_;#}%hbuc`TY}7A)#{!v{l{q;aHcPlrFwYavO@^z1{d*OCeo~L E>Jt(e3;+NC diff --git a/weston-12.0.0.tar.xz b/weston-12.0.0.tar.xz new file mode 100644 index 0000000..a46fe6e --- /dev/null +++ b/weston-12.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91853c86472cc1311465d29cda5abbe987aff01af53a4406c4513b7a023aba8b +size 1969648 diff --git a/weston-12.0.0.tar.xz.sig b/weston-12.0.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..0f343444019c3aa6d13e8c25ff2e2d83072e95049c6171d83e1c414e0a52a56a GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+1GKYFTvFhXG+@1UOG!o_sN7nBJ0%T<*SpW(N5cV_@ z<_SmE?>J2l|5K|W8{IS6tDSoF1FmXv6`+jWh%E(peU{M>^%8R4#6O|V5UG&=C0+23 z1boT&&T+Wi3X+ydgDRTW_r)g)EG%Ens`TlRZ$|1r>VZvH=J=$pclC>~_T{stD#&xNBigg)$%Kfxey8;6fX$oPfsz~W3*nmrEFal_GrV`Xs19bSa=6_MPkj7!W#5z^C z)Ewx6M`{yxje*AP7ski^L$v69T-^L*35XGI`z`IiizsfTBXMGAHAXEsmG7S}&oK2L z8|vN65?6xasPg~T6o$jIY{~Kg+*rjPJdqCk?qZ%vuzDaYq+@3DMP*lzcOm zH)x~2EYx`rmVuG@KDD89kWMe2RVkud4KL@Whyf$~7zw9O|ILWmVGe`M7vI&ATLRNw zXpQ1lddFe3$oqy(2oXb;#q{y%9EF2SE0t2_5SZ*`hFU`Ylw{W!Yv@nA~ z>hZ#kC&@6!qlV+(t8w@;$8coY?!Ca7~OK!xulBZiMtfk^Eh?iu3z(M?;wDd8W ziz;k?Cfc&4)hSmOq;I;CpZ<=NzRwo&R}tlZNuU#U*GK!Wmi>j5)IILWW69aF`1>xFQ?rU9*N@W%kY8m_vfeN}SgXQe61@2FBLU>MS{=L9* E{8|1U*#H0l literal 0 HcmV?d00001 diff --git a/weston.changes b/weston.changes index 4c6ab91..3e3a26a 100644 --- a/weston.changes +++ b/weston.changes @@ -1,8 +1,28 @@ ------------------------------------------------------------------- -Wed May 17 10:26:49 UTC 2023 - Jan Engelhardt +Wed May 17 20:54:48 UTC 2023 - Jan Engelhardt -- Update to release 11.0.2 - * No curated changelog available +- Update to release 12 + * backend-drm: multiple GPU support, by using + `--additional-devices` to specify secondary DRM devices, in + the form of a comma-separated list of devices. + * backend-drm: use libdisplay-info as a better alternative for + parsing EDID. + * protocol: new screenshooter protocol: weston-output-capture. + This new protocol is as a Weston public extension. The older + weston-screenshooter protocol has been removed. + * compositor: added a short-form for loading backends -- this + allows the use of `--backend=headless` instead of + `--backend=headless-backend.so`. Short-form for shells was + also added: pass `--shell=foo`, rather than + `--shell=foo-shell.so`. Renderers can be specified the same, + by using `--renderer=gl|pixman`. + * libweston-desktop DSO has been incorporated into libweston. + Linking now with libweston would provide access to the former + libweston-desktop library. Users of libweston-desktop would + need to adjust their headers to rather + than using . The API + itself remains the same. +- Add build.patch ------------------------------------------------------------------- Fri Mar 24 20:57:29 UTC 2023 - Bjørn Lie diff --git a/weston.spec b/weston.spec index d929897..283b78d 100644 --- a/weston.spec +++ b/weston.spec @@ -18,8 +18,8 @@ Name: weston %define lname libweston0 -%define major 11 -Version: 11.0.2 +%define major 12 +Version: 12.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/weston-%version.tar.xz Source2: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/weston-%version.tar.xz.sig +Patch1: build.patch BuildRequires: Mesa-libGLESv3-devel BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1.11 @@ -54,6 +55,7 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libdrm) >= 2.4.108 BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libinput) >= 0.8.0 +BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libseat) BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libudev) >= 136 @@ -67,6 +69,7 @@ BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) >= 1.18.0 BuildRequires: pkgconfig(xcb) >= 1.8 BuildRequires: pkgconfig(xcb-composite) +BuildRequires: pkgconfig(xcb-cursor) BuildRequires: pkgconfig(xcb-shm) BuildRequires: pkgconfig(xcb-xfixes) BuildRequires: pkgconfig(xcb-xkb) >= 1.9 @@ -127,7 +130,7 @@ to develop plugins for Weston. echo "Workaround broken weston that fails to cope with -Wl,--no-undefined injected by meson/ninja" export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs" %meson -Ddemo-clients=false -Dremoting=false -Dsimple-clients= \ - -Dtest-junit-xml=false -Dpipewire=false \ + -Dtest-junit-xml=false -Dpipewire=false -Dbackend-vnc=false \ --includedir="%_includedir/%name" %meson_build