* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2021-06-22 21:27 Piotr Karbowski
0 siblings, 0 replies; 7+ messages in thread
From: Piotr Karbowski @ 2021-06-22 21:27 UTC (permalink / raw
To: gentoo-commits
commit: c5f13f25c3bc678b9a619a1757885d207c3a3277
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 22 21:22:30 2021 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 21:26:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f13f25
x11-base/xwayland: new package.
Closes: https://bugs.gentoo.org/785430
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
x11-base/xwayland/Manifest | 1 +
...xwayland-drop-redundantly-installed-files.patch | 27 ++++++++
x11-base/xwayland/metadata.xml | 16 +++++
x11-base/xwayland/xwayland-21.1.1.ebuild | 77 ++++++++++++++++++++++
4 files changed, 121 insertions(+)
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
new file mode 100644
index 00000000000..2f2adffe714
--- /dev/null
+++ b/x11-base/xwayland/Manifest
@@ -0,0 +1 @@
+DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a85bae214f9d395450b6945ee845d28c7a8580e6aaa5f3538d06083312391d24267e6b239bfc533526a1bd7a56f0a SHA512 0cb03d796af183f9fde14c30ef45d94ef466ac4ba3d85dda34e74f91dd94bb75d0c8a867ecb7bda7ea61d98c70a4f73bc98c5a205ea5f69a0e222cd780d263d8
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
new file mode 100644
index 00000000000..39e0548eaaa
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
@@ -0,0 +1,27 @@
+diff --git a/dix/meson.build b/dix/meson.build
+index ddc5cc3..bf5bfa3 100644
+--- a/dix/meson.build
++++ b/dix/meson.build
+@@ -56,8 +56,3 @@ libxserver_main = static_library('libxserver_main',
+ include_directories: inc,
+ dependencies: common_dep,
+ )
+-
+-install_data(
+- 'protocol.txt',
+- install_dir: serverconfigdir,
+-)
+diff --git a/meson.build b/meson.build
+index 4af03ef..791465d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -520,9 +520,3 @@ subdir('hw')
+ if host_machine.system() != 'windows'
+ subdir('test')
+ endif
+-
+-install_man(configure_file(
+- input: 'man/Xserver.man',
+- output: 'Xserver.1',
+- configuration: manpage_config,
+-))
diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml
new file mode 100644
index 00000000000..db66c9cee4d
--- /dev/null
+++ b/x11-base/xwayland/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+<use>
+ <flag name="unwind">Enable libunwind usage for backtraces</flag>
+ <flag name="xcsecurity">Build Security extension</flag>
+ <flag name="rpc">Enable secure rpc</flag>
+</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-base/xwayland/xwayland-21.1.1.ebuild b/x11-base/xwayland/xwayland-21.1.1.ebuild
new file mode 100644
index 00000000000..52954bdff07
--- /dev/null
+++ b/x11-base/xwayland/xwayland-21.1.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+
+IUSE="rpc unwind ipv6 xcsecurity selinux"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND="
+ >=x11-libs/pixman-0.27.2
+ dev-libs/libbsd
+ >=x11-libs/libXfont2-2.0.1
+ >=x11-libs/libXdmcp-1.0.2
+ dev-libs/wayland
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libdrm-2.4.89
+ >=media-libs/libepoxy-1.5.4[X,egl(+)]
+ >=media-libs/mesa-18[X(+),egl,gbm]
+ >=x11-libs/libxshmfence-1.1
+ rpc? ( net-libs/libtirpc )
+ >=x11-libs/libXau-1.0.4
+ media-libs/libglvnd[X]
+ unwind? ( sys-libs/libunwind )
+ >=dev-libs/wayland-protocols-1.18
+"
+
+DEPEND="
+ ${CDEPEND}
+ !<=x11-base/xorg-server-1.20.11
+"
+
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+ sys-devel/flex
+ dev-util/wayland-scanner
+"
+
+PATCHES=(
+ "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use rpc secure-rpc)
+ $(meson_use unwind libunwind)
+ $(meson_use ipv6)
+ $(meson_use xcsecurity)
+ $(meson_use selinux xselinux)
+ -Dsha1=libcrypto
+ -Ddpms=true
+ -Ddri3=true
+ -Dglamor=true
+ -Dglx=true
+ -Dscreensaver=true
+ -Dxace=true
+ -Dxdmcp=true
+ -Dxinerama=true
+ -Dxv=true
+ -Dxvfb=true
+ -Dxwayland-path=/usr/libexec
+ -Ddtrace=false
+ )
+
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2022-04-18 20:26 Piotr Karbowski
0 siblings, 0 replies; 7+ messages in thread
From: Piotr Karbowski @ 2022-04-18 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 7267981751efbc38cef7d90bc1fb0f857b42648a
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 20:25:29 2022 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:26:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72679817
x11-base/xwayland: added live ebuild.
Closes: https://bugs.gentoo.org/801478
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
...yland-drop-redundantly-installed-files_v2.patch | 30 ++++++
x11-base/xwayland/xwayland-9999.ebuild | 104 +++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
new file mode 100644
index 000000000000..ea765d3dcfcd
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
@@ -0,0 +1,30 @@
+diff --git a/dix/meson.build b/dix/meson.build
+index fbbcf8646..15ca7d3b0 100644
+--- a/dix/meson.build
++++ b/dix/meson.build
+@@ -57,8 +57,3 @@ libxserver_main = static_library('libxserver_main',
+ include_directories: inc,
+ dependencies: common_dep,
+ )
+-
+-install_data(
+- 'protocol.txt',
+- install_dir: serverconfigdir,
+-)
+diff --git a/meson.build b/meson.build
+index db1d63f3e..b9cef5a56 100644
+--- a/meson.build
++++ b/meson.build
+@@ -806,12 +806,6 @@ if host_machine.system() != 'windows'
+ subdir('test')
+ endif
+
+-install_man(configure_file(
+- input: 'man/Xserver.man',
+- output: 'Xserver.1',
+- configuration: manpage_config,
+-))
+-
+ if build_xorg
+ sdkconfig = configuration_data()
+ awk = find_program('awk')
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
new file mode 100644
index 000000000000..dae6cf880e98
--- /dev/null
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+ dev-libs/libbsd
+ dev-libs/openssl:=
+ >=dev-libs/wayland-1.20
+ >=dev-libs/wayland-protocols-1.22
+ 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.89
+ >=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
+
+ unwind? ( sys-libs/libunwind )
+ video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+ >=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-apps/xkbcomp
+ !<=x11-base/xorg-server-1.20.11
+ selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+ sys-devel/flex
+ dev-util/wayland-scanner
+"
+
+PATCHES=(
+ "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use selinux xselinux)
+ $(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
+ -Ddocs=false
+ -Ddevel-docs=false
+ -Ddocs-pdf=false
+ -Dxorg=false
+ -Dxnest=false
+ -Dxvfb=false
+ -Dxwayland=true
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+ meson_src_install
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2024-01-02 6:00 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-01-02 6:00 UTC (permalink / raw
To: gentoo-commits
commit: 763d1a19a12b0d2dba941a00ab4c5bd2ac3b8496
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 05:59:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 05:59:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763d1a19
x11-base/xwayland: fix systemd automagic
Closes: https://bugs.gentoo.org/908254
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/xwayland-23.2.3-systemd-automagic.patch | 52 ++++++++++++++++++++++
...yland-9999.ebuild => xwayland-23.2.3-r1.ebuild} | 13 +++---
x11-base/xwayland/xwayland-9999.ebuild | 6 ++-
3 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
new file mode 100644
index 000000000000..9af034c46fd5
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
@@ -0,0 +1,52 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230
+
+From 010f6e751e86207a7e88f3504191bcae2d77b458 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 31 Dec 2023 23:37:19 +0000
+Subject: [PATCH] meson: add option for systemd
+
+Without this, systemd will be used if installed on the system automagically,
+which is a problem if the built e.g. Xwayland is going to be used on a non-systemd
+machine.
+
+Bug: https://bugs.gentoo.org/908254
+Signed-off-by: Sam James <sam@gentoo.org>
+
+diff --git a/include/meson.build b/include/meson.build
+index e6e3d553f..ddc18407e 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -91,7 +91,7 @@ endif
+
+ conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false)
+ # Note: this symbol is used by libXtrans.
+-conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found() ? '1' : false)
++conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false)
+ conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false)
+ conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false)
+ conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF',
+diff --git a/meson.build b/meson.build
+index 60164d73b..de984760c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -99,6 +99,7 @@ xkbcomp_dep = dependency('xkbcomp', required: false)
+ xkbfile_dep = dependency('xkbfile')
+ xfont2_dep = dependency('xfont2', version: '>= 2.0')
+
++build_systemd = get_option('systemd') == 'true'
+ # libsystemd-daemon was moved into libsystemd in version 209
+ libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
+ if not libsystemd_daemon_dep.found()
+diff --git a/meson_options.txt b/meson_options.txt
+index af094df70..62c539fbd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -47,6 +47,8 @@ option('listen_unix', type: 'boolean', value: true,
+ option('listen_local', type: 'boolean', value: true,
+ description: 'Listen on local by default')
+
++option('systemd', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
++ description: 'Enable systemd-notify support')
+ option('dpms', type: 'boolean', value: true,
+ description: 'Xorg DPMS extension')
+ option('xf86bigfont', type: 'boolean', value: false,
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-23.2.3-r1.ebuild
similarity index 88%
copy from x11-base/xwayland/xwayland-9999.ebuild
copy to x11-base/xwayland/xwayland-23.2.3-r1.ebuild
index 915fd9a08bb3..7cf66e28583c 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-23.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ fi
DESCRIPTION="Standalone X server running under Wayland"
HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
LICENSE="MIT"
SLOT="0"
@@ -41,6 +41,7 @@ COMMON_DEPEND="
>=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 )
"
@@ -62,12 +63,14 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
+ "${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)
@@ -91,10 +94,6 @@ src_configure() {
-Ddocs=false
-Ddevel-docs=false
-Ddocs-pdf=false
- -Dxorg=false
- -Dxnest=false
- -Dxvfb=false
- -Dxwayland=true
)
if use libei; then
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 915fd9a08bb3..6d2b4301bc42 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ fi
DESCRIPTION="Standalone X server running under Wayland"
HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
LICENSE="MIT"
SLOT="0"
@@ -41,6 +41,7 @@ COMMON_DEPEND="
>=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 )
"
@@ -68,6 +69,7 @@ PATCHES=(
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)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2024-02-27 22:06 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-02-27 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 309b61024f2fa97cb7fdeb82f3c9e26955624cbd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 21:46:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 21:46:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309b6102
x11-base/xwayland: fix modern C issue
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-base/xwayland/files/xwayland-23.2.4-c99.patch | 72 ++++++++++++++
x11-base/xwayland/xwayland-23.2.4-r1.ebuild | 113 ++++++++++++++++++++++
2 files changed, 185 insertions(+)
diff --git a/x11-base/xwayland/files/xwayland-23.2.4-c99.patch b/x11-base/xwayland/files/xwayland-23.2.4-c99.patch
new file mode 100644
index 000000000000..21131ea317e4
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-23.2.4-c99.patch
@@ -0,0 +1,72 @@
+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
new file mode 100644
index 000000000000..2a4fe1f5c0f8
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.4-r1.ebuild
@@ -0,0 +1,113 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2024-04-25 16:10 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2024-04-25 16:10 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2024-05-16 14:16 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2024-05-16 14:16 UTC (permalink / raw
To: gentoo-commits
commit: a9af4cee408321c9a5ee1c89cf8d1c602d63fcc5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 14:12:45 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 16 14:16:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9af4cee
x11-base/xwayland: Replace patch with manual removal
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...yland-drop-redundantly-installed-files_v2.patch | 27 ----------------------
x11-base/xwayland/xwayland-9999.ebuild | 10 ++++----
2 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
deleted file mode 100644
index 11c9bed1e235..000000000000
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dix/meson.build b/dix/meson.build
-index fbbcf8646..15ca7d3b0 100644
---- a/dix/meson.build
-+++ b/dix/meson.build
-@@ -57,8 +57,3 @@ libxserver_main = static_library('libxserver_main',
- include_directories: inc,
- dependencies: common_dep,
- )
--
--install_data(
-- 'protocol.txt',
-- install_dir: serverconfigdir,
--)
-diff --git a/man/meson.build b/man/meson.build
-index 2961469c5..1183d741d 100644
---- a/man/meson.build
-+++ b/man/meson.build
-@@ -28,9 +28,3 @@ manpage_config.set('modulepath', module_dir)
- # manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
- manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
- manpage_config.set('default_font_path', default_font_path)
--
--install_man(configure_file(
-- input: 'Xserver.man',
-- output: 'Xserver.1',
-- configuration: manpage_config,
--))
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 30d4b9f53746..3b5d437dd588 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -66,10 +66,6 @@ BDEPEND="
dev-util/wayland-scanner
"
-PATCHES=(
- "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
-)
-
src_prepare() {
default
@@ -128,4 +124,10 @@ src_install() {
dosym ../bin/Xwayland /usr/libexec/Xwayland
meson_src_install
+
+ # Remove files installed by x11-base/xorg-xserver
+ rm \
+ "${ED}"/usr/share/man/man1/Xserver.1 \
+ "${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
+ || die
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/
@ 2024-09-24 0:36 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2024-09-24 0:36 UTC (permalink / raw
To: gentoo-commits
commit: b118a6bf7f6a88c3e2e319f739daef2d98d0b58d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 00:32:09 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 00:33:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b118a6bf
x11-base/xwayland: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-base/xwayland/Manifest | 1 -
.../files/xwayland-23.2.3-systemd-automagic.patch | 52 ----------
...wayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch | 36 -------
...xwayland-drop-redundantly-installed-files.patch | 27 -----
x11-base/xwayland/xwayland-23.2.6.ebuild | 113 ---------------------
5 files changed, 229 deletions(-)
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 97afcdda4055..c4e201a514d8 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,2 +1 @@
-DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c
diff --git a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
deleted file mode 100644
index 9af034c46fd5..000000000000
--- a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230
-
-From 010f6e751e86207a7e88f3504191bcae2d77b458 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 31 Dec 2023 23:37:19 +0000
-Subject: [PATCH] meson: add option for systemd
-
-Without this, systemd will be used if installed on the system automagically,
-which is a problem if the built e.g. Xwayland is going to be used on a non-systemd
-machine.
-
-Bug: https://bugs.gentoo.org/908254
-Signed-off-by: Sam James <sam@gentoo.org>
-
-diff --git a/include/meson.build b/include/meson.build
-index e6e3d553f..ddc18407e 100644
---- a/include/meson.build
-+++ b/include/meson.build
-@@ -91,7 +91,7 @@ endif
-
- conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false)
- # Note: this symbol is used by libXtrans.
--conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found() ? '1' : false)
-+conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false)
- conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false)
- conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false)
- conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF',
-diff --git a/meson.build b/meson.build
-index 60164d73b..de984760c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -99,6 +99,7 @@ xkbcomp_dep = dependency('xkbcomp', required: false)
- xkbfile_dep = dependency('xkbfile')
- xfont2_dep = dependency('xfont2', version: '>= 2.0')
-
-+build_systemd = get_option('systemd') == 'true'
- # libsystemd-daemon was moved into libsystemd in version 209
- libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
- if not libsystemd_daemon_dep.found()
-diff --git a/meson_options.txt b/meson_options.txt
-index af094df70..62c539fbd 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -47,6 +47,8 @@ option('listen_unix', type: 'boolean', value: true,
- option('listen_local', type: 'boolean', value: true,
- description: 'Listen on local by default')
-
-+option('systemd', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
-+ description: 'Enable systemd-notify support')
- option('dpms', type: 'boolean', value: true,
- description: 'Xorg DPMS extension')
- option('xf86bigfont', type: 'boolean', value: false,
diff --git a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
deleted file mode 100644
index 173daa3c6265..000000000000
--- a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d5ef57f1efc967fbc88dfa0f0177be354caf039b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Tue, 26 Sep 2023 17:23:32 +0200
-Subject: [PATCH xserver] test: Skip Xwayland test early if PIGLIT_DIR /
- XTEST_DIR isn't set
-
-No point starting weston and waiting for it to start up in that case.
----
- test/scripts/xwayland-piglit.sh | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh
-index 97a1759d9..9d6e54d01 100755
---- a/test/scripts/xwayland-piglit.sh
-+++ b/test/scripts/xwayland-piglit.sh
-@@ -1,5 +1,17 @@
- #!/bin/bash -e
-
-+if test "x$XTEST_DIR" = "x"; then
-+ echo "XTEST_DIR must be set to the directory of the xtest repository."
-+ # Exit as a "skip" so make check works even without xtest.
-+ exit 77
-+fi
-+
-+if test "x$PIGLIT_DIR" = "x"; then
-+ echo "PIGLIT_DIR must be set to the directory of the piglit repository."
-+ # Exit as a "skip" so make check works even without piglit.
-+ exit 77
-+fi
-+
- # this times out on Travis, because the tests take too long.
- if test "x$TRAVIS_BUILD_DIR" != "x"; then
- exit 77
---
-2.43.2
-
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
deleted file mode 100644
index 39e0548eaaa3..000000000000
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dix/meson.build b/dix/meson.build
-index ddc5cc3..bf5bfa3 100644
---- a/dix/meson.build
-+++ b/dix/meson.build
-@@ -56,8 +56,3 @@ libxserver_main = static_library('libxserver_main',
- include_directories: inc,
- dependencies: common_dep,
- )
--
--install_data(
-- 'protocol.txt',
-- install_dir: serverconfigdir,
--)
-diff --git a/meson.build b/meson.build
-index 4af03ef..791465d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -520,9 +520,3 @@ subdir('hw')
- if host_machine.system() != 'windows'
- subdir('test')
- endif
--
--install_man(configure_file(
-- input: 'man/Xserver.man',
-- output: 'Xserver.1',
-- configuration: manpage_config,
--))
diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild
deleted file mode 100644
index b2c72b5e40de..000000000000
--- a/x11-base/xwayland/xwayland-23.2.6.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 ~loong 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}"/${PN}-drop-redundantly-installed-files.patch
- "${FILESDIR}"/${PN}-23.2.3-systemd-automagic.patch
- "${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-24 0:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-18 20:26 [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/, x11-base/xwayland/ Piotr Karbowski
-- strict thread matches above, loose matches on Subject: below --
2024-09-24 0:36 Matt Turner
2024-05-16 14:16 Matt Turner
2024-04-25 16:10 Matt Turner
2024-02-27 22:06 Sam James
2024-01-02 6:00 Sam James
2021-06-22 21:27 Piotr Karbowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox