commit: d79b2d4b8afe72c02518708d428ec96fe80b3dd1 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Nov 6 01:18:05 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Nov 6 01:21:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79b2d4b
x11-base/xorg-server: Drop old versions Bug: https://bugs.gentoo.org/942465 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-base/xorg-server/Manifest | 1 - .../files/xorg-server-21.1.10-fix-c99-32bit.patch | 54 ------ x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild | 197 --------------------- 3 files changed, 252 deletions(-) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 4567ea113627..fdfcb3be88cf 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,2 +1 @@ -DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch b/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch deleted file mode 100644 index 40afef18cead..000000000000 --- a/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/925876 -https://gitlab.freedesktop.org/xorg/xserver/-/commit/e89edec497bac581ca9b614fb00c25365580f045 - -From e89edec497bac581ca9b614fb00c25365580f045 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <[email protected]> -Date: Fri, 19 Jan 2024 13:05:51 +0100 -Subject: [PATCH] ephyr: Fix incompatible pointer type build error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix a compilation error on 32 bits architectures with gcc 14: - - ephyr_glamor_xv.c: In function ‘ephyr_glamor_xv_init’: - ephyr_glamor_xv.c:154:31: error: assignment to ‘SetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int, void *)’} [-Wincompatible-pointer-types] - 154 | adaptor->SetPortAttribute = ephyr_glamor_xv_set_port_attribute; - | ^ - ephyr_glamor_xv.c:155:31: error: assignment to ‘GetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int *, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32 *, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int *, void *)’} [-Wincompatible-pointer-types] - 155 | adaptor->GetPortAttribute = ephyr_glamor_xv_get_port_attribute; - | ^ - -Build error logs: -https://koji.fedoraproject.org/koji/taskinfo?taskID=111964273 - -Signed-off-by: José Expósito <[email protected]> ---- - hw/kdrive/ephyr/ephyr_glamor_xv.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c -index 4dd15cf41..b5eae48c8 100644 ---- a/hw/kdrive/ephyr/ephyr_glamor_xv.c -+++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c -@@ -50,16 +50,16 @@ ephyr_glamor_xv_stop_video(KdScreenInfo *screen, void *data, Bool cleanup) - - static int - ephyr_glamor_xv_set_port_attribute(KdScreenInfo *screen, -- Atom attribute, INT32 value, void *data) -+ Atom attribute, int value, void *data) - { -- return glamor_xv_set_port_attribute(data, attribute, value); -+ return glamor_xv_set_port_attribute(data, attribute, (INT32)value); - } - - static int - ephyr_glamor_xv_get_port_attribute(KdScreenInfo *screen, -- Atom attribute, INT32 *value, void *data) -+ Atom attribute, int *value, void *data) - { -- return glamor_xv_get_port_attribute(data, attribute, value); -+ return glamor_xv_get_port_attribute(data, attribute, (INT32 *)value); - } - - static void diff --git a/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild deleted file mode 100644 index 16599d733bf8..000000000000 --- a/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# 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 ~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 - # backport of upstream commit, bug #925876 - "${FILESDIR}"/${PN}-21.1.10-fix-c99-32bit.patch -) - -src_configure() { - # bug #835653 - use x86 && replace-flags -Os -O2 - use x86 && replace-flags -Oz -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 -}
