[gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/

["Matt Turner" <mattst88@gentoo.org>]

commit:     c7aa6f1c19579b1f8c0dfb5c3e709a34f940d0e1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 16:03:18 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 16:09:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7aa6f1c

x11-base/xwayland: Drop old versions

Bug: https://bugs.gentoo.org/928531
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-base/xwayland/Manifest                        |   2 -
 x11-base/xwayland/files/xwayland-23.2.4-c99.patch |  72 --------------
 x11-base/xwayland/xwayland-23.2.4-r1.ebuild       | 113 ----------------------
 x11-base/xwayland/xwayland-23.2.4.ebuild          | 112 ---------------------
 x11-base/xwayland/xwayland-23.2.5.ebuild          | 113 ----------------------
 5 files changed, 412 deletions(-)

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 9a54f9414d06..d3d403a9fb6f 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,3 +1 @@
-DIST xwayland-23.2.4.tar.xz 1299748 BLAKE2B 5427ff1f8b95b25c79df74eef18e2aeb7eecafa7d522e720e1072603108516cbaa57652e6439426d18d90320b67ec0764978450c76c6ce759d49fedfc6aedf65 SHA512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187
-DIST xwayland-23.2.5.tar.xz 1299988 BLAKE2B d0f4ff06c5eef3c4863aae53496dbd02e89fb186b06001c81f5a7e261fe5a7eefd8a327a9489a5eaed34c91ac68e02664256d948cca6c4efad116580ec9340f6 SHA512 8cf90d51db7c4c7e8191b5919e6529fe577bc735bb1d00fbc0139cb67ef95d30eb56c2026f3b2f639745c6a621b33bbd60f9ebabdd12175148dd192393ce1169
 DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49

diff --git a/x11-base/xwayland/files/xwayland-23.2.4-c99.patch b/x11-base/xwayland/files/xwayland-23.2.4-c99.patch
deleted file mode 100644
index 21131ea317e4..000000000000
--- a/x11-base/xwayland/files/xwayland-23.2.4-c99.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0a187f55d76139225c11ce92ab69816d46db55c
-
-From f0a187f55d76139225c11ce92ab69816d46db55c Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 29 Jan 2024 10:31:36 +0100
-Subject: [PATCH] xwayland: Use correct pointer types on i386
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-And other 32-bit architectures, where uint32_t and CARD32 are
-not the same type.  Otherwise the build will fail with GCC 14
-with errors like:
-
-../hw/xwayland/xwayland-glamor.c: In function ‘xwl_glamor_get_formats’:
-../hw/xwayland/xwayland-glamor.c:291:43: error: passing argument 3 of ‘xwl_get_formats_for_device’ from incompatible pointer type [-Wincompatible-pointer-types]
-  291 |                                           num_formats, formats);
-      |                                           ^~~~~~~~~~~
-      |                                           |
-      |                                           CARD32 * {aka long unsigned int *}
-../hw/xwayland/xwayland-glamor.c:238:38: note: expected ‘uint32_t *’ {aka ‘unsigned int *’} but argument is of type ‘CARD32 *’ {aka ‘long unsigned int *’}
-  238 |                            uint32_t *num_formats, uint32_t **formats)
-      |                            ~~~~~~~~~~^~~~~~~~~~~
-../hw/xwayland/xwayland-glamor.c:291:56: error: passing argument 4 of ‘xwl_get_formats_for_device’ from incompatible pointer type [-Wincompatible-pointer-types]
-  291 |                                           num_formats, formats);
-      |                                                        ^~~~~~~
-      |                                                        |
-      |                                                        CARD32 ** {aka long unsigned int **}
-../hw/xwayland/xwayland-glamor.c:238:62: note: expected ‘uint32_t **’ {aka ‘unsigned int **’} but argument is of type ‘CARD32 **’ {aka ‘long unsigned int **’}
-  238 |                            uint32_t *num_formats, uint32_t **formats)
-      |                                                   ~~~~~~~~~~~^~~~~~~
-../hw/xwayland/xwayland-glamor.c:295:28: error: passing argument 3 of ‘xwl_get_formats’ from incompatible pointer type [-Wincompatible-pointer-types]
-  295 |                            num_formats, formats);
-      |                            ^~~~~~~~~~~
-      |                            |
-      |                            CARD32 * {aka long unsigned int *}
-../hw/xwayland/xwayland-glamor.c:217:26: note: expected ‘uint32_t *’ {aka ‘unsigned int *’} but argument is of type ‘CARD32 *’ {aka ‘long unsigned int *’}
-  217 |                uint32_t *num_formats, uint32_t **formats)
-      |                ~~~~~~~~~~^~~~~~~~~~~
-../hw/xwayland/xwayland-glamor.c:295:41: error: passing argument 4 of ‘xwl_get_formats’ from incompatible pointer type [-Wincompatible-pointer-types]
-  295 |                            num_formats, formats);
-      |                                         ^~~~~~~
-      |                                         |
-      |                                         CARD32 ** {aka long unsigned int **}
-../hw/xwayland/xwayland-glamor.c:217:50: note: expected ‘uint32_t **’ {aka ‘unsigned int **’} but argument is of type ‘CARD32 **’ {aka ‘long unsigned int **’}
-  217 |                uint32_t *num_formats, uint32_t **formats)
-      |                                       ~~~~~~~~~~~^~~~~~~
---- a/hw/xwayland/xwayland-glamor.c
-+++ b/hw/xwayland/xwayland-glamor.c
-@@ -212,7 +212,7 @@ xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
- 
- static Bool
- xwl_get_formats(struct xwl_format *format_array, int format_array_len,
--               uint32_t *num_formats, uint32_t **formats)
-+               CARD32 *num_formats, CARD32 **formats)
- {
-     *num_formats = 0;
-     *formats = NULL;
-@@ -233,9 +233,9 @@ xwl_get_formats(struct xwl_format *format_array, int format_array_len,
- 
- static Bool
- xwl_get_formats_for_device(struct xwl_dmabuf_feedback *xwl_feedback, drmDevice *device,
--                           uint32_t *num_formats, uint32_t **formats)
-+                           CARD32 *num_formats, CARD32 **formats)
- {
--    uint32_t *ret = NULL;
-+    CARD32 *ret = NULL;
-     uint32_t count = 0;
- 
-     /* go through all matching sets of tranches for the window's device */
--- 
-GitLab

diff --git a/x11-base/xwayland/xwayland-23.2.4-r1.ebuild b/x11-base/xwayland/xwayland-23.2.4-r1.ebuild
deleted file mode 100644
index 2a4fe1f5c0f8..000000000000
--- a/x11-base/xwayland/xwayland-23.2.4-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.30
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.109
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2022.2
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-	"${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch
-	"${FILESDIR}"/xwayland-23.2.4-c99.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}

diff --git a/x11-base/xwayland/xwayland-23.2.4.ebuild b/x11-base/xwayland/xwayland-23.2.4.ebuild
deleted file mode 100644
index 6c2c9edce4d9..000000000000
--- a/x11-base/xwayland/xwayland-23.2.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.30
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.109
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2022.2
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-	"${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}

diff --git a/x11-base/xwayland/xwayland-23.2.5.ebuild b/x11-base/xwayland/xwayland-23.2.5.ebuild
deleted file mode 100644
index c41f16ee5928..000000000000
--- a/x11-base/xwayland/xwayland-23.2.5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.30
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.109
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2023.2
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-	"${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch
-	"${FILESDIR}"/xwayland-23.2.4-c99.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}