mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-01 23:28:08 -07:00
x11-base/xorg-server: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner
@@ -1,3 +1,2 @@
|
||||
DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
|
||||
DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
|
||||
DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
|
||||
|
||||
@@ -1,224 +0,0 @@
|
||||
From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001
|
||||
From: Matt Turner <mattst88@gmail.com>
|
||||
Date: Tue, 22 May 2018 21:10:55 -0700
|
||||
Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on
|
||||
alpha
|
||||
|
||||
In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we
|
||||
somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the
|
||||
function pointer indirection was intended to support dense vs sparse and
|
||||
sparse support is now gone, we can just make the functions static inline
|
||||
in compiler.h and avoid all of this.
|
||||
|
||||
Bugzilla: https://bugs.gentoo.org/548906
|
||||
Tested-by: Christopher May-Townsend <chris@maytownsend.co.uk>
|
||||
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
||||
Signed-off-by: Matt Turner <mattst88@gmail.com>
|
||||
---
|
||||
configure.ac | 4 --
|
||||
hw/xfree86/common/compiler.h | 67 ++++++++++++++++++++++++---------
|
||||
hw/xfree86/os-support/bsd/Makefile.am | 3 +-
|
||||
hw/xfree86/os-support/linux/Makefile.am | 12 ------
|
||||
hw/xfree86/os-support/linux/lnx_video.c | 27 -------------
|
||||
hw/xfree86/os-support/meson.build | 1 -
|
||||
6 files changed, 50 insertions(+), 64 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ddc47faa2..0075b6ace 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then
|
||||
XORG_OS_SUBDIR="linux"
|
||||
linux_acpi="no"
|
||||
case $host_cpu in
|
||||
- alpha*)
|
||||
- linux_alpha=yes
|
||||
- ;;
|
||||
i*86|amd64*|x86_64*|ia64*)
|
||||
linux_acpi=$enable_linux_acpi
|
||||
;;
|
||||
@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
|
||||
AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
|
||||
AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
|
||||
AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
|
||||
-AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
|
||||
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
|
||||
AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
|
||||
AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
|
||||
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
|
||||
index eea29dfb5..7144c6a27 100644
|
||||
--- a/hw/xfree86/common/compiler.h
|
||||
+++ b/hw/xfree86/common/compiler.h
|
||||
@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port)
|
||||
#endif
|
||||
|
||||
#ifdef __alpha__
|
||||
-/* entry points for Mmio memory access routines */
|
||||
-extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);
|
||||
-extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
|
||||
-extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
|
||||
-extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
|
||||
-extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
|
||||
-extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long);
|
||||
+static inline int
|
||||
+xf86ReadMmio8(void *Base, unsigned long Offset)
|
||||
+{
|
||||
+ mem_barrier();
|
||||
+ return *(CARD8 *) ((unsigned long) Base + (Offset));
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+xf86ReadMmio16(void *Base, unsigned long Offset)
|
||||
+{
|
||||
+ mem_barrier();
|
||||
+ return *(CARD16 *) ((unsigned long) Base + (Offset));
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+xf86ReadMmio32(void *Base, unsigned long Offset)
|
||||
+{
|
||||
+ mem_barrier();
|
||||
+ return *(CARD32 *) ((unsigned long) Base + (Offset));
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+xf86WriteMmio8(int Value, void *Base, unsigned long Offset)
|
||||
+{
|
||||
+ write_mem_barrier();
|
||||
+ *(CARD8 *) ((unsigned long) Base + (Offset)) = Value;
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+xf86WriteMmio16(int Value, void *Base, unsigned long Offset)
|
||||
+{
|
||||
+ write_mem_barrier();
|
||||
+ *(CARD16 *) ((unsigned long) Base + (Offset)) = Value;
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+xf86WriteMmio32(int Value, void *Base, unsigned long Offset)
|
||||
+{
|
||||
+ write_mem_barrier();
|
||||
+ *(CARD32 *) ((unsigned long) Base + (Offset)) = Value;
|
||||
+}
|
||||
+
|
||||
extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *,
|
||||
int);
|
||||
extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
|
||||
|
||||
/* Some macros to hide the system dependencies for MMIO accesses */
|
||||
/* Changed to kill noise generated by gcc's -Wcast-align */
|
||||
-#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
|
||||
-#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
|
||||
-#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
|
||||
-
|
||||
-#define MMIO_OUT32(base, offset, val) \
|
||||
- do { \
|
||||
- write_mem_barrier(); \
|
||||
- *(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
|
||||
- } while (0)
|
||||
+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
|
||||
+#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)
|
||||
+#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
|
||||
|
||||
#define MMIO_OUT8(base, offset, val) \
|
||||
- (*xf86WriteMmio8)((CARD8)(val), base, offset)
|
||||
+ xf86WriteMmio8((CARD8)(val), base, offset)
|
||||
#define MMIO_OUT16(base, offset, val) \
|
||||
- (*xf86WriteMmio16)((CARD16)(val), base, offset)
|
||||
+ xf86WriteMmio16((CARD16)(val), base, offset)
|
||||
+#define MMIO_OUT32(base, offset, val) \
|
||||
+ xf86WriteMmio32((CARD32)(val), base, offset)
|
||||
|
||||
#elif defined(__powerpc__) || defined(__sparc__)
|
||||
/*
|
||||
diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
|
||||
index b01ea5bca..66ac83805 100644
|
||||
--- a/hw/xfree86/os-support/bsd/Makefile.am
|
||||
+++ b/hw/xfree86/os-support/bsd/Makefile.am
|
||||
@@ -26,8 +26,7 @@ endif
|
||||
if ALPHA_VIDEO
|
||||
# Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
|
||||
ARCH_SOURCES = \
|
||||
- alpha_video.c \
|
||||
- bsd_ev56.c
|
||||
+ alpha_video.c
|
||||
endif
|
||||
|
||||
if ARM_VIDEO
|
||||
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
|
||||
index 26e40bb93..9b4535b53 100644
|
||||
--- a/hw/xfree86/os-support/linux/Makefile.am
|
||||
+++ b/hw/xfree86/os-support/linux/Makefile.am
|
||||
@@ -1,13 +1,5 @@
|
||||
noinst_LTLIBRARIES = liblinux.la
|
||||
|
||||
-if LINUX_ALPHA
|
||||
-noinst_LTLIBRARIES += liblinuxev56.la
|
||||
-
|
||||
-liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
|
||||
-
|
||||
-liblinuxev56_la_SOURCES = lnx_ev56.c
|
||||
-endif
|
||||
-
|
||||
if LNXACPI
|
||||
ACPI_SRCS = lnx_acpi.c
|
||||
if !LNXAPM
|
||||
@@ -39,7 +31,3 @@ liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \
|
||||
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
|
||||
|
||||
AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
|
||||
-
|
||||
-if LINUX_ALPHA
|
||||
-liblinux_la_LIBADD = liblinuxev56.la
|
||||
-endif
|
||||
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
|
||||
index c09d71947..04e45092a 100644
|
||||
--- a/hw/xfree86/os-support/linux/lnx_video.c
|
||||
+++ b/hw/xfree86/os-support/linux/lnx_video.c
|
||||
@@ -166,30 +166,3 @@ xf86DisableIO(void)
|
||||
|
||||
ExtendedEnabled = FALSE;
|
||||
}
|
||||
-
|
||||
-#if defined (__alpha__)
|
||||
-
|
||||
-extern int readDense8(void *Base, register unsigned long Offset);
|
||||
-extern int readDense16(void *Base, register unsigned long Offset);
|
||||
-extern int readDense32(void *Base, register unsigned long Offset);
|
||||
-extern void
|
||||
- writeDense8(int Value, void *Base, register unsigned long Offset);
|
||||
-extern void
|
||||
- writeDense16(int Value, void *Base, register unsigned long Offset);
|
||||
-extern void
|
||||
- writeDense32(int Value, void *Base, register unsigned long Offset);
|
||||
-
|
||||
-void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
|
||||
- = writeDense8;
|
||||
-void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
|
||||
- = writeDense16;
|
||||
-void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
|
||||
- = writeDense32;
|
||||
-int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
|
||||
- = readDense8;
|
||||
-int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
|
||||
- = readDense16;
|
||||
-int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
|
||||
- = readDense32;
|
||||
-
|
||||
-#endif /* __alpha__ */
|
||||
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
|
||||
index 901422786..b6e5c975d 100644
|
||||
--- a/hw/xfree86/os-support/meson.build
|
||||
+++ b/hw/xfree86/os-support/meson.build
|
||||
@@ -100,7 +100,6 @@ elif host_machine.system().endswith('bsd')
|
||||
srcs_xorg_os_support += 'shared/ioperm_noop.c'
|
||||
elif host_machine.cpu_family() == 'alpha'
|
||||
srcs_xorg_os_support += 'bsd/alpha_video.c'
|
||||
- srcs_xorg_os_support += 'bsd/bsd_ev56.c'
|
||||
endif
|
||||
|
||||
if host_machine.system() == 'freebsd'
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@@ -1,221 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
XORG_EAUTORECONF=yes
|
||||
XORG_DOC=doc
|
||||
inherit xorg-2 multilib versionator flag-o-matic
|
||||
EGIT_REPO_URI="https://anongit.freedesktop.org/git/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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
|
||||
IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
|
||||
|
||||
CDEPEND=">=app-eselect/eselect-opengl-1.3.0
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl: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-libs/xtrans-1.3.5
|
||||
>=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
|
||||
)
|
||||
glamor? (
|
||||
media-libs/libepoxy[X]
|
||||
>=media-libs/mesa-10.3.4-r1[egl,gbm]
|
||||
!x11-libs/glamor
|
||||
)
|
||||
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-10.3.4-r1
|
||||
)
|
||||
udev? ( virtual/libudev:= )
|
||||
unwind? ( sys-libs/libunwind )
|
||||
wayland? (
|
||||
>=dev-libs/wayland-1.3.0
|
||||
media-libs/libepoxy
|
||||
>=dev-libs/wayland-protocols-1.1
|
||||
)
|
||||
>=x11-apps/xinit-1.3.3-r1
|
||||
systemd? (
|
||||
sys-apps/dbus
|
||||
sys-apps/systemd
|
||||
)"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
sys-devel/flex
|
||||
>=x11-base/xorg-proto-2018.3
|
||||
dmx? (
|
||||
doc? (
|
||||
|| (
|
||||
www-client/links
|
||||
www-client/lynx
|
||||
www-client/w3m
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-xserver )
|
||||
!x11-drivers/xf86-video-modesetting
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
|
||||
|
||||
REQUIRED_USE="!minimal? (
|
||||
|| ( ${IUSE_SERVERS} )
|
||||
)
|
||||
xephyr? ( kdrive )"
|
||||
|
||||
UPSTREAMED_PATCHES=(
|
||||
"${FILESDIR}"/${P}-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
|
||||
)
|
||||
|
||||
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_pretend() {
|
||||
# older gcc is not supported
|
||||
[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
|
||||
die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if use wayland && ! use glamor; then
|
||||
ewarn "glamor is necessary for acceleration under Xwayland."
|
||||
ewarn "Performance may be unacceptable without it."
|
||||
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
|
||||
XORG_CONFIGURE_OPTIONS=(
|
||||
$(use_enable ipv6)
|
||||
$(use_enable debug)
|
||||
$(use_enable dmx)
|
||||
$(use_enable glamor)
|
||||
$(use_enable kdrive)
|
||||
$(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 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)
|
||||
$(use_enable systemd systemd-logind)
|
||||
$(use_enable systemd suid-wrapper)
|
||||
$(use_enable !systemd install-setuid)
|
||||
--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
|
||||
)
|
||||
|
||||
xorg-2_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
xorg-2_src_install
|
||||
|
||||
server_based_install
|
||||
|
||||
if ! use minimal && use xorg; then
|
||||
# Install xorg.conf.example into docs
|
||||
dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
|
||||
newinitd "${FILESDIR}"/xdm.initd-11 xdm
|
||||
newconfd "${FILESDIR}"/xdm.confd-4 xdm
|
||||
|
||||
# install the @x11-module-rebuild set for Portage
|
||||
insinto /usr/share/portage/config/sets
|
||||
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
|
||||
eselect opengl set xorg-x11 --use-old
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
server_based_install() {
|
||||
if ! use xorg; then
|
||||
rm "${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
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user