diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-04 02:14:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-04 02:14:42 +0100 |
commit | ba32ac7204934e0c69e1cc7529edce6efdbeb265 (patch) | |
tree | 79dbf15bc5803a13e0c015970a4df6e506d14205 /x11-base/xorg-server | |
parent | 56ef021c58088c79bc71257eb348ff6decc47607 (diff) |
gentoo auto-resync : 04:04:2024 - 02:14:41
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.12.ebuild | 194 |
2 files changed, 196 insertions, 0 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 89735d4ced49..b9224e53f832 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -3,6 +3,8 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66e7532798bcd9bd5c43498afb09adfeb1d2238a0157add2e4f9ad49d5f00a80c1acb41001b08ccb509dd2da614276da6 SHA512 d5e5c33834966599df376d0ad3a425f4b56dc4dcc2ca549731dfcc1acfb3e20cf30644586daf590be90357e03d323f7d7d9e2efa8dff6a748a2ce0e1249b6bd3 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-21.1.11.tar.xz 4985464 BLAKE2B 0a18840979bb8b20b02eca9d737f20ddcf92a4771386074c38692df8a1c9b0f471af2211f3006f845ad0dd887b3844b7e7aac761bc12fc4e4177f1ada32ec503 SHA512 ad5edacbe8c7e2ebe6b4a690af94c7ea5ebc781d00b0e58ae2d273c78ceee2fa00b86d10479ad69da1b3233490619bae5a33db64c967c24bbfc5d5d39ddce1cb +DIST xorg-server-21.1.12.tar.xz 4957972 BLAKE2B 405354829494907c8d01b53e90b36b6e242dec65d0befb6850bfad40050b15c0fe986c33bc60082db8145d4bb961fd5611c25e1398c53d7bb41b606371a25773 SHA512 4c58bd5619be87dc52318c3719e8a05803835a96500bbd207b9fc056846f4473773a5dcb7ae96d8fdd3c9fe320f94e0136c8e8b2fc42a2064a947f5d48861054 EBUILD xorg-server-21.1.11.ebuild 4597 BLAKE2B 64f058ab6c0c2c37fdea3db9e1a7ec986294b4097ce6cfaffa34e55fe990c752885f5f361bc45699db649f6f533cb7784cef1e26a4730f7010220ebccaac52ee SHA512 32b6b238c87a75bbc77a7d7a7e3591189a903be9e9a27f8d2a20389ea3e02caeb253b5d00bfe7740268b4d656c662997b4f9c8016f63b526f7c8ffd63c236fb0 +EBUILD xorg-server-21.1.12.ebuild 4605 BLAKE2B 268de94b09f669881cbdb2c912ec5057f93f38db19f9a5b5c77c560f1ca5dd390ad5b77c58d1d1ffb3af98aea8948dc7cdb5d262c49ab00f7ad299e64a97578d SHA512 cb6e751dd2c758ef5593cb660a871062b1f50ffe7a1c0e888e29ab1c59d5bc13234a6fc16d9cdbb8adb471e2109305e51b0534828b762a243867a027d32fa8d2 EBUILD xorg-server-9999.ebuild 4500 BLAKE2B 9da6ff21d4fda43ae003ec41b156e1fcbbcb9738a9ae6c6525c400614a1b4f969c5ace8616a8c7aaeac25651cd7cca2cb50e429f2390059ec7cd8d44ac13b7f7 SHA512 22b2a2144af11d0d7166114bbeff036cb7b1c9a7650b7eb52a81267cdfe6f8d8e067ab26ec2df6bc8c0d363af0362c1cc1c1a0eb8b56b0d12058d20bd4751770 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90 diff --git a/x11-base/xorg-server/xorg-server-21.1.12.ebuild b/x11-base/xorg-server/xorg-server-21.1.12.ebuild new file mode 100644 index 000000000000..df261324220f --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.12.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 +} |