From 196f12f8251864dcf5c9eea8c320ce92a5174ea415672cb6b88401f793b6802f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 21 Jan 2022 10:15:34 +0000 Subject: [PATCH 1/2] Accepting request 947907 from home:iznogood:branches:X11:XOrg I realize it is to early to push this RC to TW, but perhaps we can have it in the devel repo for now? - Update to version 22.0.99.901 * DRM lease support * Enables sRGB fbconfigs in GLX * Requires libxcvt * Refactoring of the present code in Xwayland * Implements support for touchpad gestures * Support for xfixes's ClientDisconnectMode and optional terminate delay - Add pkgconfig(libxcvt) BuildRequires: New dependency. - Add xwayland.keyring, use url for sources, validate sig. - Move man pages from devel to main binary package. - Enable LTO, no longer disable LTO via macro. OBS-URL: https://build.opensuse.org/request/show/947907 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=22 --- xwayland-21.1.4.tar.xz | 3 --- xwayland-21.1.4.tar.xz.sig | Bin 95 -> 0 bytes xwayland-22.0.99.901.tar.xz | 3 +++ xwayland-22.0.99.901.tar.xz.sig | Bin 0 -> 95 bytes xwayland.changes | 16 +++++++++++++++ xwayland.keyring | Bin 0 -> 2290 bytes xwayland.spec | 35 +++++++++++++++----------------- 7 files changed, 35 insertions(+), 22 deletions(-) delete mode 100644 xwayland-21.1.4.tar.xz delete mode 100644 xwayland-21.1.4.tar.xz.sig create mode 100644 xwayland-22.0.99.901.tar.xz create mode 100644 xwayland-22.0.99.901.tar.xz.sig create mode 100644 xwayland.keyring diff --git a/xwayland-21.1.4.tar.xz b/xwayland-21.1.4.tar.xz deleted file mode 100644 index 600cf2d..0000000 --- a/xwayland-21.1.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19f6795f31cfa8eb352b1e5b3c379f22ee6020e98701ff2cc679da8c4f1159f7 -size 1261712 diff --git a/xwayland-21.1.4.tar.xz.sig b/xwayland-21.1.4.tar.xz.sig deleted file mode 100644 index b0fbb4890e34b640e404ca00194bd40090fbff8db47fa16299cbb1d2ec391479..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4N5_c?K&cMYf025j0#IRt_ vsb@drk2dYFZ{E*l`@q{&^*OUU!(8#?$0_HoSY9f874~EO`pJjmSp{+dZdxW` diff --git a/xwayland-22.0.99.901.tar.xz b/xwayland-22.0.99.901.tar.xz new file mode 100644 index 0000000..19a3ccd --- /dev/null +++ b/xwayland-22.0.99.901.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2000fb40728cb12b1d888d2c351c75e4031325fc33b973b4f5313138f2eaa77 +size 1271688 diff --git a/xwayland-22.0.99.901.tar.xz.sig b/xwayland-22.0.99.901.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..4f479b330d76cc7bb0aeda830f274d0b29af4eeca4ebf2301c92936047d89396 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4N5?`2wGjMSVz(iJ^W|*Jw v)S^R;b6(U|v%)nw&D{k|H>(*L7W~#yDr?{Cv{EAOR>Te|GlQ?^d(Hy@7k(r_ literal 0 HcmV?d00001 diff --git a/xwayland.changes b/xwayland.changes index fdf75fd..ecefe20 100644 --- a/xwayland.changes +++ b/xwayland.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jan 20 17:59:50 UTC 2022 - Bjørn Lie + +- Update to version 22.0.99.901 + * DRM lease support + * Enables sRGB fbconfigs in GLX + * Requires libxcvt + * Refactoring of the present code in Xwayland + * Implements support for touchpad gestures + * Support for xfixes's ClientDisconnectMode and optional + terminate delay +- Add pkgconfig(libxcvt) BuildRequires: New dependency. +- Add xwayland.keyring, use url for sources, validate sig. +- Move man pages from devel to main binary package. +- Enable LTO, no longer disable LTO via macro. + ------------------------------------------------------------------- Tue Dec 14 15:44:46 UTC 2021 - Stefan Dirsch diff --git a/xwayland.keyring b/xwayland.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..779646aeaa220dcaa9c0d20c9f1fe36b28f19e0e1810e2d79c584922fb1e1f83 GIT binary patch literal 2290 zcmb`IXHe7W7RLW+kdOdDAkq;+T@zqMM1`d+1i?_2CPbts6zQR(AShrKmy4h%p(I)K z29Yl4(gZ1@G(i^7NEcR+;)cE`$VGOT%gl~DcW3Umcis=@d7j@n?|bN=e5kQ=pNtR` zU}lDD7NTa!&bwI#-rNPr^^SIA=~!ub4!dDw)ETSAI2&c6FuiJAtYOqoPa~QXm@GS?4}`& zncV0$Vu7U^7+#Wy`+p*RllD=Ezoswxz6>N_>3 z6RDgaIm0I&KtNYqYbB)`hmhbMem#XBg{Cy*QDbzzI zLE%)gd*C5muRjk4QC^-DwIHgu9xVncECdElf+ev$NCcc00)~o$;SeYW3;}^>)Ko$K>xQ60rkzs zmpTO5?O(TC1O-q03t+l*-C-A$JVU9pzqn?{8w3{jOmqcu;e5wCF5&{O2vl3=pO4DW zSuu@d(L8rqV0ZlNj5Z8`@B+nu17}q zn6T?2@WP?BThpA?pB%i<>onh85!J5)han{Fr2AlClRKSZJMi~Q9lZ)LFF6JyCe(t% z?et%D90j6V5xe=yubBkTX<#^YK92vT1HViP&_zM^hEKV#1tZMZ? zIEXKC8PkZRdF=`-eTn+~#E$&`j2tNru(H=ktY$j0`?SME+bu8kPVU_lF2K+`jMe-@ zeceDbasgCk_;^``DA>2B^YwtcupR#dzduibCcqjkitSx9fvRwkQw{{s>W0*`)3*St zIM3mTXf*m!gCUJz9(N<_)mZFI74|Q@_i%d$xcmD5ziBf}04CKV2j!iO!8Vr-{>u zA6TY00T$iQ%`AZPBB5L{q$(pss1VzN(yamWe_26hXgH86mDy>3Qk!V=Qj3B)uyC;S zb5ft)1>K0LYIw!FjF89-#AfyAwf7$bo}8N)Q>lbEm0666LDITY{O65C-<@xCowl8?kjmJyfE9W(Vk-DuP{#4aw{=%ao{ zH6(OPAcaS~#N^tRQ%agiSL&xK^KuPmG%X`*OSO*PS-){X;qFLp7fj_&>;nHuao}0qQa2vedE9`ySRePKmrgL@3x!6ItDMAb|O|jZN7Mg z&jBoxQy%rBl11epzkawhg30N3>Ppi^ICHv-5gO^w)NKR(%9FKXNgGXOJ&D3M4hcAi zQv4$_2_X>&=v>i1p8jT}FPOFNp(y8)%UtJ_b zE_1FSIXVI`R;c5rm(F;fDsHyQ)Cc}DcaFYF4mq)*s6BNA8-`bTYihQvBUWYcJ6Uw7 zechEBM}Fv?_na7$*=mlplx$dNNMprt{qc61ep^CsQ0s9vCLGg?@+Lo-q>G{-4XUfj zc9-_eES9Dk*vCgLqn5&t>DPP&wYrWmrVHzp4LvSd9i}-$#dfxd^xu6}!}}k1ZUewj vt*#$DQmn13rEN3ngOPaUa7HT+VBN8in$o^-+4qXsse56bPVOF)tqT7EY5IJt literal 0 HcmV?d00001 diff --git a/xwayland.spec b/xwayland.spec index 7e6bc00..ec2548c 100644 --- a/xwayland.spec +++ b/xwayland.spec @@ -1,7 +1,7 @@ # # spec file for package xwayland # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,16 +24,16 @@ %endif Name: xwayland -Version: 21.1.4 +Version: 22.0.99.901 Release: 0 URL: http://xorg.freedesktop.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: X -# Source URL: https://xorg.freedesktop.org/archive/individual/xserver/ License: MIT Group: System/X11/Servers/XF86_4 -Source0: %{name}-%{version}.tar.xz -Source1: %{name}-%{version}.tar.xz.sig +Source0: %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz +Source1: %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz.sig +Source2: xwayland.keyring + BuildRequires: meson BuildRequires: ninja BuildRequires: pkgconfig @@ -44,23 +44,18 @@ BuildRequires: pkgconfig(damageproto) BuildRequires: pkgconfig(dri) BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(epoxy) -BuildRequires: pkgconfig(libtirpc) - -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) -%if 0%{?have_wayland_eglstream} == 1 -BuildRequires: pkgconfig(wayland-eglstream-protocols) -%endif BuildRequires: pkgconfig(fixesproto) BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(fontutil) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glproto) -BuildRequires: pkgconfig(inputproto) +BuildRequires: pkgconfig(inputproto) >= 2.3.99.1 BuildRequires: pkgconfig(kbproto) BuildRequires: pkgconfig(libbsd) BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libtirpc) +BuildRequires: pkgconfig(libxcvt) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(presentproto) @@ -70,6 +65,11 @@ BuildRequires: pkgconfig(renderproto) BuildRequires: pkgconfig(resourceproto) BuildRequires: pkgconfig(scrnsaverproto) BuildRequires: pkgconfig(videoproto) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-protocols) +%if 0%{?have_wayland_eglstream} == 1 +BuildRequires: pkgconfig(wayland-eglstream-protocols) +%endif BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-damage) @@ -130,11 +130,9 @@ Requires: pkgconfig(xv) This package contains the Xwayland Server development files. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 %build -%define _lto_cflags %{nil} - %{meson} \ -Dglamor=true \ %if 0%{?have_wayland_eglstream} == 1 @@ -189,11 +187,10 @@ rm -f %{buildroot}%{_libdir}/xorg/protocol.txt %files %{_bindir}/Xwayland +%{_mandir}/man1/Xwayland.1%{ext_man} %files devel -%defattr(-,root,root) %{_libdir}/pkgconfig/*.pc %dir %{_libdir}/xorg -%{_mandir}/man1/Xwayland.1.gz %changelog From a8a29eb616d4b041a77a6cdf3ea0cfccca6b49a74f3ee6b6e2a7fecd33ffea61 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 3 Feb 2022 05:19:41 +0000 Subject: [PATCH 2/2] Accepting request 950845 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/950845 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=23 --- xwayland-22.0.99.901.tar.xz | 3 --- xwayland-22.0.99.901.tar.xz.sig | Bin 95 -> 0 bytes xwayland-22.0.99.902.tar.xz | 3 +++ xwayland-22.0.99.902.tar.xz.sig | Bin 0 -> 95 bytes xwayland.changes | 6 ++++++ xwayland.spec | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 xwayland-22.0.99.901.tar.xz delete mode 100644 xwayland-22.0.99.901.tar.xz.sig create mode 100644 xwayland-22.0.99.902.tar.xz create mode 100644 xwayland-22.0.99.902.tar.xz.sig diff --git a/xwayland-22.0.99.901.tar.xz b/xwayland-22.0.99.901.tar.xz deleted file mode 100644 index 19a3ccd..0000000 --- a/xwayland-22.0.99.901.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2000fb40728cb12b1d888d2c351c75e4031325fc33b973b4f5313138f2eaa77 -size 1271688 diff --git a/xwayland-22.0.99.901.tar.xz.sig b/xwayland-22.0.99.901.tar.xz.sig deleted file mode 100644 index 4f479b330d76cc7bb0aeda830f274d0b29af4eeca4ebf2301c92936047d89396..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4N5?`2wGjMSVz(iJ^W|*Jw v)S^R;b6(U|v%)nw&D{k|H>(*L7W~#yDr?{Cv{EAOR>Te|GlQ?^d(Hy@7k(r_ diff --git a/xwayland-22.0.99.902.tar.xz b/xwayland-22.0.99.902.tar.xz new file mode 100644 index 0000000..89e8cc8 --- /dev/null +++ b/xwayland-22.0.99.902.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2d724c40950f3ca967ea83a63b75ec87d3d0583b2f7bc3795cd960ba04ca4fe +size 1271600 diff --git a/xwayland-22.0.99.902.tar.xz.sig b/xwayland-22.0.99.902.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..07aa1560aadd8f98e5d35955aa203bbd2e9ad0575aa5b4949985c09243590f5a GIT binary patch literal 95 zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4N5`RtMWZ>cyfQh6wGR&_| uRf=}y`Li%6;C|lLp8Y~8jhcB3^K){ZZj?WH{!7P$&SR2Jj#j2E%Krc%;v~8N literal 0 HcmV?d00001 diff --git a/xwayland.changes b/xwayland.changes index ecefe20..35d6afd 100644 --- a/xwayland.changes +++ b/xwayland.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 3 04:48:43 UTC 2022 - Bjørn Lie + +- Update to version 22.0.99.902 + * render: Fix build with gcc 12 + ------------------------------------------------------------------- Thu Jan 20 17:59:50 UTC 2022 - Bjørn Lie diff --git a/xwayland.spec b/xwayland.spec index ec2548c..b67a42d 100644 --- a/xwayland.spec +++ b/xwayland.spec @@ -24,7 +24,7 @@ %endif Name: xwayland -Version: 22.0.99.901 +Version: 22.0.99.902 Release: 0 URL: http://xorg.freedesktop.org/ Summary: X