From 1bc13b5280a4086aba87b3ffdadfc304e7599db5b482b778618eb2ea60c7c000 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 30 Jun 2022 22:18:00 +0000 Subject: [PATCH] - Update to release 1.21 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=103 --- wayland-1.20.0.tar.xz | 3 - wayland-1.20.0.tar.xz.sig | Bin 566 -> 0 bytes wayland-1.21.0.tar.xz | 3 + wayland-1.21.0.tar.xz.sig | Bin 0 -> 566 bytes ...hm-Close-file-descriptors-not-needed.patch | 74 ------------------ wayland.changes | 9 +++ wayland.spec | 9 +-- 7 files changed, 15 insertions(+), 83 deletions(-) delete mode 100644 wayland-1.20.0.tar.xz delete mode 100644 wayland-1.20.0.tar.xz.sig create mode 100644 wayland-1.21.0.tar.xz create mode 100644 wayland-1.21.0.tar.xz.sig delete mode 100644 wayland-shm-Close-file-descriptors-not-needed.patch diff --git a/wayland-1.20.0.tar.xz b/wayland-1.20.0.tar.xz deleted file mode 100644 index af70a1e..0000000 --- a/wayland-1.20.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725 -size 225188 diff --git a/wayland-1.20.0.tar.xz.sig b/wayland-1.20.0.tar.xz.sig deleted file mode 100644 index c87cd096f6738f3a25c8c66eebe49356e7328a2ca65ea89cd67bd142d948e2ba..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*Q|CJ`s?+%xvK;q;N-h1Hak6uUx0%5W(MF0v35D(sa z;OLKDNJpa(0F^PD+>m>~R-*p1rQ&z~#(x~;9+{5j>o2b2HjJulz(vS5B~oa9nq_Mq zKUS5M5tUh4Nv>=K{k6s5ryKn|6jmr&i>c~P6 zl1dB)(9!J+RBKmu~qiazl%$GKiJb61@J)-Q~^2Tk}^U zEW(JdUKG_KP+4SvOvg0k3NLkKENPCWCn@s->5;=d!hlqo4Tgw+`q*~w7Z!Bq4u{%w zd2?=2l#bWk)_q;o-Y$*Bn*n2fn|>xk0#y{bLP#}Desar?*wgF96Yd<7BZ^56bZs)c zcAzW!dRImX^ZF*pTF>EqKuVsUur`3#Up5 zqV4#H(o;sT69-*Uhz5$S!kja^;*kOTHi4Q+NEiWe3*%`j*i)6G)0x2%P1=1+tUq4& zK-2C4#-Mjc(W&i`Jx#*HndWmljgDF>1Ts$0+v5S8ZNxxW^Q=%Qe3xMc3vV;n`kLtW zCESKi9VF&d#sK9-`U3$gVhp|lAn-_+thSWk?>lL5?xCtnP-V;cOm1Dak3GNiS@^o4 zxqtCXseZZnyOUm$>g*I(02jTSbODLHjBS`xqeIfApq!|Vtg4xugGL*ErtZSlLBMbK ze`&*Et2xN_sb)K#gT<$2&2@H;Y!d zIq_#_^M2CReZ$B6Fcux;l&G~48VA2JU;o@# Ek>#5ev;Y7A literal 0 HcmV?d00001 diff --git a/wayland-shm-Close-file-descriptors-not-needed.patch b/wayland-shm-Close-file-descriptors-not-needed.patch deleted file mode 100644 index 1cc2a05..0000000 --- a/wayland-shm-Close-file-descriptors-not-needed.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b20428663afa1a6351eb943b5f2992a744c18797 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Mon, 10 Jan 2022 15:10:07 +0100 -Subject: [PATCH] shm: Close file descriptors not needed - -Commit 5a981ee8 implemented a fallback path for platforms which do not -support mremap() such as FreeBSD. - -To do so, the file descriptor for the mmap() is not closed immediately -but instead kept as long as the pool exists. - -That induces more file descriptors kept open for longer, which in turn -may cause problems as wl_shm may be using a lot of file descriptors, -especially with Xwayland which can create a lot of pixmaps on behalf of -its X11 clients. - -For platforms where mremap() is available, keeping those file -descriptors opened is a bit of a waste and may cause exhaustion of file -descriptors sooner that before commit 5a981ee8. - -Only keep the mmap() file descriptor open on platforms which do not -implement mremap() and close it immediately as before on others. - -Signed-off-by: Olivier Fourdan -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1283 ---- - src/wayland-shm.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/wayland-shm.c b/src/wayland-shm.c -index 63ac0d7d..17ab77f4 100644 ---- a/src/wayland-shm.c -+++ b/src/wayland-shm.c -@@ -65,10 +65,12 @@ struct wl_shm_pool { - char *data; - ssize_t size; - ssize_t new_size; -+#ifndef MREMAP_MAYMOVE - /* The following three fields are needed for mremap() emulation. */ - int mmap_fd; - int mmap_flags; - int mmap_prot; -+#endif - bool sigbus_is_impossible; - }; - -@@ -153,7 +155,9 @@ shm_pool_unref(struct wl_shm_pool *pool, bool external) - return; - - munmap(pool->data, pool->size); -+#ifndef MREMAP_MAYMOVE - close(pool->mmap_fd); -+#endif - free(pool); - } - -@@ -344,10 +348,14 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource, - strerror(errno)); - goto err_free; - } -+#ifndef MREMAP_MAYMOVE - /* We may need to keep the fd, prot and flags to emulate mremap(). */ - pool->mmap_fd = fd; - pool->mmap_prot = prot; - pool->mmap_flags = flags; -+#else -+ close(fd); -+#endif - pool->resource = - wl_resource_create(client, &wl_shm_pool_interface, 1, id); - if (!pool->resource) { --- -GitLab - diff --git a/wayland.changes b/wayland.changes index f00f670..6a85644 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 30 22:07:21 UTC 2022 - Jan Engelhardt + +- Update to release 1.21 + * This new release adds a new wl_pointer high-resolution scroll + event, adds a few new convenience functions, and contains a + collection of bug fixes. +- Drop wayland-shm-Close-file-descriptors-not-needed.patch + ------------------------------------------------------------------- Tue May 24 19:27:57 UTC 2022 - Dirk Müller diff --git a/wayland.spec b/wayland.spec index b93fc21..713fb4a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -15,8 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - -%define _version 1.20.0 +%define _version 1.21.0 %if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1550 %define eglversion 99~%_version %else @@ -33,12 +32,10 @@ Group: Development/Libraries/C and C++ URL: https://wayland.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/wayland/wayland #Git-Web: http://cgit.freedesktop.org/wayland/wayland/ -Source: https://wayland.freedesktop.org/releases/%name-%version.tar.xz -Source2: https://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig +Source: https://gitlab.freedesktop.org/wayland/wayland/-/releases/%version/downloads/wayland-%version.tar.xz +Source2: https://gitlab.freedesktop.org/wayland/wayland/-/releases/%version/downloads/wayland-%version.tar.xz.sig Source3: %name.keyring Source4: baselibs.conf -# PATCH-FIX-UPSTREAM wayland-shm-Close-file-descriptors-not-needed.patch bsc#1194190 alynx.zhou@suse.com -- Close file descriptors not needed to prevent Xwayland crash. -Patch1: wayland-shm-Close-file-descriptors-not-needed.patch BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: libxml2-tools