diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-07-10 18:19:51 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-07-10 18:19:51 +0000 |
| commit | 9acfcb10ddc85aba0512558817fd7287a8eeef01 (patch) | |
| tree | 629242a2634af6d16804241ed5c6905aa5d083f6 /x11-base | |
| parent | 23495ecd827bdeb79c2c0f4d206cd2c69b75ff12 (diff) | |
| download | baldeagleos-repo-9acfcb10ddc85aba0512558817fd7287a8eeef01.tar.gz baldeagleos-repo-9acfcb10ddc85aba0512558817fd7287a8eeef01.tar.xz baldeagleos-repo-9acfcb10ddc85aba0512558817fd7287a8eeef01.zip | |
Adding metadata
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xwayland/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xwayland/xwayland-24.1.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | x11-base/xwayland/xwayland-24.1.1.ebuild (renamed from x11-base/xwayland/xwayland-22.1.9.ebuild) | 32 |
3 files changed, 24 insertions, 14 deletions
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 3460a954ebdb..89ed5af379d0 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,3 +1,3 @@ -DIST xwayland-22.1.9.tar.xz 1274288 BLAKE2B 887bbc969558ce0f0431dfec97cdc840ee6406f157b9733d81c71d87cc57aa5817417704750b197c75b0c52cb9f8636d51c258a506240a4aec6265b160e509c5 SHA512 4b30c1cfdb18d9a0f55aa8a8324f625ec5bbd67c1e9041956a2e65c1d063b509cd921ecb8d299f9b6f0daaa01b75ae42f1d47f7fecb944a352cc60954c1ad334 DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49 DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003 +DIST xwayland-24.1.1.tar.xz 1301652 BLAKE2B 0b25776d7b6910b5a122d5ab917506ce933c87b6f0abf908649461f013463001161d1fa5fcaa499c56cfce57f035ad95fd49e28bb3e84ce159eaaad74b5b2799 SHA512 e44f47adab3830846360fd05fdc06d9016832133c662f2e4b0763b98de0c9b48dbfce7d757ffea5538b5fabb68170e5d1057acc1b9a086e396b147deaa750998 diff --git a/x11-base/xwayland/xwayland-24.1.0-r1.ebuild b/x11-base/xwayland/xwayland-24.1.0-r1.ebuild index 26146e9caeee..bd3ce591a910 100644 --- a/x11-base/xwayland/xwayland-24.1.0-r1.ebuild +++ b/x11-base/xwayland/xwayland-24.1.0-r1.ebuild @@ -19,7 +19,7 @@ COMMON_DEPEND=" !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) >=dev-libs/wayland-1.21.0 - >=dev-libs/wayland-protocols-1.30 + >=dev-libs/wayland-protocols-1.36 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] @@ -41,7 +41,7 @@ COMMON_DEPEND=" " DEPEND=" ${COMMON_DEPEND} - >=x11-base/xorg-proto-2023.2 + >=x11-base/xorg-proto-2024.1 >=x11-libs/xtrans-1.3.5 " RDEPEND=" diff --git a/x11-base/xwayland/xwayland-22.1.9.ebuild b/x11-base/xwayland/xwayland-24.1.1.ebuild index b8b24c75e785..bd3ce591a910 100644 --- a/x11-base/xwayland/xwayland-22.1.9.ebuild +++ b/x11-base/xwayland/xwayland-24.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Liguros Authors +# Copyright 2022-2024 Liguros Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,23 +8,23 @@ 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="libressl selinux video_cards_nvidia unwind xcsecurity" +IUSE="libei libressl selinux systemd video_cards_nvidia unwind xcsecurity" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" dev-libs/libbsd !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) - >=dev-libs/wayland-1.20 - >=dev-libs/wayland-protocols-1.22 + >=dev-libs/wayland-1.21.0 + >=dev-libs/wayland-protocols-1.36 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/libdrm-2.4.109 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 @@ -34,27 +34,31 @@ COMMON_DEPEND=" >=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 + >=x11-base/xorg-proto-2024.1 >=x11-libs/xtrans-1.3.5 " RDEPEND=" ${COMMON_DEPEND} x11-apps/xkbcomp - !<=x11-base/xorg-server-1.20.11 + + libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 ) selinux? ( sec-policy/selinux-xserver ) " BDEPEND=" - sys-devel/flex + app-alternatives/lex dev-util/wayland-scanner " PATCHES=( - "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch + "${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch + "${FILESDIR}"/file_collissions.patch ) src_configure() { @@ -62,7 +66,6 @@ src_configure() { $(meson_use selinux xselinux) $(meson_use unwind libunwind) $(meson_use xcsecurity) - $(meson_use video_cards_nvidia xwayland_eglstream) -Ddpms=true -Ddri3=true -Ddrm=true @@ -79,11 +82,18 @@ src_configure() { -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 } |