diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/Manifest.gz | bin | 1050 -> 1053 bytes | |||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 3 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.0.ebuild | 221 |
4 files changed, 0 insertions, 448 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz Binary files differindex b02147e23677..356de0a04a21 100644 --- a/x11-base/Manifest.gz +++ b/x11-base/Manifest.gz diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 6187576ec29b..ee3ffc37f2f0 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -5,13 +5,10 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168 AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch 1555 BLAKE2B ef0a52b2341939f254bdce6b705f0591d0888c8043e5c0da1c4c4e97cdac632c56b27392ac2d7ac63653c7dfe1d381edd619a5e0c1c78f3bf255348c99c30f24 SHA512 66cd27608019557029f15aa81cf1a067e124ec0f854af9e732fef8b12bade4f1797481c86de2437b63ec5364fbeb1e3e05a39aa08df71ad08df79cd7d244e280 -AUX xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch 8053 BLAKE2B a6acfbdddc8a4114856ed8bfb7cf215f47e5c3ca9c58d539b9e5affb760cab7c61979e2252d2aba4fc138ac29078b8aa03fe83539aca54044b19b828c88ac472 SHA512 ad46621216f9a8c2b4ac044e02bac528df8696ee203d32310ac6665a519d36c98936f2f1c3598afc269e95ecf68e256f62faba9ab087abbe50aed2faff9d458a AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 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 EBUILD xorg-server-1.19.5-r2.ebuild 5766 BLAKE2B 87a961606f85b4c83d9eaebc9cac3ab8d650bf27a204a74f847459996c6cd51c28b94f5ee91bcee549e06a07aa260bf132609a60be733ddc5b51759d111aef4b SHA512 d63b8c99b046240476c93559fb9b672f0214db117c82e05130413b1751e57a43babdc366c7ec9ff0d9db9d08a3b1aa7493da7a6e3e9a73d531722374067b6dd6 -EBUILD xorg-server-1.20.0.ebuild 5615 BLAKE2B ddb0154b4300b05d404dc349351a25d92b2cf5e6c967b2c9df8532489cf76790609619e29dde927a4f6a0db34c4154c194a151622e6ed429ced8b61a733aa0a5 SHA512 7c3f57a4404ca97ad26a607e8446b36ed69fb69eb3e65a80f0146b326fdb3b50e1c5514e8ce49b600b402032d915e58fba762f4b6a454c6789ee02b93c394ef2 EBUILD xorg-server-1.20.1.ebuild 5522 BLAKE2B 7b66829d822ddff06e190d566871b7a9d915ae093264be4fd25ae5a4fd786f93394dee8e91132aef4b3faae88280e8cbd5786fd6efd658dadeeaa9c7a7fa8041 SHA512 e8a8fb57d5f527786cd6567d9f26f88de0bee3706e7da9a1c59f7d9fd4753db4ebb998288b7d3b663fc0f9869f8992db6615d3371c933f4a1b8f97913b348c4e EBUILD xorg-server-9999.ebuild 5527 BLAKE2B ec541ef3827abbdd2a7408df5f00b37692989f3225fd8fbe187bbdc5719a24aae8f6fec8537baffbb32ee3f394d4ce99540985a846109405297a27cdb70abc1d SHA512 011350ca9a119d266bb0a87e05b61c2c64344db1505aae3ed157d0815bf5559dad0cab0fecc6870c9fa58d3d39c93fde8b080345b75a5fec96b1b2992b59ab80 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac diff --git a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch deleted file mode 100644 index ebf677ae9c40..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch +++ /dev/null @@ -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 - diff --git a/x11-base/xorg-server/xorg-server-1.20.0.ebuild b/x11-base/xorg-server/xorg-server-1.20.0.ebuild deleted file mode 100644 index ec715ede7a29..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.0.ebuild +++ /dev/null @@ -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 -} |