summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Le <r0bertz@gentoo.org>2008-11-23 04:00:44 +0800
committerZhang Le <r0bertz@gentoo.org>2008-11-23 04:00:44 +0800
commitdaa287c17974630204a5a7ef6119693b6c887d33 (patch)
tree5177d12463a8ce45c7ad4bad2c0526c97afa94f2
parentadded libgcrypt-1.4.3-r1.ebuild, removed libgcrypt-1.4.1.ebuild (diff)
downloadloongson-daa287c17974630204a5a7ef6119693b6c887d33.tar.gz
loongson-daa287c17974630204a5a7ef6119693b6c887d33.tar.bz2
loongson-daa287c17974630204a5a7ef6119693b6c887d33.zip
added xorg-server-1.5.2.ebuild
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
-rw-r--r--x11-base/xorg-server/Manifest5
-rw-r--r--x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch19
-rw-r--r--x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch38
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch51
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.2.ebuild542
5 files changed, 655 insertions, 0 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f1f343e..73dba78 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -32,15 +32,20 @@ AUX 1.4-fix-xprint-link.patch 588 RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c
AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
+AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0bed70eabe6a2fa SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0
+AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
AUX xorg-server-1.4-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
+AUX xorg-server-1.5.2-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 RMD160 3981b8fbb19142c7944f59237cf57394337ec952 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
DIST MesaLib-7.0.2.tar.bz2 3353217 RMD160 3d471062b60889baef48a1a4596de6e32e1530cf SHA1 d16eaeb1d9d95d11d3b6d289b1ba87108b88da90 SHA256 9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
DIST xorg-server-1.4.0.90.tar.bz2 6315011 RMD160 181b3c682710265df3c6ed30e164be9290f1f39e SHA1 7c492ac32bd83b521f5c016e4728fccf9cba55db SHA256 b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe
+DIST xorg-server-1.5.2.tar.bz2 5615666 RMD160 a5693c99cf2b20a94c29cfd267a0bc27626d2914 SHA1 fc8b5ed20af34f504d55a004c35ebacbc603b339 SHA256 2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0
EBUILD xorg-server-1.4.0.90-r3.ebuild 19571 RMD160 2a18b5ff8b87141e0a6f06e3589d71e0a1f934dd SHA1 6fd1e7f78a2faefbc13f1ad5c3a8f77d121a458b SHA256 4f3375321e37883fa765105cbb7056f90e6d2d6e74d4ab06072a31d635618781
+EBUILD xorg-server-1.5.2.ebuild 16572 RMD160 53e584c824998cd0239798a127a9d24022dc5c39 SHA1 ab0495a47033920a5c695fef733d09b0fb739818 SHA256 9363086af0ef15b43503e69cfc9fc10b5fa4c411a7de81976e25b61a5effad39
MISC ChangeLog 46548 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed SHA1 c1c264afd91f7d13bd8c4cd5d8d03cc9327e1e14 SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
new file mode 100644
index 0000000..2d0f469
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
@@ -0,0 +1,19 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=235789
+2008-09-09 Martin von Gagern
+
+--- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h 2008-09-09 17:24:59.000000000 +0200
++++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h 2008-09-09 18:01:53.000000000 +0200
+@@ -67,6 +67,13 @@
+ #include "os.h"
+ #endif
+
++#ifndef IF_MASK
++#define IF_MASK X86_EFLAGS_IF
++#endif
++#ifndef IOPL_MASK
++#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ typedef unsigned char U8;
+ typedef unsigned short U16;
+ typedef unsigned int U32;
diff --git a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
new file mode 100644
index 0000000..ffb3e0d
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
@@ -0,0 +1,38 @@
+From 8918c50440de301887af8006f2dc72d64adf9f9c Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Sat, 18 Oct 2008 12:23:51 +0200
+Subject: [PATCH] force LC_ALL=C when running awk
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This bug was reported by a user trying to build the server with a
+Turkish locale (tr_TR). The problem is that the Turkish alphabet is
+latin-based, but not entirely similar. The bug comes from vesamodes
+which has "Interlaced", which is then converted to lowercase by
+modelines2c.awk. Execept that with a Turkish locale
+tolower("Interlaced") is not "interlaced" but "─▒nterlaced", which the
+rest of the script fails to understand.
+
+This patch forces LC_ALL=C when running the awk script to always get the
+intended latin en_US alphabet.
+---
+ hw/xfree86/common/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
+index 0f44075..723973a 100644
+--- a/hw/xfree86/common/Makefile.am
++++ b/hw/xfree86/common/Makefile.am
+@@ -24,7 +24,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
+ MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
+
+ xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
+- cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
++ cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
+
+ BUILT_SOURCES = xf86DefModeSet.c
+
+--
+1.6.0.2
+
diff --git a/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch
new file mode 100644
index 0000000..9c48b37
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch
@@ -0,0 +1,51 @@
+diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
+--- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
++++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
+@@ -44,6 +44,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 0x2000
++#elif defined(__mips__)
++#define SAREA_MAX 0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX 0x10000 /* 64kB */
+ #else
+diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
+--- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
++++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
+@@ -540,9 +540,10 @@
+ _X_EXPORT Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ int fd;
+ unsigned int ioBase_phys;
++ extern unsigned int IOPortBase;
+ #endif
+
+ if (ExtendedEnabled)
+@@ -569,7 +570,22 @@
+ #endif
+ }
+ close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
++#elif defined(__mips__)
++ fd = open("/dev/mem", O_RDWR);
++ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
++ 0x1fd00000);
++ if (IOPortBase == MAP_FAILED) {
++ xf86Msg(X_WARNING,
++ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
++ strerror(errno));
++ return FALSE;
++ }
++ close(fd);
++ xf86Msg(X_WARNING,
++ "xf86EnableIOPorts: map iobase (%x)\n",
++ IOPortBase);
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
+ if (ioperm(0, 1024, 1) || iopl(3)) {
+ if (errno == ENODEV)
+ ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
new file mode 100644
index 0000000..a8dddec
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
@@ -0,0 +1,542 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.8 2008/11/01 23:40:59 solar Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+SRC_URI="${SRC_URI}
+ http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE_INPUT_DEVICES="
+ input_devices_acecad
+ input_devices_aiptek
+ input_devices_calcomp
+ input_devices_citron
+ input_devices_digitaledge
+ input_devices_dmc
+ input_devices_dynapro
+ input_devices_elo2300
+ input_devices_elographics
+ input_devices_evdev
+ input_devices_fpit
+ input_devices_hyperpen
+ input_devices_jamstudio
+ input_devices_joystick
+ input_devices_keyboard
+ input_devices_magellan
+ input_devices_microtouch
+ input_devices_mouse
+ input_devices_mutouch
+ input_devices_palmax
+ input_devices_penmount
+ input_devices_spaceorb
+ input_devices_summa
+ input_devices_tek4957
+ input_devices_tslib
+ input_devices_ur98
+ input_devices_vmmouse
+ input_devices_void
+
+ input_devices_synaptics
+ input_devices_wacom"
+IUSE_VIDEO_CARDS="
+ video_cards_apm
+ video_cards_ark
+ video_cards_ast
+ video_cards_chips
+ video_cards_cirrus
+ video_cards_cyrix
+ video_cards_dummy
+ video_cards_epson
+ video_cards_fbdev
+ video_cards_geode
+ video_cards_glint
+ video_cards_i128
+ video_cards_i740
+ video_cards_intel
+ video_cards_impact
+ video_cards_imstt
+ video_cards_mach64
+ video_cards_mga
+ video_cards_neomagic
+ video_cards_newport
+ video_cards_nsc
+ video_cards_nv
+ video_cards_r128
+ video_cards_radeon
+ video_cards_radeonhd
+ video_cards_rendition
+ video_cards_s3
+ video_cards_s3virge
+ video_cards_savage
+ video_cards_siliconmotion
+ video_cards_sis
+ video_cards_sisusb
+ video_cards_sunbw2
+ video_cards_suncg14
+ video_cards_suncg3
+ video_cards_suncg6
+ video_cards_sunffb
+ video_cards_sunleo
+ video_cards_suntcx
+ video_cards_tdfx
+ video_cards_tga
+ video_cards_trident
+ video_cards_tseng
+ video_cards_v4l
+ video_cards_vermilion
+ video_cards_vesa
+ video_cards_vga
+ video_cards_via
+ video_cards_vmware
+ video_cards_voodoo
+ video_cards_xgi
+ video_cards_fglrx
+ video_cards_nvidia"
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_VIDEO_CARDS}
+ ${IUSE_INPUT_DEVICES}
+ ${IUSE_SERVERS}
+ 3dfx tslib
+ dri hal ipv6 minimal nptl sdl"
+RDEPEND="hal? ( sys-apps/hal )
+ tslib? ( x11-libs/tslib )
+ >=x11-libs/libXfont-1.3.3
+ >=x11-libs/xtrans-1.2.2
+ >=x11-libs/libXau-1.0.4
+ >=x11-libs/libXext-1.0.4
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libxkbfile-1.0.4
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXmu-1.0.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/pixman-0.12
+ media-libs/freetype
+ >=media-libs/mesa-7.1
+ media-fonts/font-adobe-75dpi
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc
+ >=x11-misc/xbitmaps-1.0.1
+ >=x11-misc/xkeyboard-config-1.3
+ >=x11-apps/iceauth-1.0.2
+ >=x11-apps/rgb-1.0.3
+ >=x11-apps/xauth-1.0.3
+ >=x11-apps/xinit-1.0.8-r3
+ app-admin/eselect-opengl
+ >=x11-libs/libXaw-1.0.4
+ >=x11-libs/libXpm-3.5.7
+ >=x11-libs/libXxf86misc-1.0.1
+ >=x11-libs/libXxf86vm-1.0.2
+ >=x11-libs/libpciaccess-0.10.3
+ dmx? ( >=x11-libs/libdmx-1.0.2
+ >=x11-libs/libXfixes-4.0.3 )
+ !minimal? ( >=x11-libs/libXtst-1.0.3
+ >=x11-libs/libXres-1.0.3 )
+ >=x11-libs/libxkbui-1.0.2
+ >=x11-libs/liblbxutil-1.0.1
+ kdrive? ( sdl? ( media-libs/libsdl ) )"
+ # Xres is dmx-dependent, xkbui is xorgcfg-dependent
+ # Xaw is dmx- and xorgcfg-dependent
+ # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+ # Xxf86misc and Xxf86vm are xorgcfg-dependent
+ # liblbxutil is lbx- dependent
+DEPEND="${RDEPEND}
+ !net-dialup/dtrace
+ >=x11-proto/randrproto-1.2.2
+ >=x11-proto/renderproto-0.9.3
+ >=x11-proto/fixesproto-4
+ >=x11-proto/damageproto-1.1
+ >=x11-proto/xextproto-7.0.3
+ >=x11-proto/xproto-7.0.13
+ >=x11-proto/xf86dgaproto-2.0.3
+ >=x11-proto/xf86miscproto-0.9.2
+ >=x11-proto/xf86rushproto-1.1.2
+ >=x11-proto/xf86vidmodeproto-2.2.2
+ >=x11-proto/xf86bigfontproto-1.1.2
+ >=x11-proto/compositeproto-0.4
+ >=x11-proto/recordproto-1.13.2
+ >=x11-proto/resourceproto-1.0.2
+ >=x11-proto/videoproto-2.2.2
+ >=x11-proto/scrnsaverproto-1.1.0
+ >=x11-proto/evieext-1.0.2
+ >=x11-proto/trapproto-3.4.3
+ >=x11-proto/xineramaproto-1.1.2
+ >=x11-proto/fontsproto-2.0.2
+ >=x11-proto/kbproto-1.0.3
+ >=x11-proto/inputproto-1.4.4
+ >=x11-proto/bigreqsproto-1.0.2
+ >=x11-proto/xcmiscproto-1.1.2
+ >=x11-proto/glproto-1.4.9
+ dmx? ( >=x11-proto/dmxproto-2.2.2 )
+ dri? ( >=x11-proto/xf86driproto-2.0.4
+ >=x11-libs/libdrm-2.3 )"
+
+# Drivers
+PDEPEND="
+ xorg? (
+ input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 )
+ input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 )
+ input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
+ input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
+ input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
+ input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
+ input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
+ input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
+ input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 )
+ input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.0.6 )
+ input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 )
+ input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
+ input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
+ input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 )
+ input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 )
+ input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
+ input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
+ input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 )
+ input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
+ input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
+ input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 )
+ input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
+ input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
+ input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
+ input_devices_tslib? ( x11-drivers/xf86-input-tslib )
+ input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
+ input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
+ input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
+ input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 )
+ input_devices_wacom? ( x11-drivers/linuxwacom )
+
+ video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.0 )
+ video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.0 )
+ video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.85.0 )
+ video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.0 )
+ video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
+ video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.0 )
+ video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
+ video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0 )
+ video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.1 )
+ video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 )
+ video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
+ video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 )
+ video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
+ video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
+ video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.1 )
+ video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
+ video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-173.14.09 )
+ video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
+ video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 )
+ video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
+ video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 )
+ video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.0 )
+ video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.1 )
+ video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
+ video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.6.0 )
+ video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.0 )
+ video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.0 )
+ video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 )
+ video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 )
+ video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.0 )
+ video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
+ video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.0 )
+ video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.0 )
+ video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
+ video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.0.0 )
+ video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
+ video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
+ video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.0 )
+ video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
+
+ video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
+ !x11-drivers/ati-drivers
+
+ !x11-drivers/xf86-video-impact
+ !x11-drivers/xf86-video-imstt
+ !x11-drivers/xf86-video-newport
+ !x11-drivers/xf86-video-sunbw2
+ !x11-drivers/xf86-video-suncg14
+ !x11-drivers/xf86-video-suncg3
+ !x11-drivers/xf86-video-suncg6
+ !x11-drivers/xf86-video-suntcx
+ !x11-drivers/xf86-video-vermilion
+
+ !x11-drivers/xf86-video-cyrix
+ !x11-drivers/xf86-video-nsc
+ !x11-drivers/xf86-video-vga
+ )"
+LICENSE="${LICENSE} MIT"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# Local customizations, unsuitable for upstream
+GENTOO_PATCHES=(
+ "${FILESDIR}/${P}-loongson.patch"
+ "${FILESDIR}/1.4-fpic-libxf86config.patch"
+ "${FILESDIR}/1.4-fix-kdrive-automake.patch"
+ )
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+ "${FILESDIR}/1.5.2-force-LC_ALL-C-when-running-awk.patch"
+ "${FILESDIR}/1.5.2-fix-xvesa-with-new-kernels.patch"
+)
+
+PATCHES=(
+ "${GENTOO_PATCHES[@]}"
+ "${UPSTREAMED_PATCHES[@]}"
+ )
+
+pkg_setup() {
+ use minimal || ensure_a_server_is_building
+
+ # SDL only available in kdrive build
+ if use kdrive && use sdl; then
+ conf_opts="${conf_opts} --enable-xsdl"
+ else
+ conf_opts="${conf_opts} --disable-xsdl"
+ fi
+
+ # 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
+ # --enable-install-setuid needed because sparcs default off
+ CONFIGURE_OPTIONS="
+ $(use_enable ipv6)
+ $(use_enable dmx)
+ $(use_enable kdrive)
+ $(use_enable tslib)
+ $(use_enable !minimal xvfb)
+ $(use_enable !minimal xnest)
+ $(use_enable !minimal xtrap)
+ $(use_enable !minimal record)
+ $(use_enable !minimal xfree86-utils)
+ $(use_enable !minimal install-libxf86config)
+ $(use_enable dri)
+ $(use_enable xorg)
+ $(use_enable nptl glx-tls)
+ $(use_enable !minimal xorgcfg)
+ $(use_enable hal config-dbus)
+ $(use_enable hal config-hal)
+ --disable-dri2
+ --sysconfdir=/etc/X11
+ --localstatedir=/var
+ --enable-install-setuid
+ --with-fontdir=/usr/share/fonts
+ --with-xkb-output=/var/lib/xkb
+ ${conf_opts}"
+
+ local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
+ if built_with_use media-libs/mesa nptl; then
+ use nptl || die "${diemsg}"
+ else
+ use nptl && die "${diemsg}"
+ fi
+
+ # (#121394) Causes window corruption
+ filter-flags -fweb
+
+ # Nothing else provides new enough glxtokens.h
+ ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+ OLD_IMPLEM="$(eselect opengl show)"
+ eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+src_unpack() {
+ x-modular_specs_check
+ x-modular_dri_check
+ x-modular_unpack_source
+ x-modular_patch_source
+
+ # Set up kdrive servers to build
+ if use kdrive; then
+ kdrive_setup
+ fi
+
+ # Make sure eautoreconf gets run if we need the autoconf/make
+ # changes.
+ if [[ ${SNAPSHOT} != "yes" ]]; then
+ if use kdrive || use dmx; then
+ SNAPSHOT="yes"
+ fi
+ fi
+
+ if use hal; then
+ sed -i \
+ -e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
+ "${S}"/config/Makefile.am \
+ || die "failed to fix DBUS config directory"
+ SNAPSHOT="yes"
+ fi
+
+ x-modular_reconf_source
+}
+
+src_install() {
+ x-modular_src_install
+
+ dynamic_libgl_install
+
+ server_based_install
+
+ # Install video mode files for system-config-display
+ insinto /usr/share/xorg
+ doins hw/xfree86/common/{extra,vesa}modes \
+ || die "couldn't install extra modes"
+
+ # Bug #151421 - this file is not built with USE="minimal"
+ # Bug #151670 - this file is also not build if USE="-xorg"
+ if ! use minimal && use xorg; then
+ # Install xorg.conf.example
+ insinto /etc/X11
+ doins hw/xfree86/xorg.conf.example \
+ || die "couldn't install xorg.conf.example"
+ fi
+}
+
+pkg_postinst() {
+ switch_opengl_implem
+
+ # Bug #135544
+ ewarn "Users of reduced blanking now need:"
+ ewarn " Option \"ReducedBlanking\""
+ ewarn "In the relevant Monitor section(s)."
+ ewarn "Make sure your reduced blanking modelines are safe!"
+
+ echo
+ ewarn "You must rebuild all drivers if upgrading from xorg-server 1.4.1"
+ ewarn "or earlier, because the ABI changed. If you cannot start X because"
+ ewarn "of module version mismatch errors, this is your problem."
+
+ echo
+ ewarn "You can generate a list of all installed packages in the x11-drivers"
+ ewarn "category using this command:"
+ ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
+
+ ebeep 5
+ epause 10
+}
+
+pkg_postrm() {
+ # Get rid of module dir to ensure opengl-update works properly
+ if ! has_version x11-base/xorg-server; then
+ if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+ fi
+ fi
+}
+
+kdrive_setup() {
+ local card real_card disable_card kdrive_fbdev kdrive_vesa
+
+ einfo "Removing unused kdrive drivers ..."
+
+ # Some kdrive servers require fbdev and vesa
+ kdrive_fbdev="radeon neomagic sis siliconmotion"
+ # Some kdrive servers require just vesa
+ kdrive_vesa="chips mach64 mga nv glint r128 via"
+
+ for card in ${IUSE_VIDEO_CARDS}; do
+ real_card=${card#video_cards_}
+
+ # Differences between VIDEO_CARDS name and kdrive server name
+ real_card=${real_card/glint/pm2}
+ real_card=${real_card/radeon/ati}
+ real_card=${real_card/%nv/nvidia}
+ real_card=${real_card/siliconmotion/smi}
+ real_card=${real_card/%sis/sis300}
+
+ disable_card=0
+
+ # Check whether it's a valid kdrive server before we waste time
+ # on the rest of this
+ if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
+ continue
+ fi
+
+ if ! use ${card}; then
+ if use x86; then
+ # Some kdrive servers require fbdev and vesa
+ for i in ${kdrive_fbdev}; do
+ if use video_cards_${i}; then
+ if [[ ${real_card} = fbdev ]] \
+ || [[ ${real_card} = vesa ]]; then
+ continue 2 # Don't disable
+ fi
+ fi
+ done
+
+ # Some kdrive servers require just vesa
+ for i in ${kdrive_vesa}; do
+ if use video_cards_${i}; then
+ if [[ ${real_card} = vesa ]]; then
+ continue 2 # Don't disable
+ fi
+ fi
+ done
+ fi
+ disable_card=1
+ # Bug #150052
+ # fbdev is the only VIDEO_CARDS setting that works on non-x86
+ elif ! use x86 \
+ && [[ ${real_card} != fbdev ]]; then
+ ewarn " $real_card does not work on your architecture; disabling."
+ disable_card=1
+ fi
+
+ if [[ $disable_card = 1 ]]; then
+ ebegin " ${real_card}"
+ sed -i \
+ -e "s:\b${real_card}\b::g" \
+ "${S}"/hw/kdrive/Makefile.am \
+ || die "sed of ${real_card} failed"
+ eend
+ fi
+
+ done
+}
+
+dynamic_libgl_install() {
+ # next section is to setup the dynamic libGL stuff
+ ebegin "Moving GL files for dynamic switching"
+ dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+ local x=""
+ for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+ fi
+ done
+ eend 0
+}
+
+server_based_install() {
+ if ! use xorg; then
+ rm "${D}"/usr/share/man/man1/Xserver.1x \
+ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+ "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+ "${D}"/usr/share/man/man1/Xserver.1x
+ fi
+}
+
+switch_opengl_implem() {
+ # Switch to the xorg implementation.
+ # Use new opengl-update that will not reset user selected
+ # OpenGL interface ...
+ echo
+# eselect opengl set --use-old ${OPENGL_DIR}
+ eselect opengl set ${OLD_IMPLEM}
+}
+
+ensure_a_server_is_building() {
+ for server in ${IUSE_SERVERS}; do
+ use ${server} && return;
+ done
+ eerror "You need to specify at least one server to build."
+ eerror "Valid servers are: ${IUSE_SERVERS}."
+ die "No servers were specified to build."
+}