summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Le <r0bertz@gentoo.org>2010-02-27 13:46:13 +0800
committerZhang Le <r0bertz@gentoo.org>2010-02-27 13:46:13 +0800
commit4810f82e078a1b0d4f3aecadedae70729419e0de (patch)
tree329e52b6d5d342b775bb92553e7832dc85268f4a /x11-base
parentMerge branch 'master' of ssh://192.168.1.101/var/git/loongson (diff)
downloadloongson-4810f82e078a1b0d4f3aecadedae70729419e0de.tar.gz
loongson-4810f82e078a1b0d4f3aecadedae70729419e0de.tar.bz2
loongson-4810f82e078a1b0d4f3aecadedae70729419e0de.zip
added xorg-server-1.7.5.ebuild and smi 16bpp workaround patch and clean up
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/Manifest19
-rw-r--r--x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch83
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-loongson-fix-smi-16bpp.patch11
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.2.ebuild544
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.0.ebuild448
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild456
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild262
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.3.901.ebuild415
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.3.ebuild417
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.5.ebuild (renamed from x11-base/xorg-server/xorg-server-1.7.1.ebuild)12
11 files changed, 161 insertions, 2559 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 58380e2..6ddafa4 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -36,6 +36,7 @@ AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0
AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
AUX 1.5.3-builtin-fonts.patch 646 RMD160 29bf7a3ba112621f9d8e645c0c9129caee318735 SHA1 f1cf5a1b525e4165c57271d11edf10087b2aeb7e SHA256 614c214118be05452cb81b8959a372961a6a8e4474cb69bcee50614cc04e1f9d
AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
+AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
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
@@ -48,32 +49,22 @@ AUX xorg-server-1.6.3-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c
AUX xorg-server-1.6.3.901-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.6.5-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.7.1-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
+AUX xorg-server-1.7.5-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed186ec0163a4a1a81574040592ab8d8e1a06 SHA1 a39df02932f9d24693e79bbcbb80e7e6a5c74fa0 SHA256 a19a28c5f4930348e7e4ed471d3d0e53f9d936e7a4c756281ada480b63ecc039
+AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca
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
DIST xorg-server-1.5.3-gentoo-patches-01.tar.bz2 34209 RMD160 b82276a38d2d293bd7ffdfb86829e6b8bad35b02 SHA1 659b03d33a47820ce0a8b137b585da99f3f1ccb6 SHA256 ced893a1e5766604cfdbf7904de936c84b0b7f218b1a47b00e83c6db05ca1bec
DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
-DIST xorg-server-1.6.0.tar.bz2 4655422 RMD160 35e473e3b0d2f3c3101bc7843dd57f0e1fce11d8 SHA1 9baf703a0dac91cb84c02caea18268d6afa78662 SHA256 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
-DIST xorg-server-1.6.2-gentoo-patches-03.tar.bz2 9299 RMD160 914123bc25ce08eff6f4a727f291960a5a546af8 SHA1 0d63288ea1dd7f795fab3f74faf26f62f24c8dac SHA256 4dc3305f65a705c215ec314bc26f3baf6bde861eb9beff86a07dc98c9653600c
-DIST xorg-server-1.6.2.tar.bz2 4647067 RMD160 37af2d733cdc7155de13cfdb21cc6367135bb440 SHA1 7eb0ae82762eecf5be031d63a77f0c1281569414 SHA256 893e92ad2ccd1bcd646bba9540dd9dfc53ccc95f8dc5fd69444afe54fae8c261
-DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
-DIST xorg-server-1.6.3.tar.bz2 4651487 RMD160 5b9ddfeb9fb7082ef600e368ada8abbb006fe418 SHA1 1f28e8723e110e5c1a1adf3bc89325a81a526184 SHA256 7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-DIST xorg-server-1.7.1.tar.bz2 4892079 RMD160 b0ca9079636c11071344af70ccae56bcd7b6ecf9 SHA1 d31e259b3ab975e2c1baea8f7310b57152ae3c62 SHA256 a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20
+DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
EBUILD xorg-server-1.4.0.90-r3.ebuild 19571 RMD160 2a18b5ff8b87141e0a6f06e3589d71e0a1f934dd SHA1 6fd1e7f78a2faefbc13f1ad5c3a8f77d121a458b SHA256 4f3375321e37883fa765105cbb7056f90e6d2d6e74d4ab06072a31d635618781
-EBUILD xorg-server-1.5.2.ebuild 16624 RMD160 3d8138427c0e2d74f8ca7bddda1450a2e43624af SHA1 169ad9cb089f72239d0379292a2e4b509b320ccf SHA256 de7400da67081ca41edd3bc76d3bef52bf585d63a52487ab86ea8e572cc35f85
EBUILD xorg-server-1.5.3.ebuild 16703 RMD160 97d1d64120e5c7a6c40236894880bcce0e27e6dd SHA1 0abc2d7b74dc01ccfdd765dd6d73e73d2258a887 SHA256 3c7aa222bb7aa967f6c0cd2e8f03b542dfb619599c5f3c36a07ea8b37392a257
-EBUILD xorg-server-1.6.0.ebuild 13969 RMD160 a04a13060589a65202bad1c16402976ec17718af SHA1 22e92b969602857bc93257c4264ed6876fa699ed SHA256 92ca658906114d8627d22bcda284723cd9ba6cfafffd0dc2af457adcb19e0f83
-EBUILD xorg-server-1.6.2-r1.ebuild 14290 RMD160 b57a099f50ca3f3309fb733433f7f5ca2ca7d934 SHA1 09690993f683b488e3f220572ccd9de875e52139 SHA256 da513429e9eedf29f546eb8951fc0aa20bacdb66812ee0b0969b03d6b03102e5
-EBUILD xorg-server-1.6.3.901-r2.ebuild 7131 RMD160 b4b6c1bfe2c2db7bb6d73be021d76480159fd925 SHA1 8d776a61608f78c9c3c17ba0834e3dfe4aeb04a9 SHA256 ae2d13c5c43e134ad67eeafcaa8150c53fcccbab2fb353b3f3d802f5d80d0ab0
-EBUILD xorg-server-1.6.3.901.ebuild 12819 RMD160 dedd385ee407a1c53c44de1ac0b06da1d238b6b6 SHA1 dadfda299c55730c2f57fc4827e0cdf696879ff4 SHA256 3f11e5a3789c2f40500c1b28f75aa7dc8bcdad9516009c980b49c668ba0a5e5e
-EBUILD xorg-server-1.6.3.ebuild 12880 RMD160 c9b1f4008f1d9b55705e5b3d154b96b33d45fd81 SHA1 89cc29b24146da322697403769e115e811796080 SHA256 58be6b8f78af5020567ea91ae5aab2301e9a72d857ae5522c46838d3fc962efe
EBUILD xorg-server-1.6.5.ebuild 6897 RMD160 70aa46bdd55ff4517d10517f2d26b2fb9495d59c SHA1 4835b5c31a380fb573404123a7045abd5a902713 SHA256 f503bf6f5d693c0533af3e1cb88472a3b1132d28072287b8309e7f3d9021cabd
-EBUILD xorg-server-1.7.1.ebuild 6897 RMD160 855f07c2adddad2197f17966db4950fc50caaf02 SHA1 ce7b024fdbab8ed57ad97be7e9e2dd54cd122ff6 SHA256 5dbbbfe4892e5f40d09886aa6a1bae1064f89f5292cb27efb62182c4d5c44942
+EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c79664ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a9958384cc851512a108af346a8169771df4940d94d0f45f07f401262676d853
EBUILD xorg-server-9999.ebuild 13974 RMD160 5df9e7a97e2becf05a56756b21e2945416ec04ba SHA1 4ae167f622911208539bb80330d287ffdce259a6 SHA256 bd73081e164fe8aae6b2d589b04d345d999ec098a7be4eec09b296b0140ed26b
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.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch b/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
new file mode 100644
index 0000000..82f4f50
--- /dev/null
+++ b/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
@@ -0,0 +1,83 @@
+From 873ef3430e92b0756c0dbe5033f6aec38a20d6ad Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 16 Dec 2009 13:43:22 +1000
+Subject: [PATCH] dix: if owner-events is true for passive grabs, add the window mask (#25400)
+
+A client requesting a GrabModeSync button grab, owner-events true, with only
+the ButtonRelease mask set would never receive the press event even if the
+grab window had the ButtonPress mask set.
+
+The protocol requires that if owner-events is true, then the delivery mask
+is the combination of the grab mask + the window event mask.
+
+X.Org Bug 25400 <http://bugs.freedesktop.org/show_bug.cgi?id=25400>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ dix/events.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 files changed, 36 insertions(+), 0 deletions(-)
+
+diff --git a/dix/events.c b/dix/events.c
+index 7e0867c..12b12a8 100644
+--- a/dix/events.c
++++ b/dix/events.c
+@@ -3590,6 +3590,8 @@ CheckPassiveGrabsOnWindow(
+ xE = &core;
+ count = 1;
+ mask = grab->eventMask;
++ if (grab->ownerEvents)
++ mask |= pWin->eventMask;
+ } else if (match & XI2_MATCH)
+ {
+ rc = EventToXI2((InternalEvent*)event, &xE);
+@@ -3611,6 +3613,24 @@ CheckPassiveGrabsOnWindow(
+ mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
+ else if (event->type == XI_Enter || event->type == XI_FocusIn)
+ mask = grab->xi2mask[device->id][event->type/8];
++
++ if (grab->ownerEvents && wOtherInputMasks(grab->window))
++ {
++ InputClientsPtr icp =
++ wOtherInputMasks(grab->window)->inputClients;
++
++ while(icp)
++ {
++ if (rClient(icp) == rClient(grab))
++ {
++ int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
++ mask |= icp->xi2mask[device->id][evtype/8];
++ break;
++ }
++
++ icp = icp->next;
++ }
++ }
+ } else
+ {
+ rc = EventToXI((InternalEvent*)event, &xE, &count);
+@@ -3622,6 +3642,22 @@ CheckPassiveGrabsOnWindow(
+ continue;
+ }
+ mask = grab->eventMask;
++ if (grab->ownerEvents && wOtherInputMasks(grab->window))
++ {
++ InputClientsPtr icp =
++ wOtherInputMasks(grab->window)->inputClients;
++
++ while(icp)
++ {
++ if (rClient(icp) == rClient(grab))
++ {
++ mask |= icp->mask[device->id];
++ break;
++ }
++
++ icp = icp->next;
++ }
++ }
+ }
+
+ (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
+--
+1.6.5.2
+
diff --git a/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch
new file mode 100644
index 0000000..4351f28
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch
@@ -0,0 +1,53 @@
+diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h
+index 1528cc1..6be12b9 100644
+--- a/hw/xfree86/dri/sarea.h
++++ b/hw/xfree86/dri/sarea.h
+@@ -42,6 +42,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 --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
+index 688106a..1552860 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL;
+ _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)
+@@ -532,7 +533,22 @@ xf86EnableIO(void)
+ #endif
+ }
+ close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
++#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(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
+ 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/files/xorg-server-loongson-fix-smi-16bpp.patch b/x11-base/xorg-server/files/xorg-server-loongson-fix-smi-16bpp.patch
new file mode 100644
index 0000000..a974b2f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-loongson-fix-smi-16bpp.patch
@@ -0,0 +1,11 @@
+--- xorg-server-1.7.3.902/fb/fb.h.orig 2010-02-27 11:45:17.000000000 +0800
++++ xorg-server-1.7.3.902/fb/fb.h 2010-02-27 10:29:09.000000000 +0800
+@@ -75,7 +75,7 @@
+ #define FBPREFIX(x) fb##x
+ #define WRITE(ptr, val) (*(ptr) = (val))
+ #define READ(ptr) (*(ptr))
+-#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
++#define MEMCPY_WRAPPED(dst, src, size) memmove((dst), (src), (size))
+ #define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
+
+ #endif
diff --git a/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
deleted file mode 100644
index 52e8216..0000000
--- a/x11-base/xorg-server/xorg-server-1.5.2.ebuild
+++ /dev/null
@@ -1,544 +0,0 @@
-# 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 aiglx glx"
-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 aiglx)
- $(use_enable glx)
- $(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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.0.ebuild b/x11-base/xorg-server/xorg-server-1.6.0.ebuild
deleted file mode 100644
index c8dcbb3..0000000
--- a/x11-base/xorg-server/xorg-server-1.6.0.ebuild
+++ /dev/null
@@ -1,448 +0,0 @@
-# Copyright 1999-2007 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.3.0.0.ebuild,v 1.9 2007/06/04 23:17:40 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-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
- hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
- tslib? ( >=x11-libs/tslib-1.0 )
- dev-libs/openssl
- >=x11-libs/libXfont-1.4.0
- >=x11-libs/xtrans-1.2.3
- >=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.2.1
- >=x11-libs/pixman-0.14.0
- media-libs/freetype
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- >=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.5
- >=x11-libs/libXpm-3.5.7
- >=x11-libs/libXinerama-1.0.3
- >=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
- >=media-libs/mesa-7.3_rc1 )
- >=x11-libs/libxkbui-1.0.2
- >=x11-libs/liblbxutil-1.0.1
- kdrive? ( sdl? ( media-libs/libsdl ) )"
- # Xres is dmx-dependent
- # Xaw is dmx-dependent
- # Xpm is dmx-dependent, pulls in Xt
- # liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
- !net-dialup/dtrace
- sys-devel/flex
- >=x11-proto/randrproto-1.2.99.4
- >=x11-proto/renderproto-0.9.3
- >=x11-proto/fixesproto-4
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.4
- >=x11-proto/xproto-7.0.14
- >=x11-proto/xf86dgaproto-2.0.3
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.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/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.5.0
- >=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 )
- !minimal? ( >=x11-proto/xf86driproto-2.0.4
- >=x11-proto/dri2proto-1.99.3
- >=x11-libs/libdrm-2.3 )"
-
-# Drivers
-PDEPEND="
- xorg? (
- input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
- input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
- 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.3 )
- input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
- input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.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.4.0 )
- input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
- 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.4.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.4.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.6.3 )
- input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
- 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.1 )
- video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
- video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
- video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
- video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
- video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
- 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.2 )
- 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.2 )
- video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
- video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-173.14.09 )
- video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 )
- video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
- video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
- video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
- video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
- video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
- video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
- video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
- video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
- video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
- video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
- 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.1 )
- video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
- video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
- video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
- video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
- video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.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.1 )
- video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
- video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-
- !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"
- )
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${FILESDIR}"/${PV}/
-# )
-
-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 record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal glx)
- $(use_enable xorg)
- $(use_enable nptl glx-tls)
- $(use_enable hal config-dbus)
- $(use_enable hal config-hal)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --with-default-font-path=built-ins
- ${conf_opts}"
-
- local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
- if ! use minimal; then
- if built_with_use media-libs/mesa nptl; then
- use nptl || die "${diemsg}"
- else
- use nptl && die "${diemsg}"
- fi
- fi
-
- # (#121394) Causes window corruption
- filter-flags -fweb
-
- 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
-
- 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.5"
- 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
-}
-
-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 ${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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild
deleted file mode 100644
index 6455e34..0000000
--- a/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2009 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.6.2-r1.ebuild,v 1.2 2009/07/11 09:49:16 remi Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-# keithp put this one in archive/ instead of releases/ for unknown reasons
-BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
-SRC_URI="${SRC_URI}
- ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2
- mirror://gentoo/${P}-gentoo-patches-03.tar.bz2"
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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_virtualbox
- 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_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_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_via
- video_cards_virtualbox
- 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}
- tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- dev-libs/openssl
- >=x11-libs/libXfont-1.4.0
- >=x11-libs/xtrans-1.2.3
- >=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.2.1
- >=x11-libs/pixman-0.14.0
- media-libs/freetype
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- x11-apps/xkbcomp
- >=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-1.0.7
- >=x11-libs/libXaw-1.0.5
- >=x11-libs/libXpm-3.5.7
- >=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
- >=media-libs/mesa-7.3_rc1[nptl=]
- )
- >=x11-libs/libxkbui-1.0.2
- kdrive? ( sdl? ( media-libs/libsdl ) )"
- # Xres is dmx-dependent
- # Xaw is dmx-dependent
- # Xpm is dmx-dependent, pulls in Xt
- # xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
- !net-dialup/dtrace
- sys-devel/flex
- >=x11-proto/randrproto-1.2.99.4
- >=x11-proto/renderproto-0.9.3
- >=x11-proto/fixesproto-4
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.4
- >=x11-proto/xproto-7.0.14
- >=x11-proto/xf86dgaproto-2.0.3
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.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/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.5.0
- >=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 )
- !minimal? (
- >=x11-proto/xf86driproto-2.0.4
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3
- )"
-
-# Drivers
-PDEPEND="
- xorg? (
- input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
- input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
- 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.3 )
- input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
- input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.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.4.0 )
- input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
- 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.4.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.4.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_virtualbox? ( x11-drivers/xf86-input-virtualbox )
- input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
- input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
- 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.1 )
- video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
- video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
- video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
- video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
- video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
- 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.2 )
- 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.2 )
- video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.2 )
- video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers )
- video_cards_fglrx? ( >=x11-drivers/ati-drivers-9.6 )
- video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
- video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
- video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
- video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
- video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
- video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
- video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
- video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
- video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
- video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
- 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.1 )
- video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
- video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
- video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
- video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
- video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
- video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
- video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
- video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
- video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
- video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
- !x11-drivers/xf86-video-impact
- !x11-drivers/xf86-video-imstt
- !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"
- )
-
-# These have been sent upstream
-UPSTREAMED_PATCHES=(
- "${WORKDIR}/patches/"
- )
-
-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 tslib xcalibrate)
- $(use_enable !minimal xvfb)
- $(use_enable !minimal xnest)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xorg)
- $(use_enable nptl glx-tls)
- $(use_enable hal config-dbus)
- $(use_enable hal config-hal)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --without-dtrace
- ${conf_opts}"
-
- # (#121394) Causes window corruption
- filter-flags -fweb
-
- # Incompatible with GCC 3.x SSP on x86, bug #244352
- if use x86 ; then
- if [[ $(gcc-major-version) -lt 4 ]]; then
- filter-flags -fstack-protector
- fi
- fi
-
- OLD_IMPLEM="$(eselect opengl show)"
- eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_prepare() {
- x-modular_patch_source
-
- 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.5"
- 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
-}
-
-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/lib{glx,dri}*; 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 ${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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild
deleted file mode 100644
index 34e3313..0000000
--- a/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2009 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.6.3.901-r2.ebuild,v 1.1 2009/09/15 10:07:13 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib versionator
-
-SRC_URI="${SRC_URI}"
-# mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- dev-libs/openssl
- >=x11-libs/libXfont-1.4.0
- >=x11-libs/xtrans-1.2.3
- >=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.2.1
- >=x11-libs/pixman-0.14.0
- media-libs/freetype
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- x11-apps/xkbcomp
- >=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-1.0.8
- >=x11-libs/libXaw-1.0.5
- >=x11-libs/libXpm-3.5.7
- >=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
- >=media-libs/mesa-7.3_rc1[nptl=]
- )
- >=x11-libs/libxkbui-1.0.2
- kdrive? ( sdl? ( media-libs/libsdl ) )"
- # Xres is dmx-dependent
- # Xaw is dmx-dependent
- # Xpm is dmx-dependent, pulls in Xt
- # xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
- !net-dialup/dtrace
- sys-devel/flex
- >=x11-proto/randrproto-1.2.99.4
- >=x11-proto/renderproto-0.9.3
- >=x11-proto/fixesproto-4
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.4
- >=x11-proto/xproto-7.0.14
- >=x11-proto/xf86dgaproto-2.0.3
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.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/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.5.0
- >=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 )
- !minimal? (
- >=x11-proto/xf86driproto-2.0.4
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3
- )"
-
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-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}/${PV}-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch"
- )
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-# )
-
-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 tslib xcalibrate)
- $(use_enable !minimal xvfb)
- $(use_enable !minimal xnest)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xorg)
- $(use_enable nptl glx-tls)
- $(use_enable hal config-hal)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --without-dtrace
- ${conf_opts}"
-
- # (#121394) Causes window corruption
- filter-flags -fweb
-
- # Incompatible with GCC 3.x SSP on x86, bug #244352
- if use x86 ; then
- if [[ $(gcc-major-version) -lt 4 ]]; then
- filter-flags -fstack-protector
- fi
- fi
-
- OLD_IMPLEM="$(eselect opengl show)"
- eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-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.5"
- 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
-}
-
-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/lib{glx,dri,dri2}*; 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 ${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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild
deleted file mode 100644
index 37e434c..0000000
--- a/x11-base/xorg-server/xorg-server-1.6.3.901.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2009 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.6.3.901.ebuild,v 1.1 2009/08/26 13:04:21 remi Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-# keithp put this one in archive/ instead of releases/ for unknown reasons
-BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
-SRC_URI="${SRC_URI}
- ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
-# mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
- input_devices_acecad
- input_devices_aiptek
- input_devices_citron
- input_devices_elographics
- input_devices_evdev
- input_devices_fpit
- input_devices_hyperpen
- input_devices_joystick
- input_devices_keyboard
- input_devices_mouse
- input_devices_mutouch
- input_devices_penmount
- input_devices_tslib
- input_devices_virtualbox
- 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_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_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_via
- video_cards_virtualbox
- 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}
- tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- dev-libs/openssl
- >=x11-libs/libXfont-1.4.0
- >=x11-libs/xtrans-1.2.3
- >=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.2.1
- >=x11-libs/pixman-0.14.0
- media-libs/freetype
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- x11-apps/xkbcomp
- >=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-1.0.7
- >=x11-libs/libXaw-1.0.5
- >=x11-libs/libXpm-3.5.7
- >=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
- >=media-libs/mesa-7.3_rc1[nptl=]
- )
- >=x11-libs/libxkbui-1.0.2
- kdrive? ( sdl? ( media-libs/libsdl ) )"
- # Xres is dmx-dependent
- # Xaw is dmx-dependent
- # Xpm is dmx-dependent, pulls in Xt
- # xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
- !net-dialup/dtrace
- sys-devel/flex
- >=x11-proto/randrproto-1.2.99.4
- >=x11-proto/renderproto-0.9.3
- >=x11-proto/fixesproto-4
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.4
- >=x11-proto/xproto-7.0.14
- >=x11-proto/xf86dgaproto-2.0.3
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.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/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.5.0
- >=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 )
- !minimal? (
- >=x11-proto/xf86driproto-2.0.4
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3
- )"
-
-# Drivers
-PDEPEND="
- xorg? (
- input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
- input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
- input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
- input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
- input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
- input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
- input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
- input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
- input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
- input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
- input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
- input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
- input_devices_tslib? ( x11-drivers/xf86-input-tslib )
- input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
- input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
- input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
- 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.1 )
- video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
- video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
- video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
- video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
- video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
- video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
- video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.11.0 )
- video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 )
- 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.2 )
- video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.2 )
- video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers )
- video_cards_fglrx? ( >=x11-drivers/ati-drivers-9.6 )
- video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
- video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
- video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
- video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
- video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
- video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
- video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
- video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
- video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
- video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
- 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.1 )
- video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
- video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
- video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
- video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
- video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
- video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
- video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
- video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
- video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
- video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
- !x11-drivers/xf86-video-impact
- !x11-drivers/xf86-video-imstt
- !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"
- )
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-# )
-
-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 tslib xcalibrate)
- $(use_enable !minimal xvfb)
- $(use_enable !minimal xnest)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xorg)
- $(use_enable nptl glx-tls)
- $(use_enable hal config-hal)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --without-dtrace
- ${conf_opts}"
-
- # (#121394) Causes window corruption
- filter-flags -fweb
-
- # Incompatible with GCC 3.x SSP on x86, bug #244352
- if use x86 ; then
- if [[ $(gcc-major-version) -lt 4 ]]; then
- filter-flags -fstack-protector
- fi
- fi
-
- OLD_IMPLEM="$(eselect opengl show)"
- eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-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.5"
- 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
-}
-
-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/lib{glx,dri}*; 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 ${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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.ebuild
deleted file mode 100644
index 2740d4b..0000000
--- a/x11-base/xorg-server/xorg-server-1.6.3.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2009 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.6.3.ebuild,v 1.2 2009/08/08 19:46:09 gengor Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-# keithp put this one in archive/ instead of releases/ for unknown reasons
-BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
-SRC_URI="${SRC_URI}
- ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
-# mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
- input_devices_acecad
- input_devices_aiptek
- input_devices_citron
- input_devices_elographics
- input_devices_evdev
- input_devices_fpit
- input_devices_hyperpen
- input_devices_joystick
- input_devices_keyboard
- input_devices_mouse
- input_devices_mutouch
- input_devices_penmount
- input_devices_tslib
- input_devices_virtualbox
- 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_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_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_via
- video_cards_virtualbox
- 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}
- tslib hal ipv6 minimal nptl sdl"
-RDEPEND="hal? ( sys-apps/hal )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- dev-libs/openssl
- >=x11-libs/libXfont-1.4.0
- >=x11-libs/xtrans-1.2.3
- >=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.2.1
- >=x11-libs/pixman-0.14.0
- media-libs/freetype
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- x11-apps/xkbcomp
- >=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-1.0.7
- >=x11-libs/libXaw-1.0.5
- >=x11-libs/libXpm-3.5.7
- >=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
- >=media-libs/mesa-7.3_rc1[nptl=]
- media-fonts/font-cursor-misc
- )
- >=x11-libs/libxkbui-1.0.2
- kdrive? ( sdl? ( media-libs/libsdl ) )"
- # Xres is dmx-dependent
- # Xaw is dmx-dependent
- # Xpm is dmx-dependent, pulls in Xt
- # xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
- !net-dialup/dtrace
- sys-devel/flex
- >=x11-proto/randrproto-1.2.99.4
- >=x11-proto/renderproto-0.9.3
- >=x11-proto/fixesproto-4
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.4
- >=x11-proto/xproto-7.0.14
- >=x11-proto/xf86dgaproto-2.0.3
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.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/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.5.0
- >=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 )
- !minimal? (
- >=x11-proto/xf86driproto-2.0.4
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3
- )"
-
-# Drivers
-PDEPEND="
- xorg? (
- input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
- input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
- input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
- input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
- input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
- input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
- input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
- input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
- input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
- input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
- input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
- input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
- input_devices_tslib? ( x11-drivers/xf86-input-tslib )
- input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
- input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
- input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
- 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.1 )
- video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
- video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
- video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
- video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
- video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
- video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
- video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.11.0 )
- video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 )
- 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.2 )
- video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.2 )
- video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers )
- video_cards_fglrx? ( >=x11-drivers/ati-drivers-9.6 )
- video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
- video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
- video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
- video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
- video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
- video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
- video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
- video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
- video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
- video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
- 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.1 )
- video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
- video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
- video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
- video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
- video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
- video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
- video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
- video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
- video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
- video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
-
- !x11-drivers/xf86-video-impact
- !x11-drivers/xf86-video-imstt
- !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"
- )
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-# )
-
-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 tslib xcalibrate)
- $(use_enable !minimal xvfb)
- $(use_enable !minimal xnest)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xorg)
- $(use_enable nptl glx-tls)
- $(use_enable hal config-dbus)
- $(use_enable hal config-hal)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --without-dtrace
- ${conf_opts}"
-
- # (#121394) Causes window corruption
- filter-flags -fweb
-
- # Incompatible with GCC 3.x SSP on x86, bug #244352
- if use x86 ; then
- if [[ $(gcc-major-version) -lt 4 ]]; then
- filter-flags -fstack-protector
- fi
- fi
-
- OLD_IMPLEM="$(eselect opengl show)"
- eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-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.5"
- 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
-}
-
-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/lib{glx,dri}*; 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 ${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."
-}
diff --git a/x11-base/xorg-server/xorg-server-1.7.1.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.ebuild
index 3742d43..ef1e134 100644
--- a/x11-base/xorg-server/xorg-server-1.7.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7.1.ebuild,v 1.2 2009/10/29 10:45:05 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.ebuild,v 1.1 2010/02/16 10:55:20 scarabeus Exp $
EAPI="2"
@@ -121,6 +121,12 @@ EPATCH_SUFFIX="patch"
# These have been sent upstream
UPSTREAMED_PATCHES=(
#"${WORKDIR}/patches/"
+
+ # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
+ "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
+
+ # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622
+ "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch"
)
PATCHES=(
@@ -178,7 +184,7 @@ pkg_setup() {
fi
OLD_IMPLEM="$(eselect opengl show)"
- eselect opengl set --impl-headers ${OPENGL_DIR}
+ eselect opengl set ${OPENGL_DIR}
}
src_install() {