diff options
Diffstat (limited to 'x11-base')
39 files changed, 1394 insertions, 616 deletions
diff --git a/x11-base/metadata.xml b/x11-base/metadata.xml index 1b3cc8ab85ec..3279f04db672 100644 --- a/x11-base/metadata.xml +++ b/x11-base/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The x11-base category contains various X11 base implementations. diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest index 8a02025c775e..a85212c9bc77 100644 --- a/x11-base/xcb-proto/Manifest +++ b/x11-base/xcb-proto/Manifest @@ -1 +1,2 @@ -DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d +DIST xcb-proto-1.16.0.tar.xz 151612 BLAKE2B 1c59ae4c71e697bd4f0298f6e0ea5235fc47baa9cf584e079258f1da8be538d1b67dc45f1325d82495247d0f8020d0244ca334de3794b410a1feaceabd6b285e SHA512 54906f379a7aa2cbbfbbe54764c02dbf522ca8f6c54e07d4faae471aac3aee25d0359be38c808c8da887de228aed745582a78b2f56714b023bca8f3513b24972 +DIST xcb-proto-1.17.0.tar.xz 151748 BLAKE2B 0f46d040062fca4f6b598bdb7ab7a254b9aefce198812af82fd2112e06e88277e3c9e0a3bab161930b56688e71e1848bb859d4f33588f9496fe7399f9758b9a7 SHA512 34c3795e5a48a66d89b72ee1777fb0bede489d5ec07018e6c9ef3c13bdd60b0358fc2c04a1f0ed0acb5b681aeeb92033db579036e4f5edd967fe56714c03acdf diff --git a/x11-base/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml index e943b72b8a48..161789742636 100644 --- a/x11-base/xcb-proto/metadata.xml +++ b/x11-base/xcb-proto/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/proto/xcbproto</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.16.0.ebuild index e7aaddbcc928..1c96c02f2a48 100644 --- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.16.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) XORG_TARBALL_SUFFIX="xz" XORG_MODULE=proto/ -XORG_MULTILIB=yes inherit python-r1 xorg-3 @@ -14,8 +13,7 @@ DESCRIPTION="X C-language Bindings protocol headers" HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto" EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" @@ -29,7 +27,7 @@ BDEPEND=" ECONF_SOURCE="${S}" -multilib_src_configure() { +src_configure() { # Don't use Python to find sitedir here. PYTHON=true default } @@ -44,8 +42,8 @@ xcbgen_install() { python_optimize } -multilib_src_install() { +src_install() { # Restrict SUBDIRS to prevent xcbgen with empty sitedir. emake install DESTDIR="${D}" SUBDIRS=src - multilib_is_native_abi && python_foreach_impl xcbgen_install + python_foreach_impl xcbgen_install } diff --git a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild new file mode 100644 index 000000000000..a7af99861180 --- /dev/null +++ b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +XORG_TARBALL_SUFFIX="xz" +XORG_MODULE=proto/ + +inherit python-r1 xorg-3 + +DESCRIPTION="X C-language Bindings protocol headers" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto" +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# DEPEND="" +RDEPEND=" + ${PYTHON_DEPS} +" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2 +" + +ECONF_SOURCE="${S}" + +src_configure() { + # Don't use Python to find sitedir here. + PYTHON=true default +} + +src_compile() { + : +} + +xcbgen_install() { + # Use eclass to find sitedir instead. + emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)" + python_optimize +} + +src_install() { + # Restrict SUBDIRS to prevent xcbgen with empty sitedir. + emake install DESTDIR="${D}" SUBDIRS=src + python_foreach_impl xcbgen_install +} diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-apps/metadata.xml index dfdafac06170..2a95a1e26c99 100644 --- a/x11-base/xorg-x11/metadata.xml +++ b/x11-base/xorg-apps/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>x11@gentoo.org</email> <name>X11</name> </maintainer> -<use> - <flag name="fonts">Install fonts from X.Org</flag> -</use> +<stabilize-allarches/> </pkgmetadata> diff --git a/x11-base/xorg-apps/xorg-apps-3.ebuild b/x11-base/xorg-apps/xorg-apps-3.ebuild new file mode 100644 index 000000000000..91ac15149b6c --- /dev/null +++ b/x11-base/xorg-apps/xorg-apps-3.ebuild @@ -0,0 +1,90 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="X11 Applications (meta package)" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86" + +RDEPEND=" + x11-apps/appres + x11-apps/bdftopcf + x11-apps/beforelight + x11-apps/bitmap + x11-apps/editres + x11-apps/fonttosfnt + x11-apps/fslsfonts + x11-apps/fstobdf + x11-apps/iceauth + x11-apps/ico + x11-apps/listres + x11-apps/luit + x11-apps/mkfontscale + x11-apps/oclock + x11-apps/rgb + x11-apps/rstart + x11-apps/sessreg + x11-apps/setxkbmap + x11-apps/showfont + x11-apps/smproxy + x11-apps/transset + x11-apps/viewres + x11-apps/x11perf + x11-apps/xauth + x11-apps/xbacklight + x11-apps/xbiff + x11-apps/xcalc + x11-apps/xclipboard + x11-apps/xclock + x11-apps/xcmsdb + x11-apps/xconsole + x11-apps/xcursorgen + x11-apps/xditview + x11-apps/xdm + x11-apps/xdpyinfo + x11-apps/xdriinfo + x11-apps/xedit + x11-apps/xev + x11-apps/xeyes + x11-apps/xfd + x11-apps/xfontsel + x11-apps/xgamma + x11-apps/xgc + x11-apps/xhost + x11-apps/xinit + x11-apps/xinput + x11-apps/xkbcomp + x11-apps/xkbevd + x11-apps/xkbprint + x11-apps/xkbutils + x11-apps/xkill + x11-apps/xload + x11-apps/xlogo + x11-apps/xlsatoms + x11-apps/xlsclients + x11-apps/xlsfonts + x11-apps/xmag + x11-apps/xman + x11-apps/xmessage + x11-apps/xmodmap + x11-apps/xmore + x11-apps/xpr + x11-apps/xprop + x11-apps/xrandr + x11-apps/xrdb + x11-apps/xrefresh + x11-apps/xrestop + x11-apps/xset + x11-apps/xsetroot + x11-apps/xsm + x11-apps/xstdcmap + x11-apps/xvidtune + x11-apps/xvinfo + x11-apps/xwd + x11-apps/xwininfo + x11-apps/xwud +" diff --git a/x11-base/xorg-drivers/metadata.xml b/x11-base/xorg-drivers/metadata.xml index 7a7bbf810544..6bbd73893d34 100644 --- a/x11-base/xorg-drivers/metadata.xml +++ b/x11-base/xorg-drivers/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>x11@gentoo.org</email> diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild index 2c489dbcbd66..6067e4899959 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,9 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" if [[ ${PV} != 9999 ]]; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +else + PROPERTIES+=" live" fi IUSE_INPUT_DEVICES=" @@ -30,13 +32,10 @@ IUSE_VIDEO_CARDS=" video_cards_fbdev video_cards_freedreno video_cards_geode - video_cards_glint video_cards_i915 - video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau - video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 @@ -76,13 +75,10 @@ PDEPEND=" video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) - video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] ) - video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) + video_cards_intel? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) - video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild index 99c7a47b95a4..39acd9f15195 100644 --- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" if [[ ${PV} != 9999 ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" else PROPERTIES+=" live" fi @@ -32,13 +32,10 @@ IUSE_VIDEO_CARDS=" video_cards_fbdev video_cards_freedreno video_cards_geode - video_cards_glint video_cards_i915 - video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau - video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 @@ -78,13 +75,10 @@ PDEPEND=" video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) - video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] ) - video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) + video_cards_intel? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) - video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) diff --git a/x11-base/xorg-fonts/metadata.xml b/x11-base/xorg-fonts/metadata.xml new file mode 100644 index 000000000000..2a95a1e26c99 --- /dev/null +++ b/x11-base/xorg-fonts/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> +</maintainer> +<stabilize-allarches/> +</pkgmetadata> diff --git a/x11-base/xorg-fonts/xorg-fonts-3.ebuild b/x11-base/xorg-fonts/xorg-fonts-3.ebuild new file mode 100644 index 000000000000..61e3695b1787 --- /dev/null +++ b/x11-base/xorg-fonts/xorg-fonts-3.ebuild @@ -0,0 +1,53 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="X11 fonts (meta package)" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" + +RDEPEND=" + media-fonts/font-adobe-100dpi + media-fonts/font-adobe-75dpi + media-fonts/font-adobe-utopia-100dpi + media-fonts/font-adobe-utopia-75dpi + media-fonts/font-adobe-utopia-type1 + media-fonts/font-arabic-misc + media-fonts/font-bh-100dpi + media-fonts/font-bh-75dpi + media-fonts/font-bh-lucidatypewriter-100dpi + media-fonts/font-bh-lucidatypewriter-75dpi + media-fonts/font-bitstream-100dpi + media-fonts/font-bitstream-75dpi + media-fonts/font-bitstream-type1 + media-fonts/font-cronyx-cyrillic + media-fonts/font-cursor-misc + media-fonts/font-daewoo-misc + media-fonts/font-dec-misc + media-fonts/font-ibm-type1 + media-fonts/font-isas-misc + media-fonts/font-jis-misc + media-fonts/font-micro-misc + media-fonts/font-misc-cyrillic + media-fonts/font-misc-ethiopic + media-fonts/font-misc-meltho + media-fonts/font-misc-misc + media-fonts/font-mutt-misc + media-fonts/font-schumacher-misc + media-fonts/font-screen-cyrillic + media-fonts/font-sony-misc + media-fonts/font-sun-misc + media-fonts/font-winitzki-cyrillic + media-fonts/font-xfree86-type1 +" + +pkg_postinst() { + optfeature "Bigelow & Holmes Luxi fonts (non-free)" \ + media-fonts/font-bh-ttf media-fonts/font-bh-type1 +} diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest index 8099f9085036..564e71193cf4 100644 --- a/x11-base/xorg-proto/Manifest +++ b/x11-base/xorg-proto/Manifest @@ -1,3 +1,2 @@ -DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9 -DIST xorgproto-2021.3.tar.gz 1130599 BLAKE2B 21aa84621984cd2635871c059ecbfe2c6290c74a3569f15cdce6080dd7e4106726ae9338112c075c8f64332ecb555a4ccb666bd7bf7e9bb1156b4591e5f37908 SHA512 0c2610551cc180b619611e0ad344e1a01cb0e5e83b3c8643cd6dbe19d8acc3a22e7c1522855923159dd753e4458c9f2d65b709bb045b27e17b83aa8c264e3d5a -DIST xorgproto-2021.4.tar.gz 1141941 BLAKE2B 016a3c2f30ed064855de2a13d86a4b7bc9420ff10e8ac3ba97e08512fef6f0495a69dcaea7f12c7d8694a52284b500a38aee73de7bf2ff0a295715354d04eab0 SHA512 5f4c94d3ee20635f2358d7644be54d5e291bafba15a7713583acbb3564c2799da4ba33ffba625273fe015e4ab733cbaec146467804fd2174eb5fd1ff3bf21019 +DIST xorgproto-2023.2.tar.xz 759040 BLAKE2B ff255b91770ad11cdcc48d12815317285d8d16d28011a86166f3e07af18b30fdf35c2eb7b6537504eb4c0e9ca65b3116493422b6faebe04ee80e6aee92387675 SHA512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d +DIST xorgproto-2024.1.tar.xz 760500 BLAKE2B a3850f8594e8b4240f731dce696c3ab8310c3b2419117dea3141a093a690d9bc16652e64eb5516073145309c65327bd14be2eaa8843c04de25c8eff6c46d3c1d SHA512 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f diff --git a/x11-base/xorg-proto/metadata.xml b/x11-base/xorg-proto/metadata.xml index e943b72b8a48..403bdb59286e 100644 --- a/x11-base/xorg-proto/metadata.xml +++ b/x11-base/xorg-proto/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/proto/xorgproto</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild deleted file mode 100644 index 60b24a0bb11a..000000000000 --- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/xorg-/xorg}" -MY_P="${MY_PN}-${PV}" - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson - -DESCRIPTION="X.Org combined protocol headers" -HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" diff --git a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild b/x11-base/xorg-proto/xorg-proto-2023.2.ebuild index 3544d1e5d5eb..96350710c41b 100644 --- a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2023.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) MY_PN="${PN/xorg-/xorg}" MY_P="${MY_PN}-${PV}" @@ -20,8 +20,8 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi @@ -30,17 +30,16 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( $(python_gen_any_dep ' - dev-python/python-libevdev[${PYTHON_USEDEP}] + dev-python/libevdev[${PYTHON_USEDEP}] ') ) " -RDEPEND="" python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" + python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/x11-base/xorg-proto/xorg-proto-2021.3.ebuild b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild index 2c391aa1de4d..980d24c44384 100644 --- a/x11-base/xorg-proto/xorg-proto-2021.3.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) MY_PN="${PN/xorg-/xorg}" MY_P="${MY_PN}-${PV}" @@ -17,11 +17,9 @@ inherit ${GIT_ECLASS} meson python-any-r1 DESCRIPTION="X.Org combined protocol headers" HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi @@ -30,19 +28,24 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( $(python_gen_any_dep ' - dev-python/python-libevdev[${PYTHON_USEDEP}] + dev-python/libevdev[${PYTHON_USEDEP}] ') ) " -RDEPEND="" python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" + python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]" } pkg_setup() { use test && python-any-r1_pkg_setup } + +src_install() { + meson_src_install + + mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die +} diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild index 3544d1e5d5eb..980d24c44384 100644 --- a/x11-base/xorg-proto/xorg-proto-9999.ebuild +++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) MY_PN="${PN/xorg-/xorg}" MY_P="${MY_PN}-${PV}" @@ -17,11 +17,9 @@ inherit ${GIT_ECLASS} meson python-any-r1 DESCRIPTION="X.Org combined protocol headers" HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi @@ -30,17 +28,16 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( $(python_gen_any_dep ' - dev-python/python-libevdev[${PYTHON_USEDEP}] + dev-python/libevdev[${PYTHON_USEDEP}] ') ) " -RDEPEND="" python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" + python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index fad1256833d4..08011c7bda68 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 +DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch b/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch new file mode 100644 index 000000000000..12a48e611329 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/885763 +https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1114 +https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1222 +https://gitlab.freedesktop.org/xorg/xserver/-/commit/34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7 + +From f3cb68d274c4536130683d28182620fbbf1b287d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 13 Apr 2023 15:45:58 +0200 +Subject: [PATCH] fb: Declare wfbFinishScreenInit, wfbScreenInit for + !FB_ACCESS_WRAPPER + +xf86-video-nouveau calls wfbScreenInit without defining +FB_ACCESS_WRAPPER (which has other unintended side effects). +Presently, this compiles and links because compilers still support +implicit function declarations, but this is going to change fairly +soon. This seems to be the most straightforward change to keep +the driver building. + +(cherry picked from commit 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7) +--- a/fb/fb.h ++++ b/fb/fb.h +@@ -1027,7 +1027,6 @@ extern _X_EXPORT Bool + int dpiy, int width, /* pixel width of frame buffer */ + int bpp); /* bits per pixel of frame buffer */ + +-#ifdef FB_ACCESS_WRAPPER + extern _X_EXPORT Bool + wfbFinishScreenInit(ScreenPtr pScreen, + void *pbits, +@@ -1049,7 +1048,6 @@ wfbScreenInit(ScreenPtr pScreen, + int width, + int bpp, + SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap); +-#endif + + extern _X_EXPORT Bool + fbFinishScreenInit(ScreenPtr pScreen, +-- +GitLab diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index 30e7cd9f41e0..b88ab959a211 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -1,22 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<use> - <flag name="dmx">Build the Distributed Multiheaded X server</flag> - <flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag> - <flag name="kdrive">Build the kdrive X servers</flag> - <flag name="unwind">Enable libunwind usage for backtraces</flag> - <flag name="xcsecurity">Build Security extension</flag> - <flag name="xephyr">Build the Xephyr server</flag> - <flag name="xnest">Build the Xnest server</flag> - <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag> - <flag name="xvfb">Build the Xvfb server</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id> -</upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag> + <flag name="unwind">Enable libunwind usage for backtraces</flag> + <flag name="xcsecurity">Build Security extension</flag> + <flag name="xephyr">Build the Xephyr server</flag> + <flag name="xnest">Build the Xnest server</flag> + <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag> + <flag name="xvfb">Build the Xvfb server</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id> + <remote-id type="freedesktop-gitlab">xorg/xserver</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild b/x11-base/xorg-server/xorg-server-1.20.11.ebuild deleted file mode 100644 index 609ab534563e..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -inherit xorg-3 multilib flag-o-matic toolchain-funcs -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" -RESTRICT="!test? ( test )" - -CDEPEND=" - media-libs/libglvnd[X] - dev-libs/openssl:0= - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.89 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont2-2.0.1 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - xephyr? ( - x11-libs/libxcb[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18[X(+),egl,gbm] - >=media-libs/libepoxy-1.5.4[X,egl(+)] - ) - udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - >=media-libs/libepoxy-1.5.4[egl(+)] - >=dev-libs/wayland-protocols-1.18 - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - ) - elogind? ( - sys-apps/dbus - sys-auth/elogind[pam] - sys-auth/pambase[elogind] - ) - !!x11-drivers/nvidia-drivers[-libglvnd(+)] -" -DEPEND="${CDEPEND} - >=x11-base/xorg-proto-2018.4 - >=x11-libs/xtrans-1.3.5 - dmx? ( - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) -" -RDEPEND="${CDEPEND} - !systemd? ( gui-libs/display-manager-init ) - selinux? ( sec-policy/selinux-xserver ) -" -BDEPEND=" - sys-devel/flex - wayland? ( dev-util/wayland-scanner ) -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd ) - minimal? ( !wayland ) - xephyr? ( kdrive )" - -UPSTREAMED_PATCHES=( -) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch -) - -pkg_setup() { - if use wayland && use minimal; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - ewarn "Build with USE=-minimal to enable glamor." - fi -} - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating; and I have no idea if Gentoo - # package it somewhere - local XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable debug) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable test unit-tests) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glamor) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - CPP="$(tc-getPROG CPP cpp)" - ) - - if use systemd || use elogind; then - XORG_CONFIGURE_OPTIONS+=( - --enable-systemd-logind - --disable-install-setuid - $(use_enable suid suid-wrapper) - ) - else - XORG_CONFIGURE_OPTIONS+=( - --disable-systemd-logind - --disable-suid-wrapper - $(use_enable suid install-setuid) - ) - fi - - xorg-3_src_configure -} - -server_based_install() { - if ! use xorg; then - rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x || die - fi -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/hw/xfree86/xorg.conf.example - fi - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - find "${ED}"/var -type d -empty -delete || die -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} diff --git a/x11-base/xorg-server/xorg-server-21.1.13.ebuild b/x11-base/xorg-server/xorg-server-21.1.13.ebuild new file mode 100644 index 000000000000..aac526f8a150 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.13.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit flag-o-matic xorg-3 meson +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + dev-libs/libbsd + dev-libs/openssl:0= + >=x11-apps/iceauth-1.0.2 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.89 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + xorg? ( + >=x11-libs/libxcvt-0.1.0 + ) + xnest? ( + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libX11-1.1.5 + ) + xephyr? ( + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=media-libs/mesa-18[X(+),egl(+),gbm(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind[pam] + sys-auth/pambase[elogind] + ) + !!x11-drivers/nvidia-drivers[-libglvnd(+)] +" +DEPEND="${CDEPEND} + >=x11-base/xorg-proto-2021.4.99.2 + >=x11-libs/xtrans-1.3.5 + media-fonts/font-util + test? ( >=x11-libs/libxcvt-0.1.0 ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) + xorg? ( >=x11-apps/xinit-1.3.3-r1 ) +" +BDEPEND=" + app-alternatives/lex +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd )" + +UPSTREAMED_PATCHES=( +) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + # pending upstream backport, bug #885763 + "${FILESDIR}"/${PN}-21.1.10-c99.patch +) + +src_configure() { + # bug #835653 + use x86 && replace-flags -Os -O2 + + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + local emesonargs=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + -Dbuildtype=$(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use !minimal dri1) + $(meson_use !minimal dri2) + $(meson_use !minimal dri3) + $(meson_use !minimal glamor) + $(meson_use !minimal glx) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use selinux xselinux) + $(meson_use xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + -Ddocs=false + -Ddrm=true + -Ddtrace=false + -Dipv6=true + -Dhal=false + -Dlinux_acpi=false + -Dlinux_apm=false + -Dsecure-rpc=false + -Dsha1=libcrypto + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + ) + + if [[ ${PV} == 9999 ]] ; then + # Gone in 21.1.x, but not in master. + emesonargs+=( -Dxwayland=false ) + fi + + if use systemd || use elogind; then + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) + ) + else + emesonargs+=( + -Dsystemd_logind=false + -Dsuid_wrapper=false + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + # The meson build system does not support install-setuid + if ! use systemd && ! use elogind; then + if use suid; then + chmod u+s "${ED}"/usr/bin/Xorg + fi + fi + + if ! use xorg; then + rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x || die + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 1b2a33ee9084..61e6018a1dfd 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -1,28 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -XORG_DOC=doc -XORG_EAUTORECONF="yes" -inherit xorg-3 multilib flag-o-matic toolchain-funcs +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit flag-o-matic xorg-3 meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" +IUSE_SERVERS="xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" RESTRICT="!test? ( test )" CDEPEND=" media-libs/libglvnd[X] + dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 @@ -35,25 +35,15 @@ CDEPEND=" >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 + xorg? ( + >=x11-libs/libxcvt-0.1.0 ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv + xnest? ( + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libX11-1.1.5 ) xephyr? ( - x11-libs/libxcb[xkb] + x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms @@ -61,19 +51,15 @@ CDEPEND=" x11-libs/xcb-util-wm ) !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18[X(+),egl,gbm] + >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - >=media-libs/libepoxy-1.5.4[egl(+)] - >=dev-libs/wayland-protocols-1.18 + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= ) - >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd @@ -86,25 +72,18 @@ CDEPEND=" !!x11-drivers/nvidia-drivers[-libglvnd(+)] " DEPEND="${CDEPEND} - >=x11-base/xorg-proto-2018.4 + >=x11-base/xorg-proto-2024.1 >=x11-libs/xtrans-1.3.5 - dmx? ( - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) + media-fonts/font-util + test? ( >=x11-libs/libxcvt-0.1.0 ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) + xorg? ( >=x11-apps/xinit-1.3.3-r1 ) " BDEPEND=" - sys-devel/flex - wayland? ( dev-util/wayland-scanner ) + app-alternatives/lex " PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" @@ -113,12 +92,7 @@ REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) elogind? ( udev ) - ?? ( elogind systemd ) - minimal? ( !wayland ) - xephyr? ( kdrive )" - -UPSTREAMED_PATCHES=( -) + ?? ( elogind systemd )" PATCHES=( "${UPSTREAMED_PATCHES[@]}" @@ -127,98 +101,85 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch ) -pkg_setup() { - if use wayland && use minimal; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - ewarn "Build with USE=-minimal to enable glamor." - fi -} - src_configure() { + # bug #835653 + use x86 && replace-flags -Os -O2 + + use debug && EMESON_BUILDTYPE=debug + # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating; and I have no idea if Gentoo - # package it somewhere - local XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable debug) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable test unit-tests) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glamor) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-sha1=libcrypto - CPP="$(tc-getPROG CPP cpp)" + local emesonargs=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + -Db_ndebug=$(usex debug false true) + $(meson_use !minimal dri1) + $(meson_use !minimal dri2) + $(meson_use !minimal dri3) + $(meson_use !minimal glamor) + $(meson_use !minimal glx) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use selinux xselinux) + $(meson_use xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + -Ddocs=false + -Ddrm=true + -Ddtrace=false + -Dipv6=true + -Dhal=false + -Dlinux_acpi=false + -Dlinux_apm=false + -Dsecure-rpc=false + -Dsha1=libcrypto + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" ) + if [[ ${PV} == 9999 ]] ; then + # Gone in 21.1.x, but not in master. + emesonargs+=( -Dxwayland=false ) + fi + if use systemd || use elogind; then - XORG_CONFIGURE_OPTIONS+=( - --enable-systemd-logind - --disable-install-setuid - $(use_enable suid suid-wrapper) + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) ) else - XORG_CONFIGURE_OPTIONS+=( - --disable-systemd-logind - --disable-suid-wrapper - $(use_enable suid install-setuid) + emesonargs+=( + -Dsystemd_logind=false + -Dsuid_wrapper=false ) fi - xorg-3_src_configure + meson_src_configure } -server_based_install() { +src_install() { + meson_src_install + + # The meson build system does not support install-setuid + if ! use systemd && ! use elogind; then + if use suid; then + chmod u+s "${ED}"/usr/bin/Xorg + fi + fi + if ! use xorg; then rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ "${ED}"/usr/share/man/man1/Xserver.1x || die fi -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/hw/xfree86/xorg.conf.example - fi # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - find "${ED}"/var -type d -empty -delete || die } pkg_postrm() { diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest new file mode 100644 index 000000000000..679bd1348e77 --- /dev/null +++ b/x11-base/xorg-sgml-doctools/Manifest @@ -0,0 +1 @@ +DIST xorg-sgml-doctools-1.12.1.tar.xz 107832 BLAKE2B 5fc7b3e1b02cb650655831196c26cd1ec9f2b3b8ef32cecc2d4657a0358bc23a7e2be2bfbcbfc2a400cfbc821f4602279655c8e31968c5f3f41be15e560799a3 SHA512 82a202a97da4d705d70e3a1865c5cc47f1007d32a239513f52e6e63912ce0363fbeafabbec36ad008d3f7df15f03c27a4f004e9b1da93eed0f7e5b3f27f7c4cf diff --git a/x11-base/xorg-sgml-doctools/metadata.xml b/x11-base/xorg-sgml-doctools/metadata.xml new file mode 100644 index 000000000000..6e09f0a3025a --- /dev/null +++ b/x11-base/xorg-sgml-doctools/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/doc/xorg-sgml-doctools</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild new file mode 100644 index 000000000000..499510876bf0 --- /dev/null +++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MODULE=doc/ +XORG_TARBALL_SUFFIX="xz" + +inherit xorg-3 + +DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND="x11-misc/util-macros" +# RDEPEND="" diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild deleted file mode 100644 index b35879117473..000000000000 --- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" -HOMEPAGE="https://www.x.org/wiki/" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="+fonts" - -# Server -RDEPEND="${RDEPEND} - x11-base/xorg-server[-minimal]" - -# Applications -RDEPEND="${RDEPEND} - x11-apps/appres - x11-apps/bitmap - x11-apps/iceauth - x11-apps/luit - >=x11-apps/mkfontscale-1.2.0 - x11-apps/sessreg - x11-apps/setxkbmap - x11-apps/smproxy - x11-apps/x11perf - x11-apps/xauth - || ( x11-apps/xbacklight sys-power/acpilight ) - x11-apps/xcmsdb - x11-apps/xcursorgen - x11-apps/xdpyinfo - x11-apps/xdriinfo - x11-apps/xev - x11-apps/xf86dga - x11-apps/xgamma - x11-apps/xhost - x11-apps/xinput - x11-apps/xkbcomp - x11-apps/xkbevd - x11-apps/xkbutils - x11-apps/xkill - x11-apps/xlsatoms - x11-apps/xlsclients - x11-apps/xmodmap - x11-apps/xpr - x11-apps/xprop - x11-apps/xrandr - x11-apps/xrdb - x11-apps/xrefresh - x11-apps/xset - x11-apps/xsetroot - x11-apps/xvinfo - x11-apps/xwd - x11-apps/xwininfo - x11-apps/xwud - " - -# Data -RDEPEND="${RDEPEND} - x11-misc/xbitmaps - x11-themes/xcursor-themes - " - -# Utilities -RDEPEND="${RDEPEND} - x11-misc/makedepend - x11-misc/util-macros - " - -# Fonts -RDEPEND="${RDEPEND} - fonts? ( - media-fonts/font-adobe-100dpi - media-fonts/font-adobe-75dpi - media-fonts/font-adobe-utopia-100dpi - media-fonts/font-adobe-utopia-75dpi - media-fonts/font-adobe-utopia-type1 - media-fonts/font-alias - media-fonts/font-arabic-misc - media-fonts/font-bh-100dpi - media-fonts/font-bh-75dpi - media-fonts/font-bh-lucidatypewriter-100dpi - media-fonts/font-bh-lucidatypewriter-75dpi - media-fonts/font-bh-ttf - media-fonts/font-bh-type1 - media-fonts/font-bitstream-100dpi - media-fonts/font-bitstream-75dpi - media-fonts/font-bitstream-speedo - media-fonts/font-bitstream-type1 - media-fonts/font-cronyx-cyrillic - media-fonts/font-cursor-misc - media-fonts/font-daewoo-misc - media-fonts/font-dec-misc - media-fonts/font-ibm-type1 - media-fonts/font-isas-misc - media-fonts/font-jis-misc - media-fonts/font-micro-misc - media-fonts/font-misc-cyrillic - media-fonts/font-misc-ethiopic - media-fonts/font-misc-meltho - media-fonts/font-misc-misc - media-fonts/font-mutt-misc - media-fonts/font-schumacher-misc - media-fonts/font-screen-cyrillic - media-fonts/font-sony-misc - media-fonts/font-sun-misc - media-fonts/font-util - media-fonts/font-winitzki-cyrillic - media-fonts/font-xfree86-type1 - - media-fonts/font-alias - media-fonts/font-util - media-fonts/encodings - ) - " - -DEPEND="${RDEPEND}" - -pkg_postinst() { - elog - elog "Please note that the xcursors are in ${EROOT%/}/usr/share/cursors/${PN}." - elog "Any custom cursor sets should be placed in that directory." - elog - elog "If you wish to set system-wide default cursors, please create" - elog "${EROOT%/}/usr/local/share/cursors/${PN}/default/index.theme" - elog "with content: \"Inherits=theme_name\" so that future" - elog "emerges will not overwrite those settings." - elog - elog "Listening on TCP is disabled by default with startx." - elog "To enable it, edit ${EROOT%/}/usr/bin/startx." - elog - - elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org" - elog "for more information on configuring X." - elog -} diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest new file mode 100644 index 000000000000..9a54f9414d06 --- /dev/null +++ b/x11-base/xwayland/Manifest @@ -0,0 +1,3 @@ +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.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/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/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch new file mode 100644 index 000000000000..39e0548eaaa3 --- /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/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..11c9bed1e235 --- /dev/null +++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch @@ -0,0 +1,27 @@ +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/metadata.xml b/x11-base/xwayland/metadata.xml new file mode 100644 index 000000000000..1c6df10259d6 --- /dev/null +++ b/x11-base/xwayland/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://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="libei">Enable emulated input using <pkg>dev-libs/libei</pkg></flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id> + <remote-id type="freedesktop-gitlab">xorg/xserver</remote-id> + </upstream> +</pkgmetadata> 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 +} diff --git a/x11-base/xwayland/xwayland-23.2.4.ebuild b/x11-base/xwayland/xwayland-23.2.4.ebuild new file mode 100644 index 000000000000..6c2c9edce4d9 --- /dev/null +++ b/x11-base/xwayland/xwayland-23.2.4.ebuild @@ -0,0 +1,112 @@ +# 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 new file mode 100644 index 000000000000..c41f16ee5928 --- /dev/null +++ b/x11-base/xwayland/xwayland-23.2.5.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" + +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 +} diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild new file mode 100644 index 000000000000..70cb8d652e2a --- /dev/null +++ b/x11-base/xwayland/xwayland-23.2.6.ebuild @@ -0,0 +1,112 @@ +# 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 +) + +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-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild new file mode 100644 index 000000000000..4c325088c840 --- /dev/null +++ b/x11-base/xwayland/xwayland-9999.ebuild @@ -0,0 +1,111 @@ +# 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 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 ) + unwind? ( sys-libs/libunwind ) +" +DEPEND=" + ${COMMON_DEPEND} + >=x11-base/xorg-proto-2024.1 + >=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_v2.patch +) + +src_configure() { + local emesonargs=( + $(meson_use selinux xselinux) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + -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 + -Dxorg=false + -Dxnest=false + -Dxvfb=false + -Dxwayland=true + ) + + 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 +} |