* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: b6316b3ed8f0099a6facec1fd31fddcdcc25902d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 23:10:27 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 23:10:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=b6316b3e
Remove ancient xorg-server-1.5 version
---
x11-base/xorg-server/Manifest | 10 -
.../files/1.4-fix-kdrive-automake.patch | 12 -
.../xorg-server/files/1.4-fpic-libxf86config.patch | 13 -
.../files/1.5.2-fix-xvesa-with-new-kernels.patch | 19 -
.../1.5.2-force-LC_ALL-C-when-running-awk.patch | 38 --
.../xorg-server/files/1.5.3-builtin-fonts.patch | 28 -
.../files/xorg-server-1.5.2-loongson.patch | 51 --
.../files/xorg-server-1.5.3-loongson.patch | 51 --
x11-base/xorg-server/xorg-server-1.5.3.ebuild | 547 --------------------
9 files changed, 0 insertions(+), 769 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4a98c1f..d714b4d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -11,11 +11,6 @@ AUX 1.3.0.0-fix-xephyr-amd64-segfault.patch 1382 RMD160 03595cb965623383f8429560
AUX 1.3.0.0-fix-xkb-openoffice-hangs.patch 1671 RMD160 6fcee07ea40289b40c43bce5bee88b282ae536f4 SHA1 34535d5dc17cf96a4605a82105ec41e27c97c94c SHA256 e9cbb4c9c58689116d09827a5a50f38a7e24e735277dd595d3ffa981c24e6c7d
AUX 1.3.0.0-ramdac.patch 2736 RMD160 6a57be8c314989c110f1dd82563fa730512b6a5f SHA1 5da7c2caecd8c47e77d10c3967bcc22c481087fe SHA256 29dd3f3de269b1d9d24628dab293246f2deda4e8bd4018f20adf74584d2ca92f
AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
-AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
-AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
-AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0bed70eabe6a2fa SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0
-AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
-AUX 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 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
@@ -27,8 +22,6 @@ AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e
AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
-AUX xorg-server-1.5.2-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
-AUX xorg-server-1.5.3-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
AUX xorg-server-1.6.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.6.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.6.3-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
@@ -49,15 +42,12 @@ AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b0
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
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 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.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.5.3.ebuild 16703 RMD160 97d1d64120e5c7a6c40236894880bcce0e27e6dd SHA1 0abc2d7b74dc01ccfdd765dd6d73e73d2258a887 SHA256 3c7aa222bb7aa967f6c0cd2e8f03b542dfb619599c5f3c36a07ea8b37392a257
EBUILD xorg-server-1.6.5.ebuild 6897 RMD160 70aa46bdd55ff4517d10517f2d26b2fb9495d59c SHA1 4835b5c31a380fb573404123a7045abd5a902713 SHA256 f503bf6f5d693c0533af3e1cb88472a3b1132d28072287b8309e7f3d9021cabd
EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c79664ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a9958384cc851512a108af346a8169771df4940d94d0f45f07f401262676d853
EBUILD xorg-server-1.8.2.ebuild 8241 RMD160 2fa4126a8c52b3f8be9ae45b0d087cfe669e4d1d SHA1 8fea1dede1e3bcd9c5a0729920e3a6750043251a SHA256 52f9a3925448037b9e68aa538c238401c07b0ce19850371dd925a46e905da37a
diff --git a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch b/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
deleted file mode 100644
index cdc436e..0000000
--- a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
-index 5803644..71d3403 100644
---- a/hw/kdrive/Makefile.am
-+++ b/hw/kdrive/Makefile.am
-@@ -1,6 +1,5 @@
- if KDRIVEVESA
--VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
-- smi via
-+VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 smi via
- endif
-
- if BUILD_KDRIVEFBDEVLIB
diff --git a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
deleted file mode 100644
index c3b9ebd..0000000
--- a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 849ee8b..1b49d48 100644
---- a/hw/xfree86/parser/Makefile.am
-+++ b/hw/xfree86/parser/Makefile.am
-@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
- DRI.c \
- Extensions.c
-
--AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC
-
- EXTRA_DIST = \
- Configint.h \
diff --git a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
deleted file mode 100644
index 2d0f469..0000000
--- a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=235789
-2008-09-09 Martin von Gagern
-
---- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h 2008-09-09 17:24:59.000000000 +0200
-+++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h 2008-09-09 18:01:53.000000000 +0200
-@@ -67,6 +67,13 @@
- #include "os.h"
- #endif
-
-+#ifndef IF_MASK
-+#define IF_MASK X86_EFLAGS_IF
-+#endif
-+#ifndef IOPL_MASK
-+#define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- typedef unsigned char U8;
- typedef unsigned short U16;
- typedef unsigned int U32;
diff --git a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
deleted file mode 100644
index ffb3e0d..0000000
--- a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8918c50440de301887af8006f2dc72d64adf9f9c Mon Sep 17 00:00:00 2001
-From: Remi Cardona <remi@gentoo.org>
-Date: Sat, 18 Oct 2008 12:23:51 +0200
-Subject: [PATCH] force LC_ALL=C when running awk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This bug was reported by a user trying to build the server with a
-Turkish locale (tr_TR). The problem is that the Turkish alphabet is
-latin-based, but not entirely similar. The bug comes from vesamodes
-which has "Interlaced", which is then converted to lowercase by
-modelines2c.awk. Execept that with a Turkish locale
-tolower("Interlaced") is not "interlaced" but "ınterlaced", which the
-rest of the script fails to understand.
-
-This patch forces LC_ALL=C when running the awk script to always get the
-intended latin en_US alphabet.
----
- hw/xfree86/common/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
-index 0f44075..723973a 100644
---- a/hw/xfree86/common/Makefile.am
-+++ b/hw/xfree86/common/Makefile.am
-@@ -24,7 +24,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
- MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
-
- xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
-- cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
-+ cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
-
- BUILT_SOURCES = xf86DefModeSet.c
-
---
-1.6.0.2
-
diff --git a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch b/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
deleted file mode 100644
index 50719ad..0000000
--- a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fe82a1fe634a2e0ceb030de90309d26044c7b75e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 1 Nov 2007 15:06:17 -0400
-Subject: [PATCH] Enable builtin font FPE.
-
----
- dix/dixfonts.c | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index c21b3ec..c951b05 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1890,11 +1890,8 @@ InitFonts (void)
- } else
- #endif
- {
--#ifdef BUILTIN_FONTS
- BuiltinRegisterFpeFunctions();
--#else
- FontFileRegisterFpeFunctions();
--#endif
- #ifndef NOFONTSERVERACCESS
- fs_register_fpe_functions();
- #endif
---
-1.5.3.4
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch
deleted file mode 100644
index 9c48b37..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
-+ extern unsigned int IOPortBase;
- #endif
-
- if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- }
- close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
-+#elif defined(__mips__)
-+ fd = open("/dev/mem", O_RDWR);
-+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
-+ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+ 0x1fd00000);
-+ if (IOPortBase == MAP_FAILED) {
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+ strerror(errno));
-+ return FALSE;
-+ }
-+ close(fd);
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: map iobase (%x)\n",
-+ IOPortBase);
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
- if (ioperm(0, 1024, 1) || iopl(3)) {
- if (errno == ENODEV)
- ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch
deleted file mode 100644
index 9c48b37..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
-+ extern unsigned int IOPortBase;
- #endif
-
- if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- }
- close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
-+#elif defined(__mips__)
-+ fd = open("/dev/mem", O_RDWR);
-+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
-+ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+ 0x1fd00000);
-+ if (IOPortBase == MAP_FAILED) {
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+ strerror(errno));
-+ return FALSE;
-+ }
-+ close(fd);
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: map iobase (%x)\n",
-+ IOPortBase);
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
- if (ioperm(0, 1024, 1) || iopl(3)) {
- if (errno == ENODEV)
- ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/x11-base/xorg-server/xorg-server-1.5.3.ebuild b/x11-base/xorg-server/xorg-server-1.5.3.ebuild
deleted file mode 100644
index 29fc357..0000000
--- a/x11-base/xorg-server/xorg-server-1.5.3.ebuild
+++ /dev/null
@@ -1,547 +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.3.ebuild,v 1.4 2008/12/16 19:45:58 ranger 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
- mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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"
-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 )
- >=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
- >=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.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
- >=media-libs/mesa-7.1
- media-fonts/font-adobe-75dpi )
- >=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
- sys-devel/flex
- >=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 )
- !minimal? ( >=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.1.0 )
- 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 )
- 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.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/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"
- "${FILESDIR}/1.5.3-builtin-fonts.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 aiglx)
- $(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 !minimal dri)
- $(use_enable !minimal 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
- --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
-
- # 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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 51fb94347503e887ffc8667248d7fa4cf33bf191
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 23:39:06 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 23:39:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=51fb9434
Remove ancient xorg-server-1.7 version
---
x11-base/xorg-server/Manifest | 4 -
...r-events-is-true-for-passive-grabs-add-th.patch | 83 ------
.../files/xorg-server-1.7.5-loongson.patch | 53 ----
x11-base/xorg-server/xorg-server-1.7.5.ebuild | 268 --------------------
4 files changed, 0 insertions(+), 408 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d56a4f5..69f62f3 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,11 +1,9 @@
-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 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
-AUX xorg-server-1.7.5-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31
AUX xorg-server-1.8.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
@@ -16,12 +14,10 @@ AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed186ec0163a4a1a81574040592ab
AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c79664ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a9958384cc851512a108af346a8169771df4940d94d0f45f07f401262676d853
EBUILD xorg-server-1.8.2.ebuild 8241 RMD160 2fa4126a8c52b3f8be9ae45b0d087cfe669e4d1d SHA1 8fea1dede1e3bcd9c5a0729920e3a6750043251a SHA256 52f9a3925448037b9e68aa538c238401c07b0ce19850371dd925a46e905da37a
EBUILD xorg-server-1.9.0.ebuild 7853 RMD160 a5e96a4414e17fecde10ab9b16e8d726d909c140 SHA1 00c4a70acc477aa1cf95ae9eef9af7930efeed9a SHA256 9c4b389edecbd3baeef6c46bd525ae3434a02ad2d816c47f27f70165ec40d76f
EBUILD xorg-server-1.9.2.902.ebuild 8067 RMD160 f835be6b42d62dc44050145ffedf8c0ce7eac99e SHA1 ca35dedcba423f17be3be2dd15af65834c262c6f SHA256 ba801538aca09efd026508a8ffcaf18e9208530b303dc91cbd46cbcf5c19fa82
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
deleted file mode 100644
index 82f4f50..0000000
--- a/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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/xorg-server-1.7.5.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.ebuild
deleted file mode 100644
index ef1e134..0000000
--- a/x11-base/xorg-server/xorg-server-1.7.5.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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.5.ebuild,v 1.1 2010/02/16 10:55:20 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-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.3.3
- >=x11-libs/xtrans-1.2.2
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libpciaccess-0.10.3
- >=x11-libs/pixman-0.15.20
- 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
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.5
- >=x11-libs/libXfixes-4.0.3
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- >=x11-libs/libXtst-1.0.3
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=x11-libs/libXres-1.0.3
- >=media-libs/mesa-7.4[nptl=]
- )
- >=x11-libs/libxkbui-1.0.2
- kdrive? (
- >=x11-libs/libXext-1.0.5
- 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
-
-## Deps that don't have a version in configure.ac but do here:
-# x11-proto/resourceproto
-# x11-proto/fontsproto
-# x11-libs/libXau
-# x11-libs/libXfont
-# x11-libs/libXdmcp
-# x11-libs/libXext
-# x11-libs/libX11
-# x11-libs/libXrender
-# x11-libs/libXmu
-# x11-libs/libXfixes
-# x11-libs/libXtst
-# x11-proto/xineramaproto
-# x11-proto/dmxproto
-## Deps that are larger here than in configure.ac
-# x11-libs/libpciaccess-0.8.0
-#
-
-DEPEND="${RDEPEND}
- !!net-dialup/dtrace
- sys-devel/flex
- >=x11-proto/randrproto-1.2.99.3
- >=x11-proto/renderproto-0.11
- >=x11-proto/fixesproto-4.1
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.99.3
- >=x11-proto/xproto-7.0.13
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/compositeproto-0.4
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/resourceproto-1.0.2
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/inputproto-1.9.99.902
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/glproto-1.4.9
- dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3.0
- )"
-
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-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=(
- "${FILESDIR}/${P}-loongson.patch"
- "${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 ${OPENGL_DIR}
-}
-
-src_install() {
- x-modular_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example (see bugs #151421 and #151670)
- insinto /etc/X11
- doins hw/xfree86/xorg.conf.example \
- || die "couldn't install xorg.conf.example"
- fi
-}
-
-pkg_postinst() {
- switch_opengl_implem
-
- echo
- ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6"
- 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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: df89674de2c4f049ff60e4b7c6daa31d7c0c431e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 23:23:49 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 23:23:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=df89674d
xorg-server: Remove many stale patches and aux files from ancient versions
---
x11-base/xorg-server/Manifest | 25 --
.../files/1.2.0-fix-amd-cpu-detection.patch | 38 ---
...y-free-device-devprivates-memory-leak-fix.patch | 38 ---
x11-base/xorg-server/files/1.2.0-typo-fix.patch | 36 ---
...zero-out-client-devprivates-on-allocation.patch | 36 ---
...VE-2007-6427-Xinput-extension-memory-corr.patch | 244 --------------------
...r-CVE-2007-5958-File-existence-disclosure.patch | 22 --
.../xorg-server/files/1.3-alpha-build-fix.patch | 36 ---
.../1.3.0.0-fix-dual-head-screen-resolutions.patch | 49 ----
.../files/1.3.0.0-fix-randr-resizing.patch | 58 -----
.../files/1.3.0.0-fix-xephyr-amd64-segfault.patch | 45 ----
.../files/1.3.0.0-fix-xkb-openoffice-hangs.patch | 55 -----
x11-base/xorg-server/files/1.3.0.0-ramdac.patch | 91 --------
.../files/1.3.0.0-xephyr_crash_at_exit.patch | 30 ---
.../files/avoid-crash-on-minimized-xv-window.patch | 55 -----
.../files/use-composite-for-unequal-depths.patch | 124 ----------
.../files/xorg-server-1.3.0.0-loongson.patch | 51 ----
.../files/xorg-server-1.6.0-loongson.patch | 53 -----
.../files/xorg-server-1.6.2-loongson.patch | 53 -----
.../files/xorg-server-1.6.3-loongson.patch | 53 -----
.../files/xorg-server-1.6.3.901-loongson.patch | 53 -----
.../files/xorg-server-1.6.5-loongson.patch | 53 -----
.../files/xorg-server-1.7.1-loongson.patch | 53 -----
.../files/xorg-server-sam225bw-quirks.patch | 14 --
.../xorg-x11-server-1.0.1-fpic-libxf86config.patch | 11 -
x11-base/xorg-server/files/xprint.init | 30 ---
26 files changed, 0 insertions(+), 1406 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 75f8005..d56a4f5 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,32 +1,10 @@
-AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
-AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
-AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
-AUX 1.2.0-zero-out-client-devprivates-on-allocation.patch 1284 RMD160 28bdf0c7b868736a788da69b8f4c6b1e0a88f425 SHA1 0cfd5dcb57c42197e39e5469032833ea932c0b4f SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34
-AUX 1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7656 RMD160 2989af909eeec8c2e04126e5eaf34ac5f2b5449d SHA1 1dfe79a470b64f9981982216a3ec52e7b46dddff SHA256 09eeefa3b891fc7d860fff1dce485cc73278eee07a8494751b75df6fbdd66482
-AUX 1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 622 RMD160 e3d8a3f8ad55bf4c9da7736019255d00ecd07836 SHA1 3da82b9a81995b31ad84ccb376a619953837edb5 SHA256 ca0a6dca401ac9dd17d87866dc0d70ca02d8f9a18cfeafe7998af56b75148162
-AUX 1.3-alpha-build-fix.patch 1151 RMD160 b7eda6096e95835d998731c97aa70f13ec0c771c SHA1 210ef43db8ad8080db21a86c31f7744dbdb7e439 SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186
-AUX 1.3.0.0-fix-dual-head-screen-resolutions.patch 1542 RMD160 b09e29247cc11e94a028596bebd9ee8237cbb490 SHA1 eb416bed3c6eb8323a6305ca0576ca94b667205f SHA256 c944c684fe6cfb115f1c4ce1fb5b291ca82d6f44ce9a5381d711414c72c1ed70
-AUX 1.3.0.0-fix-randr-resizing.patch 1986 RMD160 7fe971a41e5659876596b921d33d316c7a22f6fa SHA1 6f8c41b3f25dbb58a050929d6af03778d0b15c26 SHA256 f9a489027004c9e62a76b431344a6f5936989b8161dc5a51018070e3d59e015e
-AUX 1.3.0.0-fix-xephyr-amd64-segfault.patch 1382 RMD160 03595cb965623383f8429560c551e13f882bf1b9 SHA1 693e64678100480135c3853590481b20342e9eae SHA256 32cd35d353ba2568d98125328574a0d2c021637a367dd3de616e02a2f8fdd4b9
-AUX 1.3.0.0-fix-xkb-openoffice-hangs.patch 1671 RMD160 6fcee07ea40289b40c43bce5bee88b282ae536f4 SHA1 34535d5dc17cf96a4605a82105ec41e27c97c94c SHA256 e9cbb4c9c58689116d09827a5a50f38a7e24e735277dd595d3ffa981c24e6c7d
-AUX 1.3.0.0-ramdac.patch 2736 RMD160 6a57be8c314989c110f1dd82563fa730512b6a5f SHA1 5da7c2caecd8c47e77d10c3967bcc22c481087fe SHA256 29dd3f3de269b1d9d24628dab293246f2deda4e8bd4018f20adf74584d2ca92f
-AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
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 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
-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 xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
-AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
-AUX xorg-server-1.6.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
-AUX xorg-server-1.6.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
-AUX xorg-server-1.6.3-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
-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-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31
AUX xorg-server-1.8.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
@@ -37,10 +15,7 @@ AUX xorg-server-1.9.4-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c
AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed186ec0163a4a1a81574040592ab8d8e1a06 SHA1 a39df02932f9d24693e79bbcbb80e7e6a5c74fa0 SHA256 a19a28c5f4930348e7e4ed471d3d0e53f9d936e7a4c756281ada480b63ecc039
AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
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-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-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 xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
diff --git a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
deleted file mode 100644
index 48775d3..0000000
--- a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=876b806ec09d5ff0c6cd19df91006c4eefedfaa6
-Reapply patch to fix AMD CPU detection
- author Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
- Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500)
- committer Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
- Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500)
- commit 876b806ec09d5ff0c6cd19df91006c4eefedfaa6
- tree 0c30b71f2adbbea5641bc4611c6360e23a2e172d tree
- parent 13568d2aa43da4216bbcb46e1125ff28c323ac54 commit | commitdiff
-Reapply patch to fix AMD CPU detection
-
---- xorg-server-1.2.0.orig/fb/fbpict.c 2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/fb/fbpict.c 2007-03-19 00:30:44.000000000 +0100
-@@ -1470,21 +1470,23 @@
- if (result) {
- /* result now contains the standard feature bits */
- if (result & (1 << 15))
- features |= CMOV;
- if (result & (1 << 23))
- features |= MMX;
- if (result & (1 << 25))
- features |= SSE;
- if (result & (1 << 26))
- features |= SSE2;
-- if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
-+ if ((features & MMX) && !(features & SSE) &&
-+ (strcmp(vendor, "AuthenticAMD") == 0 ||
-+ strcmp(vendor, "Geode by NSC") == 0)) {
- /* check for AMD MMX extensions */
-
- unsigned int result;
- __asm__("push %%ebx\n"
- "mov $0x80000000, %%eax\n"
- "cpuid\n"
- "xor %%edx, %%edx\n"
- "cmp $0x1, %%eax\n"
- "jge 2\n"
- "mov $0x80000001, %%eax\n"
diff --git a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
deleted file mode 100644
index b4747c4..0000000
--- a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=b5fde366e2e21234ac0b81222fd5c42ca3e49cba
-Properly free device devPrivates - memory leak fix.
- author Eamon Walsh <ewalsh@tycho.nsa.gov>
- Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
- committer Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
- Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
- commit b5fde366e2e21234ac0b81222fd5c42ca3e49cba
- tree 21c4d64fc97f8a7b0ec39f7e7a408540dd78691e tree
- parent a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac commit | commitdiff
-Properly free device devPrivates - memory leak fix.
-
---- xorg-server-1.2.0.orig/dix/devices.c 2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/dix/devices.c 2007-03-18 21:47:58.000000000 +0100
-@@ -268,20 +268,24 @@
- if (l->xkb_sli)
- XkbFreeSrvLedInfo(l->xkb_sli);
- #endif
- xfree(l);
- }
- #ifdef XKB
- while (dev->xkb_interest) {
- XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
- }
- #endif
-+
-+ if (dev->devPrivates)
-+ xfree(dev->devPrivates);
-+
- xfree(dev->sync.event);
- xfree(dev);
- }
-
- void
- CloseDownDevices()
- {
- register DeviceIntPtr dev, next;
-
- for (dev = inputInfo.devices; dev; dev = next)
diff --git a/x11-base/xorg-server/files/1.2.0-typo-fix.patch b/x11-base/xorg-server/files/1.2.0-typo-fix.patch
deleted file mode 100644
index 0a15217..0000000
--- a/x11-base/xorg-server/files/1.2.0-typo-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=a23b0b069cac8a48e2b306b2095515d75f647705
-Typo fix.
- author Adam Jackson <ajax@benzedrine.nwnk.net>
- Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500)
- committer Adam Jackson <ajax@benzedrine.nwnk.net>
- Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500)
- commit a23b0b069cac8a48e2b306b2095515d75f647705
- tree 44d98fa9da8b879e4d610a9fc484804a418d217c tree
- parent d21c95f80bdba2f29eedd57fb0b00e580391c08e commit | commitdiff
-Typo fix.
-
---- xorg-server-1.2.0.orig/hw/xfree86/os-support/xf86_libc.h 2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h 2007-03-19 00:31:52.000000000 +0100
-@@ -421,21 +421,21 @@
- #undef tan
- #define tan(d) xf86tan(d)
- #undef tmpfile
- #define tmpfile() xf86tmpfile()
- #undef tolower
- #define tolower(i) xf86tolower(i)
- #undef toupper
- #define toupper(i) xf86toupper(i)
- #undef ungetc
- #define ungetc(i,FP) xf86ungetc(i,FP)
--#undef vfprinf
-+#undef vfprintf
- #define vfprintf(p,f,a) xf86vfprintf(p,f,a)
- #undef vsnprintf
- #define vsnprintf(s,n,f,a) xf86vsnprintf(s,n,f,a)
- #undef vsprintf
- #define vsprintf(s,f,a) xf86vsprintf(s,f,a)
- /* XXX Disable assert as if NDEBUG was defined */
- /* Some X headers defined this away too */
- #undef assert
- #define assert(a) ((void)0)
- #undef HUGE_VAL
\ No newline at end of file
diff --git a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
deleted file mode 100644
index 7c6144b..0000000
--- a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=d9e079d2a385203fdd18d958cfc19d759cab4ba8
-Zero out client devPrivates on allocation.
- author Eamon Walsh <ewalsh@tycho.nsa.gov>
- Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500)
- committer Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
- Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500)
- commit d9e079d2a385203fdd18d958cfc19d759cab4ba8
- tree 20548a2b4ab268c5a32c5883f3d06816c9f5d43e tree
- parent e437f357b6850a6c87ca6696870b3abd40e5b8ed commit | commitdiff
-Zero out client devPrivates on allocation.
-
---- xorg-server-1.2.0.orig/dix/dispatch.c 2007-03-18 21:43:21.000000000 +0100
-+++ xorg-server-1.2.0/dix/dispatch.c 2007-03-18 22:00:24.000000000 +0100
-@@ -3683,20 +3683,22 @@
- ppriv = (DevUnion *)(client + 1);
- else
- {
- ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec));
- if (!ppriv)
- return 0;
- }
- client->devPrivates = ppriv;
- sizes = clientPrivateSizes;
- ptr = (char *)(ppriv + clientPrivateLen);
-+ if (ppriv)
-+ bzero(ppriv, totalClientSize - sizeof(ClientRec));
- for (i = clientPrivateLen; --i >= 0; ppriv++, sizes++)
- {
- if ( (size = *sizes) )
- {
- ppriv->ptr = (pointer)ptr;
- ptr += size;
- }
- else
- ppriv->ptr = (pointer)NULL;
- }
diff --git a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
deleted file mode 100644
index 18075a6..0000000
--- a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-Index: xorg-server-1.3.0.0/Xi/chgfctl.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/chgfctl.c
-+++ xorg-server-1.3.0.0/Xi/chgfctl.c
-@@ -451,18 +451,13 @@ ChangeStringFeedback(ClientPtr client, D
- xStringFeedbackCtl * f)
- {
- register char n;
-- register long *p;
- int i, j;
- KeySym *syms, *sup_syms;
-
- syms = (KeySym *) (f + 1);
- if (client->swapped) {
- swaps(&f->length, n); /* swapped num_keysyms in calling proc */
-- p = (long *)(syms);
-- for (i = 0; i < f->num_keysyms; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ SwapLongs((CARD32 *) syms, f->num_keysyms);
- }
-
- if (f->num_keysyms > s->ctrl.max_symbols) {
-Index: xorg-server-1.3.0.0/Xi/chgkmap.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/chgkmap.c
-+++ xorg-server-1.3.0.0/Xi/chgkmap.c
-@@ -79,18 +79,14 @@ int
- SProcXChangeDeviceKeyMapping(register ClientPtr client)
- {
- register char n;
-- register long *p;
-- register int i, count;
-+ register unsigned int count;
-
- REQUEST(xChangeDeviceKeyMappingReq);
- swaps(&stuff->length, n);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
-- p = (long *)&stuff[1];
- count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-- for (i = 0; i < count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), count);
- return (ProcXChangeDeviceKeyMapping(client));
- }
-
-@@ -106,10 +102,14 @@ ProcXChangeDeviceKeyMapping(register Cli
- int ret;
- unsigned len;
- DeviceIntPtr dev;
-+ unsigned int count;
-
- REQUEST(xChangeDeviceKeyMappingReq);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
-
-+ count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-+
- dev = LookupDeviceIntRec(stuff->deviceid);
- if (dev == NULL) {
- SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
-Index: xorg-server-1.3.0.0/Xi/chgprop.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/chgprop.c
-+++ xorg-server-1.3.0.0/Xi/chgprop.c
-@@ -81,19 +81,15 @@ int
- SProcXChangeDeviceDontPropagateList(register ClientPtr client)
- {
- register char n;
-- register long *p;
-- register int i;
-
- REQUEST(xChangeDeviceDontPropagateListReq);
- swaps(&stuff->length, n);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
- swapl(&stuff->window, n);
- swaps(&stuff->count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
-+ stuff->count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
- return (ProcXChangeDeviceDontPropagateList(client));
- }
-
-Index: xorg-server-1.3.0.0/Xi/grabdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/grabdev.c
-+++ xorg-server-1.3.0.0/Xi/grabdev.c
-@@ -82,8 +82,6 @@ int
- SProcXGrabDevice(register ClientPtr client)
- {
- register char n;
-- register long *p;
-- register int i;
-
- REQUEST(xGrabDeviceReq);
- swaps(&stuff->length, n);
-@@ -91,11 +89,11 @@ SProcXGrabDevice(register ClientPtr clie
- swapl(&stuff->grabWindow, n);
- swapl(&stuff->time, n);
- swaps(&stuff->event_count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->event_count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+
-+ if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
-+ return BadLength;
-+
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
-
- return (ProcXGrabDevice(client));
- }
-Index: xorg-server-1.3.0.0/Xi/grabdevb.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/grabdevb.c
-+++ xorg-server-1.3.0.0/Xi/grabdevb.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceButton(register ClientPtr client)
- {
- register char n;
-- register long *p;
-- register int i;
-
- REQUEST(xGrabDeviceButtonReq);
- swaps(&stuff->length, n);
-@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(register ClientPt
- swapl(&stuff->grabWindow, n);
- swaps(&stuff->modifiers, n);
- swaps(&stuff->event_count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->event_count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
-+ stuff->event_count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
-
- return (ProcXGrabDeviceButton(client));
- }
-Index: xorg-server-1.3.0.0/Xi/grabdevk.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/grabdevk.c
-+++ xorg-server-1.3.0.0/Xi/grabdevk.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceKey(register ClientPtr client)
- {
- register char n;
-- register long *p;
-- register int i;
-
- REQUEST(xGrabDeviceKeyReq);
- swaps(&stuff->length, n);
-@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(register ClientPtr c
- swapl(&stuff->grabWindow, n);
- swaps(&stuff->modifiers, n);
- swaps(&stuff->event_count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->event_count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
- return (ProcXGrabDeviceKey(client));
- }
-
-Index: xorg-server-1.3.0.0/Xi/selectev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/selectev.c
-+++ xorg-server-1.3.0.0/Xi/selectev.c
-@@ -84,19 +84,16 @@ int
- SProcXSelectExtensionEvent(register ClientPtr client)
- {
- register char n;
-- register long *p;
-- register int i;
-
- REQUEST(xSelectExtensionEventReq);
- swaps(&stuff->length, n);
- REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
- swapl(&stuff->window, n);
- swaps(&stuff->count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
-+ stuff->count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
-+
- return (ProcXSelectExtensionEvent(client));
- }
-
-Index: xorg-server-1.3.0.0/Xi/sendexev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xi/sendexev.c
-+++ xorg-server-1.3.0.0/Xi/sendexev.c
-@@ -83,7 +83,7 @@ int
- SProcXSendExtensionEvent(register ClientPtr client)
- {
- register char n;
-- register long *p;
-+ register CARD32 *p;
- register int i;
- xEvent eventT;
- xEvent *eventP;
-@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(register Client
- REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
- swapl(&stuff->destination, n);
- swaps(&stuff->count, n);
-+
-+ if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
-+ (stuff->num_events * (sizeof(xEvent) >> 2)))
-+ return BadLength;
-+
- eventP = (xEvent *) & stuff[1];
- for (i = 0; i < stuff->num_events; i++, eventP++) {
- proc = EventSwapVector[eventP->u.u.type & 0177];
-@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(register Client
- *eventP = eventT;
- }
-
-- p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
-- for (i = 0; i < stuff->count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
-+ SwapLongs(p, stuff->count);
- return (ProcXSendExtensionEvent(client));
- }
-
diff --git a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
deleted file mode 100644
index b8e5178..0000000
--- a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xorg-server-1.3.0.0/Xext/security.c
-===================================================================
---- xorg-server-1.3.0.0.orig/Xext/security.c
-+++ xorg-server-1.3.0.0/Xext/security.c
-@@ -1567,7 +1567,7 @@ SecurityLoadPropertyAccessList(void)
- return;
-
- #ifndef __UNIXOS2__
-- f = fopen(SecurityPolicyFile, "r");
-+ f = Fopen(SecurityPolicyFile, "r");
- #else
- f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
- #endif
-@@ -1653,7 +1653,7 @@ SecurityLoadPropertyAccessList(void)
- }
- #endif /* PROPDEBUG */
-
-- fclose(f);
-+ Fclose(f);
- } /* SecurityLoadPropertyAccessList */
-
-
diff --git a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
deleted file mode 100644
index 481e4ad..0000000
--- a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200
-Author: Julien Cristau <jcristau@debian.org>
-Date: Thu Jul 19 20:37:26 2007 -0400
-
- Fix alpha build failures
-
- Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
- <unistd.h> instead
-
-diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
-index 5aca9e9..085c942 100644
---- a/hw/xfree86/os-support/linux/lnx.h
-+++ b/hw/xfree86/os-support/linux/lnx.h
-@@ -11,7 +11,6 @@ extern int iopl __P ((int __level));
-
- /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
- # include <linux/unistd.h>
--# include <asm/pci.h>
- extern long (*_iobase)(unsigned, int, int, int);
-
- /*
-diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
-index 0a76129..e255118 100644
---- a/hw/xfree86/os-support/linux/lnx_axp.c
-+++ b/hw/xfree86/os-support/linux/lnx_axp.c
-@@ -112,8 +112,8 @@ lnxGetAXP(void)
- /*
- * pciconfig_iobase wrappers and dynamic i/o selection
- */
--#include <linux/unistd.h>
--#include <asm/pci.h>
-+#include "lnx.h"
-+#include <unistd.h>
- #include <errno.h>
-
- /* glibc versions (single hose only) */
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
deleted file mode 100644
index c5b9571..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Title : x11-base/xorg-server-1.3.0.0 uses wrong screen resolutions on a dual-head systems
-Assignee : x11@gentoo.org
-Reported : 2007-05-23 16:53 0000
-Updated : 2007-10-02 19:39:28 0000
-Status : NEW
-Severity : normal
-Priority : P2
-Reporter : jouni.rinne@pp1.inet.fi
-Product : Gentoo Linux
-Component : Server
-Keywords : Inclusion
-CC : bas@lijer.nl
-CC : daniel.pielmeier@googlemail.com
-CC : frlinux@frlinux.net
-CC : ml81@gmx.de
-Comments : 14
-Attachments : 1
-URL : http://bugs.gentoo.org/show_bug.cgi?id=179545
-
-commit 9c80eda826448822328bb678a7d284cc43fffb17
-Author: Adam Jackson <ajax@benzedrine.nwnk.net>
-Date: Wed Apr 25 16:35:04 2007 -0400
-
- Disable RANDR's fake Xinerama protocol when there's more than one screen.
-
- ... in the protocol sense. Xinerama doesn't have any provision for more
- than one protocol screen each with its own geometry.
-
- Red Hat bug #231257.
-
-diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
-index 1db27f1..2a57e4e 100644
---- a/randr/rrxinerama.c
-+++ b/randr/rrxinerama.c
-@@ -428,6 +428,14 @@ RRXineramaExtensionInit(void)
- return;
- #endif
-
-+ /*
-+ * Xinerama isn't capable enough to have multiple protocol screens each
-+ * with their own output geometry. So if there's more than one protocol
-+ * screen, just don't even try.
-+ */
-+ if (screenInfo.numScreens > 1)
-+ return;
-+
- (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
- ProcRRXineramaDispatch,
- SProcRRXineramaDispatch,
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
deleted file mode 100644
index 4828699..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Title : xorg-server-1.3: desktop does not resize with RandR
-Assignee : x11@gentoo.org
-Reported : 2007-06-30 11:37 0000
-Updated : 2007-10-06 08:32:58 0000
-Status : ASSIGNED
-Severity : normal
-Priority : P2
-Reporter : sascha.lucas@rus.uni-stuttgart.de
-Product : Gentoo Linux
-Component : KDE
-Keywords : Inclusion
-CC : caster@gentoo.org
-CC : chrschmitt@gmail.com
-CC : gentoo@chlhp.de
-CC : kde@gentoo.org
-Comments : 14
-Attachments : 0
-URL : http://bugs.gentoo.org/show_bug.cgi?id=183721
-
-commit c10df5b967d4da4e11786520317e2917de5541fa
-Author: Aaron Plattner <aplattner@nvidia.com>
-Date: Tue Apr 3 15:47:01 2007 -0700
-
- Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated.
-
- RandR 1.1 clients expect the size fields in this event to be the unrotated
- dimensions of the screen. This behavior is "weird", but that's the way the old
- code worked so we need to be bug-compatible with it.
-
-diff --git a/randr/rrscreen.c b/randr/rrscreen.c
-index ad74ac3..f83fce3 100644
---- a/randr/rrscreen.c
-+++ b/randr/rrscreen.c
-@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
-
- se.sequenceNumber = client->sequence;
- se.sizeID = RR10CurrentSizeID (pScreen);
--
-- se.widthInPixels = pScreen->width;
-- se.heightInPixels = pScreen->height;
-- se.widthInMillimeters = pScreen->mmWidth;
-- se.heightInMillimeters = pScreen->mmHeight;
-+
-+ if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-+ se.widthInPixels = pScreen->height;
-+ se.heightInPixels = pScreen->width;
-+ se.widthInMillimeters = pScreen->mmHeight;
-+ se.heightInMillimeters = pScreen->mmWidth;
-+ } else {
-+ se.widthInPixels = pScreen->width;
-+ se.heightInPixels = pScreen->height;
-+ se.widthInMillimeters = pScreen->mmWidth;
-+ se.heightInMillimeters = pScreen->mmHeight;
-+ }
-+
- WriteEventsToClient (client, 1, (xEvent *) &se);
- }
-
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
deleted file mode 100644
index c8fdfed..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Title : x11-base/xorg-server-1.3.0.0 Xephyr segfaults on startup on amd64
-Assignee : x11@gentoo.org
-Reported : 2007-09-20 17:22 0000
-Updated : 2007-09-20 17:52:21 0000
-Status : NEW
-URL : https://bugs.freedesktop.org/show_bug.cgi?id=11582
-Severity : normal
-Priority : P2
-Reporter : chithanh@cs.tu-berlin.de
-Product : Gentoo Linux
-Component : Server
-Keywords : Inclusion
-Comments : 2
-Attachments : 1
-URL : http://bugs.gentoo.org/show_bug.cgi?id=193207
-
-commit dcc3de91d2b80be98e4488df29ec6b551c7ff6d1
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Sat Aug 18 11:50:33 2007 +0200
-
- Xephyr: fix immediat segfault on amd64
-
- This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582
-
-diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
-index d0a2f2f..12118da 100644
---- a/hw/kdrive/ephyr/hostx.c
-+++ b/hw/kdrive/ephyr/hostx.c
-@@ -40,6 +40,7 @@
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
- #include <X11/extensions/XShm.h>
-+#include <X11/Xmd.h>
-
- /*
- * All xlib calls go here, which gets built as its own .a .
-@@ -79,7 +80,7 @@ static int HostXWantDamageDebug = 0;
-
- extern KeySym EphyrKeymap[];
-
--extern KeySym kdKeymap[];
-+extern CARD32 kdKeymap[];
- extern int kdMinScanCode;
- extern int kdMaxScanCode;
- extern int kdMinKeyCode;
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch
deleted file mode 100644
index 88df93b..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=197104
-
-commit a5b8053606d6e786cdcf6734f271acc05f9cc588
-Author: Adam Jackson <ajax@benzedrine.nwnk.net>
-Date: Tue Sep 11 11:37:06 2007 -0400
-
- Ignore - not just block - SIGALRM around Popen()/Pclose().
-
- Because our "popen" implementation uses stdio, and because nobody's stdio
- library is capable of surviving signals, we need to make absolutely sure
- that we hide the SIGALRM from the smart scheduler. Otherwise, when you
- open a menu in openoffice, and it recompiles XKB to deal with the
- accelerators, and you popen xkbcomp because we suck, then the scheduler
- will tell you you're taking forever doing something stupid, and the
- wait() code will get confused, and input will hang and your CPU usage
- slams to 100%. Down, not across.
-
-diff --git a/os/utils.c b/os/utils.c
-index 3bb7dbe..afcaae4 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1720,6 +1720,8 @@ static struct pid {
- int pid;
- } *pidlist;
-
-+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
-+
- pointer
- Popen(char *command, char *type)
- {
-@@ -1741,11 +1743,15 @@ Popen(char *command, char *type)
- return NULL;
- }
-
-+ /* Ignore the smart scheduler while this is going on */
-+ old_alarm = signal(SIGALRM, SIG_IGN);
-+
- switch (pid = fork()) {
- case -1: /* error */
- close(pdes[0]);
- close(pdes[1]);
- xfree(cur);
-+ signal(SIGALRM, old_alarm);
- return NULL;
- case 0: /* child */
- if (setgid(getgid()) == -1)
-@@ -1921,6 +1927,8 @@ Pclose(pointer iop)
- /* allow EINTR again */
- OsReleaseSignals ();
-
-+ signal(SIGALRM, old_alarm);
-+
- return pid == -1 ? -1 : pstat;
- }
-
diff --git a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
deleted file mode 100644
index 37ab1b7..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Title : xorg-server-1.3: xf86-video-s3 - s3_drv.so: undefined symbol: RamDacInit
-Assignee : x11@gentoo.org
-Reported : 2007-09-12 15:53 0000
-Updated : 2007-10-06 08:34:19 0000
-Status : NEW
-Severity : normal
-Priority : P2
-Reporter : dpblnt@gmail.com
-Product : Gentoo Linux
-Component : Applications
-Keywords : Inclusion
-Comments : 3
-Attachments : 1
-URL : http://bugs.gentoo.org/show_bug.cgi?id=192312
-
-commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
-Author: Julien Cristau <jcristau@debian.org>
-Date: Tue May 29 22:01:30 2007 -0400
-
- Make sure that the ramdac symbols are present in the server
-
- The former ramdac module is now built into the server, so its symbols need to
- be explicitly exported to drivers (Debian #423129).
-
-diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
-index 5175f01..6535e4c 100644
---- a/hw/xfree86/loader/xf86sym.c
-+++ b/hw/xfree86/loader/xf86sym.c
-@@ -96,6 +96,11 @@
- #endif
- #include "xf86DDC.h"
- #include "edid.h"
-+#include "xf86Cursor.h"
-+#include "xf86RamDac.h"
-+#include "BT.h"
-+#include "IBM.h"
-+#include "TI.h"
-
- #ifndef HAS_GLIBC_SIGSETJMP
- #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
-@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = {
- SYMFUNC(xf86I2CWriteRead)
- SYMFUNC(xf86I2CWriteVec)
- SYMFUNC(xf86I2CWriteWord)
-+
-+ /* ramdac/xf86RamDac.c */
-+ SYMFUNC(RamDacCreateInfoRec)
-+ SYMFUNC(RamDacHelperCreateInfoRec)
-+ SYMFUNC(RamDacDestroyInfoRec)
-+ SYMFUNC(RamDacHelperDestroyInfoRec)
-+ SYMFUNC(RamDacInit)
-+ SYMFUNC(RamDacHandleColormaps)
-+ SYMFUNC(RamDacFreeRec)
-+ SYMFUNC(RamDacGetHWIndex)
-+ SYMVAR(RamDacHWPrivateIndex)
-+ SYMVAR(RamDacScreenPrivateIndex)
-+
-+ /* ramdac/xf86Cursor.c */
-+ SYMFUNC(xf86InitCursor)
-+ SYMFUNC(xf86CreateCursorInfoRec)
-+ SYMFUNC(xf86DestroyCursorInfoRec)
-+ SYMFUNC(xf86ForceHWCursor)
-+
-+ /* ramdac/BT.c */
-+ SYMFUNC(BTramdacProbe)
-+ SYMFUNC(BTramdacSave)
-+ SYMFUNC(BTramdacRestore)
-+ SYMFUNC(BTramdacSetBpp)
-+
-+ /* ramdac/IBM.c */
-+ SYMFUNC(IBMramdacProbe)
-+ SYMFUNC(IBMramdacSave)
-+ SYMFUNC(IBMramdacRestore)
-+ SYMFUNC(IBMramdac526SetBpp)
-+ SYMFUNC(IBMramdac640SetBpp)
-+ SYMFUNC(IBMramdac526CalculateMNPCForClock)
-+ SYMFUNC(IBMramdac640CalculateMNPCForClock)
-+ SYMFUNC(IBMramdac526HWCursorInit)
-+ SYMFUNC(IBMramdac640HWCursorInit)
-+ SYMFUNC(IBMramdac526SetBppWeak)
-+
-+ /* ramdac/TI.c */
-+ SYMFUNC(TIramdacCalculateMNPForClock)
-+ SYMFUNC(TIramdacProbe)
-+ SYMFUNC(TIramdacSave)
-+ SYMFUNC(TIramdacRestore)
-+ SYMFUNC(TIramdac3026SetBpp)
-+ SYMFUNC(TIramdac3030SetBpp)
-+ SYMFUNC(TIramdacHWCursorInit)
-+ SYMFUNC(TIramdacLoadPalette)
- };
diff --git a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
deleted file mode 100644
index 4e5b130..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2
-- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
- mess. (#231425)
-
-https://bugs.freedesktop.org/show_bug.cgi?id=10713
-http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.2.99.901-xephyr-crash-at-exit.patch?rev=1.1&view=log
-Debian bug #420421 (and maybe #424517)
-
---- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx 2007-03-07 14:15:25.000000000 -0500
-+++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c 2007-03-13 14:27:38.000000000 -0400
-@@ -281,12 +281,14 @@
- __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
- int i;
-
-- for (i = 0; i < mesaScreen->num_vis; i++) {
-- if (mesaScreen->xm_vis[i])
-- XMesaDestroyVisual(mesaScreen->xm_vis[i]);
-- }
-+ if (mesaScreen->xm_vis) {
-+ for (i = 0; i < mesaScreen->num_vis; i++) {
-+ if (mesaScreen->xm_vis[i])
-+ XMesaDestroyVisual(mesaScreen->xm_vis[i]);
-+ }
-
-- xfree(mesaScreen->xm_vis);
-+ xfree(mesaScreen->xm_vis);
-+ }
-
- __glXScreenDestroy(screen);
-
diff --git a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
deleted file mode 100644
index 23eeca1..0000000
--- a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Michel Dänzer <michel@tungstengraphics.com>
-Date: Thu, 24 May 2007 10:10:05 +0000 (+0200)
-Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
-X-Git-Tag: xorg-server-1.3.99.0
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=649e7f82d8d4333443493056b81eb20d6cf022bc
-
-Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
-
-This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
----
-
---- a/hw/xfree86/common/xf86xv.c
-+++ b/hw/xfree86/common/xf86xv.c
-@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin,
- winPriv->next = PrivRoot;
- pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
- }
-+
-+ portPriv->pDraw = (DrawablePtr)pWin;
-+
- return Success;
- }
-
-@@ -1375,7 +1378,6 @@ xf86XVPutVideo(
- result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
- if(result != Success) return result;
-
-- portPriv->pDraw = pDraw;
- portPriv->type = XvInputMask;
-
- /* save a copy of these parameters */
-@@ -1479,7 +1481,6 @@ xf86XVPutStill(
-
- xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
- portPriv->isOn = XV_ON;
-- portPriv->pDraw = pDraw;
- portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
- portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
- portPriv->type = 0; /* no mask means it's transient and should
-@@ -1529,7 +1530,6 @@ xf86XVGetVideo(
- result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
- if(result != Success) return result;
-
-- portPriv->pDraw = pDraw;
- portPriv->type = XvOutputMask;
-
- /* save a copy of these parameters */
-@@ -1784,7 +1784,6 @@ xf86XVPutImage(
- (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
-
- portPriv->isOn = XV_ON;
-- portPriv->pDraw = pDraw;
- portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
- portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
- portPriv->type = 0; /* no mask means it's transient and should
diff --git a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch b/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
deleted file mode 100644
index fd2c5ad..0000000
--- a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Gentoo bug #191964
-freedesktop.org bug #7447 attachment #11368
-Fixed in 1.4 and newer
-
-diff --git a/composite/compalloc.c b/composite/compalloc.c
-index f555411..006e808 100644
---- a/composite/compalloc.c
-+++ b/composite/compalloc.c
-@@ -461,7 +461,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
- ScreenPtr pScreen = pWin->drawable.pScreen;
- WindowPtr pParent = pWin->parent;
- PixmapPtr pPixmap;
-- GCPtr pGC;
-
- pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth);
-
-@@ -471,25 +470,63 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
- pPixmap->screen_x = x;
- pPixmap->screen_y = y;
-
-- pGC = GetScratchGC (pWin->drawable.depth, pScreen);
--
-- /*
-- * Copy bits from the parent into the new pixmap so that it will
-- * have "reasonable" contents in case for background None areas.
-- */
-- if (pGC)
-+ if (pParent->drawable.depth == pWin->drawable.depth)
- {
-- XID val = IncludeInferiors;
-+ GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen);
-
-- ValidateGC(&pPixmap->drawable, pGC);
-- dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
-- (*pGC->ops->CopyArea) (&pParent->drawable,
-- &pPixmap->drawable,
-- pGC,
-- x - pParent->drawable.x,
-- y - pParent->drawable.y,
-- w, h, 0, 0);
-- FreeScratchGC (pGC);
-+ /*
-+ * Copy bits from the parent into the new pixmap so that it will
-+ * have "reasonable" contents in case for background None areas.
-+ */
-+ if (pGC)
-+ {
-+ XID val = IncludeInferiors;
-+
-+ ValidateGC(&pPixmap->drawable, pGC);
-+ dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
-+ (*pGC->ops->CopyArea) (&pParent->drawable,
-+ &pPixmap->drawable,
-+ pGC,
-+ x - pParent->drawable.x,
-+ y - pParent->drawable.y,
-+ w, h, 0, 0);
-+ FreeScratchGC (pGC);
-+ }
-+ }
-+ else
-+ {
-+ PictFormatPtr pSrcFormat = compWindowFormat (pParent);
-+ PictFormatPtr pDstFormat = compWindowFormat (pWin);
-+ XID inferiors = IncludeInferiors;
-+ int error;
-+
-+ PicturePtr pSrcPicture = CreatePicture (None,
-+ &pParent->drawable,
-+ pSrcFormat,
-+ CPSubwindowMode,
-+ &inferiors,
-+ serverClient, &error);
-+
-+ PicturePtr pDstPicture = CreatePicture (None,
-+ &pPixmap->drawable,
-+ pDstFormat,
-+ 0, 0,
-+ serverClient, &error);
-+
-+ if (pSrcPicture && pDstPicture)
-+ {
-+ CompositePicture (PictOpSrc,
-+ pSrcPicture,
-+ NULL,
-+ pDstPicture,
-+ x - pParent->drawable.x,
-+ y - pParent->drawable.y,
-+ 0, 0, 0, 0, w, h);
-+ }
-+ if (pSrcPicture)
-+ FreePicture (pSrcPicture, 0);
-+ if (pDstPicture)
-+ FreePicture (pDstPicture, 0);
- }
- return pPixmap;
- }
-diff --git a/composite/compint.h b/composite/compint.h
-index 38b1777..f69595c 100644
---- a/composite/compint.h
-+++ b/composite/compint.h
-@@ -237,6 +237,9 @@ compCheckTree (ScreenPtr pScreen);
- #define compCheckTree(s)
- #endif
-
-+PictFormatPtr
-+compWindowFormat (WindowPtr pWin);
-+
- void
- compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap);
-
-diff --git a/composite/compwindow.c b/composite/compwindow.c
-index a4c4e6f..bfd2946 100644
---- a/composite/compwindow.c
-+++ b/composite/compwindow.c
-@@ -685,7 +685,7 @@ compGetWindowVisual (WindowPtr pWin)
- return 0;
- }
-
--static PictFormatPtr
-+PictFormatPtr
- compWindowFormat (WindowPtr pWin)
- {
- ScreenPtr pScreen = pWin->drawable.pScreen;
diff --git a/x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch
deleted file mode 100644
index 04ee66e..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
-+ extern unsigned int IOPortBase;
- #endif
-
- if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- }
- close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
-+#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__)
- 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-1.6.0-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.0-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.6.0-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-1.6.2-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.2-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.6.2-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-1.6.3-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.3-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.6.3-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-1.6.3.901-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-1.6.5-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.6.5-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.6.5-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-1.7.1-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.7.1-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.7.1-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-sam225bw-quirks.patch b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
deleted file mode 100644
index ca5bbb4..0000000
--- a/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hw/xfree86/modes/xf86EdidModes.c 2007-05-02 01:23:52.000000000 +0200
-+++ hw/xfree86/modes/xf86EdidModes.c.new 2007-05-02 01:24:09.000000000 +0200
-@@ -92,6 +92,11 @@
- DDC->vendor.prod_id == 638)
- return TRUE;
-
-+ /* Samsung SyncMaster 225BW */
-+ if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-+ DDC->vendor.prod_id == 596)
-+ return TRUE;
-+
- return FALSE;
- }
-
diff --git a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
deleted file mode 100644
index a6a35f9..0000000
--- a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic 2006-03-06 13:57:45.000000000 -0500
-+++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am 2006-03-06 13:59:11.000000000 -0500
-@@ -23,7 +23,7 @@
- DRI.c \
- Extensions.c
-
--AM_CFLAGS = $(XORG_CFLAGS)
-+AM_CFLAGS = $(XORG_CFLAGS) -fPIC
-
- EXTRA_DIST = \
- Configint.h \
diff --git a/x11-base/xorg-server/files/xprint.init b/x11-base/xorg-server/files/xprint.init
deleted file mode 100644
index e5fed1b..0000000
--- a/x11-base/xorg-server/files/xprint.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $
-
-opts="${opts} get_xpserverlist lsprinters"
-
-depend() {
- use cupsd
-}
-
-start() {
- ebegin "Starting xprint"
- /usr/lib/misc/xprint start > /dev/null
- eend $?
-}
-
-get_xpserverlist() {
- /usr/lib/misc/xprint get_xpserverlist
-}
-
-lsprinters() {
- /usr/lib/misc/xprint lsprinters
-}
-
-stop() {
- ebegin "Stopping xprint"
- /usr/lib/misc/xprint stop > /dev/null
- eend $?
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: b450b8c162cd1957a9bb2d09f7073e597c6f7b17
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 23:15:02 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 23:15:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=b450b8c1
Remove ancient xorg-server-1.6 version
---
x11-base/xorg-server/Manifest | 3 -
...built-ins-to-the-font-path-in-SetDefaultF.patch | 102 --------
x11-base/xorg-server/xorg-server-1.6.5.ebuild | 255 --------------------
3 files changed, 0 insertions(+), 360 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d714b4d..75f8005 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -11,7 +11,6 @@ AUX 1.3.0.0-fix-xephyr-amd64-segfault.patch 1382 RMD160 03595cb965623383f8429560
AUX 1.3.0.0-fix-xkb-openoffice-hangs.patch 1671 RMD160 6fcee07ea40289b40c43bce5bee88b282ae536f4 SHA1 34535d5dc17cf96a4605a82105ec41e27c97c94c SHA256 e9cbb4c9c58689116d09827a5a50f38a7e24e735277dd595d3ffa981c24e6c7d
AUX 1.3.0.0-ramdac.patch 2736 RMD160 6a57be8c314989c110f1dd82563fa730512b6a5f SHA1 5da7c2caecd8c47e77d10c3967bcc22c481087fe SHA256 29dd3f3de269b1d9d24628dab293246f2deda4e8bd4018f20adf74584d2ca92f
AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
-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 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
@@ -42,13 +41,11 @@ AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b0
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
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 xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.6.5.ebuild 6897 RMD160 70aa46bdd55ff4517d10517f2d26b2fb9495d59c SHA1 4835b5c31a380fb573404123a7045abd5a902713 SHA256 f503bf6f5d693c0533af3e1cb88472a3b1132d28072287b8309e7f3d9021cabd
EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c79664ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a9958384cc851512a108af346a8169771df4940d94d0f45f07f401262676d853
EBUILD xorg-server-1.8.2.ebuild 8241 RMD160 2fa4126a8c52b3f8be9ae45b0d087cfe669e4d1d SHA1 8fea1dede1e3bcd9c5a0729920e3a6750043251a SHA256 52f9a3925448037b9e68aa538c238401c07b0ce19850371dd925a46e905da37a
EBUILD xorg-server-1.9.0.ebuild 7853 RMD160 a5e96a4414e17fecde10ab9b16e8d726d909c140 SHA1 00c4a70acc477aa1cf95ae9eef9af7930efeed9a SHA256 9c4b389edecbd3baeef6c46bd525ae3434a02ad2d816c47f27f70165ec40d76f
diff --git a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch b/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
deleted file mode 100644
index eb3ec7d..0000000
--- a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c6753b750d76564bee02b317d10a496d0ced4274 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Fri, 4 Sep 2009 23:05:29 +0200
-Subject: [PATCH] dix: append "built-ins" to the font path in SetDefaultFontPath
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
-a "fixed" font go away but only Xorg could use the built-ins fonts by
-default.
-
-With this commit, all DDXs get "built-ins" appended to their FontPath, not
-just Xorg.
-
-Tested with Xorg, Xvfb and Xnest.
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- dix/dixfonts.c | 20 ++++++++++++++++++--
- hw/xfree86/common/xf86Config.c | 16 ----------------
- 2 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index 719bca4..4d69025 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1818,6 +1818,9 @@ SetDefaultFontPath(char *path)
- unsigned char *cp,
- *pp,
- *nump,
-+ *temp_path,
-+ *start,
-+ *end,
- *newpath;
- int num = 1,
- len,
-@@ -1825,12 +1828,24 @@ SetDefaultFontPath(char *path)
- size = 0,
- bad;
-
-+ /* ensure temp_path contains "built-ins" */
-+ start = strstr(path, "built-ins");
-+ end = start + strlen("built-ins");
-+ if (start == NULL ||
-+ !((start == path || start[-1] == ',') && (!*end || *end == ','))) {
-+ temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
-+ } else {
-+ temp_path = Xstrdup(path);
-+ }
-+ if (!temp_path)
-+ return BadAlloc;
-+
- /* get enough for string, plus values -- use up commas */
-- len = strlen(path) + 1;
-+ len = strlen(temp_path) + 1;
- nump = cp = newpath = (unsigned char *) xalloc(len);
- if (!newpath)
- return BadAlloc;
-- pp = (unsigned char *) path;
-+ pp = (unsigned char *) temp_path;
- cp++;
- while (*pp) {
- if (*pp == ',') {
-@@ -1849,6 +1864,7 @@ SetDefaultFontPath(char *path)
- err = SetFontPathElements(num, newpath, &bad, TRUE);
-
- xfree(newpath);
-+ xfree(temp_path);
-
- return err;
- }
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 9376119..ddf4745 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -612,22 +612,6 @@ configFiles(XF86ConfFilesPtr fileconf)
- pathFrom = X_DEFAULT;
- temp_path = defaultFontPath ? defaultFontPath : "";
-
-- /* ensure defaultFontPath contains "built-ins" */
-- start = strstr(temp_path, "built-ins");
-- end = start + strlen("built-ins");
-- if (start == NULL ||
-- !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
-- defaultFontPath = Xprintf("%s%sbuilt-ins",
-- temp_path, *temp_path ? "," : "");
-- if (must_copy == TRUE) {
-- if (defaultFontPath != NULL) {
-- must_copy = FALSE;
-- }
-- } else {
-- /* already made a copy of the font path */
-- xfree(temp_path);
-- }
-- }
- /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
- temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
- defaultFontPath = xf86ValidateFontPath(temp_path);
---
-1.6.4.2
-
diff --git a/x11-base/xorg-server/xorg-server-1.6.5.ebuild b/x11-base/xorg-server/xorg-server-1.6.5.ebuild
deleted file mode 100644
index 18c94f6..0000000
--- a/x11-base/xorg-server/xorg-server-1.6.5.ebuild
+++ /dev/null
@@ -1,255 +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.5.ebuild,v 1.1 2009/10/12 08:19:07 remi 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"
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-# )
-
-PATCHES=(
- "${FILESDIR}/${P}-loongson.patch"
- "${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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: fa4ba6d92f7a8f79ed685fce088f3ade3bb82b6d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 23:06:14 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 23:06:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=fa4ba6d9
Remove ancient xorg-server-1.4 version
---
x11-base/xorg-server/Manifest | 23 -
.../files/1.3.0.0-use-proc-instead-of-sys.patch | 16 -
...VE-2007-5760-XFree86-Misc-extension-out-o.patch | 27 -
...VE-2007-6428-TOG-cup-extension-memory-cor.patch | 26 -
...VE-2007-6427-Xinput-extension-memory-corr.patch | 262 ---------
...VE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch | 210 -------
...VE-2008-0006-PCF-Font-parser-buffer-overf.patch | 30 -
...r-CVE-2007-5958-File-existence-disclosure.patch | 34 --
...6429-Don-t-spuriously-reject-8bpp-shm-pix.patch | 85 ---
...6429-Always-test-for-size-offset-wrapping.patch | 44 --
...-grab-and-focus-state-for-a-window-when-r.patch | 40 --
.../files/1.4-document-new-font-catalogs.patch | 132 -----
.../files/1.4-dont-hang-openoffice.patch | 71 ---
x11-base/xorg-server/files/1.4-fix-dmx-build.patch | 19 -
x11-base/xorg-server/files/1.4-fix-dmx-link.patch | 12 -
.../xorg-server/files/1.4-fix-xephyr-link.patch | 25 -
.../xorg-server/files/1.4-fix-xprint-build.patch | 22 -
.../xorg-server/files/1.4-fix-xprint-link.patch | 13 -
x11-base/xorg-server/files/1.4-ia64.patch | 49 --
.../files/1.4.0.90-clean-generated-files.patch | 19 -
.../files/xorg-server-1.4-loongson.patch | 51 --
.../xorg-server/xorg-server-1.4.0.90-r3.ebuild | 604 --------------------
22 files changed, 0 insertions(+), 1814 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f61c72e..4a98c1f 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -10,28 +10,9 @@ AUX 1.3.0.0-fix-randr-resizing.patch 1986 RMD160 7fe971a41e5659876596b921d33d316
AUX 1.3.0.0-fix-xephyr-amd64-segfault.patch 1382 RMD160 03595cb965623383f8429560c551e13f882bf1b9 SHA1 693e64678100480135c3853590481b20342e9eae SHA256 32cd35d353ba2568d98125328574a0d2c021637a367dd3de616e02a2f8fdd4b9
AUX 1.3.0.0-fix-xkb-openoffice-hangs.patch 1671 RMD160 6fcee07ea40289b40c43bce5bee88b282ae536f4 SHA1 34535d5dc17cf96a4605a82105ec41e27c97c94c SHA256 e9cbb4c9c58689116d09827a5a50f38a7e24e735277dd595d3ffa981c24e6c7d
AUX 1.3.0.0-ramdac.patch 2736 RMD160 6a57be8c314989c110f1dd82563fa730512b6a5f SHA1 5da7c2caecd8c47e77d10c3967bcc22c481087fe SHA256 29dd3f3de269b1d9d24628dab293246f2deda4e8bd4018f20adf74584d2ca92f
-AUX 1.3.0.0-use-proc-instead-of-sys.patch 686 RMD160 26e9bee2d1be197fa456efdd5be16a8087b947cb SHA1 44112c3643d026f318850f2b763f3ca3952bb686 SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54
AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 RMD160 595728d2bccd4c254e4ee8074da1fb8dde8f1e2e SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
-AUX 1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch 980 RMD160 0e7739e5aa846db9485a2e9c1a19a9b43770995a SHA1 5ffb6b3bcf5e40d3d51c466bf2c077673341793d SHA256 d8f41a4df64818fdc97db3f194e2fece32915f04b824efb96f577cdf31372a64
-AUX 1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch 747 RMD160 3e9c54bd0ca801a94540c069a09896538d79697e SHA1 894bce69645b8353e0386b26f594e0e3ccda7c9c SHA256 4fec6a5b20c35ac7a8a34bf9851fc760bedc27e3e83b9de57f0ac6b3c2766e9e
-AUX 1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7342 RMD160 cecc6e6cf0dfbdc1aa74149a7df307961fe77250 SHA1 e24460f9477072716083e6483deda46c0034ad8c SHA256 81538f7c1ebb3e002a5777e91aeff4befa51b5e659fcd91c9f23c68d62121336
-AUX 1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch 6830 RMD160 d5573b0af87a1b4fbea7e63fb1a161bfa56b1103 SHA1 8634b48c7a655a3ccd61fda78deaa54090c82ce3 SHA256 7f38a704931f515a68a460abccfd0fed15d51915cbef9f8ed9d1e0ccdd2cf14d
-AUX 1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch 912 RMD160 c931db35d87a94a89db7fdfd9826565b94b8803f SHA1 e258c3f9c03fc92473daf8ae18ee0d0fa47e26ac SHA256 39ec99f6643b73951a5a5ed14c54c227885b7411da76ecec3c923fd8189c6364
-AUX 1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 870 RMD160 adbc9a110c0e7aef884f5ea9c61148688ac441e5 SHA1 a9c8e1bb513073304d465ad0079c1dd452d053d6 SHA256 d1545329c64f492acc9935df68b31d513d3f1ddcfc5f821224a33761cf4b5c81
-AUX 1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch 2594 RMD160 0197f2ef4e2734e3f82d94fb9aefd6b77b287c8a SHA1 d2d3666ac30bc5b541b8bf30fe5de157dbb79c9a SHA256 69c8eb09cbf978bbdaef1ae9537778bcf40c7c67bbfeab0b5753e5538147a4ce
-AUX 1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch 1332 RMD160 0dc6a97eb653306d4f454707f274644d8564fbf2 SHA1 295bd873f26d01094b458449a99ffa708b5cc45d SHA256 f6c5949c3843f2cda8eb19ec2cd252ee53a3868ab0bc886272b5e95db81d39c2
-AUX 1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch 1353 RMD160 31bc8d452d1959f80580555489007fcc77d8780b SHA1 1a1c33a8097e301623d6ec7abebb23b3ac87c570 SHA256 2641e629e83cfa536cc7e765fdcc79bae217deddf892349bbde17a4fb6c76059
-AUX 1.4-document-new-font-catalogs.patch 4540 RMD160 92e450666e840fefb8604dc664ce0276e01c28d7 SHA1 6bf78fde99494b047658836adfa35b5d75224214 SHA256 8a73f0a01235c6cb1acefa09a726f68089fc10c1d68ffdf2e1b57091caafbbfd
-AUX 1.4-dont-hang-openoffice.patch 2235 RMD160 cc208574ad07d806f71fc6be79796594601c0894 SHA1 f82487057211b699bdca0874f5ec9bbec9ccdf40 SHA256 bbd05d1ff0e7f97b7ec11c7ebdd32cdcf8984b69d1dc87b46cc66133895e2644
-AUX 1.4-fix-dmx-build.patch 509 RMD160 699daf15f9ff4878a1583acaf5bc7c01afb5904c SHA1 0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf SHA256 4a01681656d09780dd15696804ce8210a4a5324bf63c33a7692e8971fbeb1843
-AUX 1.4-fix-dmx-link.patch 363 RMD160 429ce2827b9a5047ea7ad5ca4ec93740e85099af SHA1 41f686ef462e179f6c7e73a1babb7c0f2312d337 SHA256 50fbbe7391a354de2fa321944b921193e1097eaed4d775e343687f4a1a33a002
AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
-AUX 1.4-fix-xephyr-link.patch 850 RMD160 574c9e4b38ceaf5964bfcd9020842b027f22cac1 SHA1 352c55be4b91b29c84b192d806a90834d887fc22 SHA256 89761f041d694db9891a5a72ff0ee1066d08c2d19a5cec448482fb2b427d2c10
-AUX 1.4-fix-xprint-build.patch 413 RMD160 79275b83b2a41bd4a7488011a9d2b93d6ec0400f SHA1 e2611665d555d5dc93ede0ab4beb9acb16b6b5aa SHA256 183a6c7d6f506dcd637a10057421811901035ed802c27cdd6bc6869924337d40
-AUX 1.4-fix-xprint-link.patch 588 RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c6 SHA1 67f057700577562b6260d07a8e82ab2dad117a4c SHA256 f6f7a67c93dce63a6f16ccb2182fbd861c7627d071225251df4a733412eda7f0
AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
-AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
-AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0bed70eabe6a2fa SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0
AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
AUX 1.5.3-builtin-fonts.patch 646 RMD160 29bf7a3ba112621f9d8e645c0c9129caee318735 SHA1 f1cf5a1b525e4165c57271d11edf10087b2aeb7e SHA256 614c214118be05452cb81b8959a372961a6a8e4474cb69bcee50614cc04e1f9d
@@ -46,7 +27,6 @@ AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e
AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
-AUX xorg-server-1.4-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
AUX xorg-server-1.5.2-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
AUX xorg-server-1.5.3-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
AUX xorg-server-1.6.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
@@ -69,8 +49,6 @@ AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b0
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
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.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.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
@@ -79,7 +57,6 @@ DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef4
DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.4.0.90-r3.ebuild 19571 RMD160 2a18b5ff8b87141e0a6f06e3589d71e0a1f934dd SHA1 6fd1e7f78a2faefbc13f1ad5c3a8f77d121a458b SHA256 4f3375321e37883fa765105cbb7056f90e6d2d6e74d4ab06072a31d635618781
EBUILD xorg-server-1.5.3.ebuild 16703 RMD160 97d1d64120e5c7a6c40236894880bcce0e27e6dd SHA1 0abc2d7b74dc01ccfdd765dd6d73e73d2258a887 SHA256 3c7aa222bb7aa967f6c0cd2e8f03b542dfb619599c5f3c36a07ea8b37392a257
EBUILD xorg-server-1.6.5.ebuild 6897 RMD160 70aa46bdd55ff4517d10517f2d26b2fb9495d59c SHA1 4835b5c31a380fb573404123a7045abd5a902713 SHA256 f503bf6f5d693c0533af3e1cb88472a3b1132d28072287b8309e7f3d9021cabd
EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c79664ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a9958384cc851512a108af346a8169771df4940d94d0f45f07f401262676d853
diff --git a/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
deleted file mode 100644
index 600d0ba..0000000
--- a/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=167052 attachment #126176
-
-Fix multi-domain systems including sparc and pegasos ppc
-
-diff -Nura xorg-server-1.3.0.0/hw/xfree86/os-support/bus/linuxPci.c xorg-server-1.3.0.0-nosysfs/hw/xfree86/os-support/bus/linuxPci.c
---- xorg-server-1.3.0.0/hw/xfree86/os-support/bus/linuxPci.c 2006-11-16 15:01:25.000000000 -0300
-+++ xorg-server-1.3.0.0-nosysfs/hw/xfree86/os-support/bus/linuxPci.c 2007-07-27 13:48:58.000000000 -0300
-@@ -148,7 +148,7 @@
- int domain, bus, dev, func;
- char file[64];
- struct stat ignored;
-- static int is26 = -1;
-+ static int is26 = 0;
-
- domain = PCI_DOM_FROM_TAG(tag);
- bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
diff --git a/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch b/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
deleted file mode 100644
index 54dead0..0000000
--- a/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 59a3b83922c810316a374a19484b24901c7437ae Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:26:41 +0100
-Subject: [PATCH] Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
-
----
- hw/xfree86/common/xf86MiscExt.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c
-index c1b9c60..40c196a 100644
---- a/hw/xfree86/common/xf86MiscExt.c
-+++ b/hw/xfree86/common/xf86MiscExt.c
-@@ -548,6 +548,10 @@ MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval,
- {
- ScrnInfoPtr pScr = xf86Screens[scrnIndex];
-
-+ /* should check this in the protocol, but xf86NumScreens isn't exported */
-+ if (scrnIndex >= xf86NumScreens)
-+ return BadValue;
-+
- if (*pScr->HandleMessage == NULL)
- return BadImplementation;
- return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr);
---
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch b/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
deleted file mode 100644
index a72ce3c..0000000
--- a/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4848d49d05a318559afe7a17a19ba055947ee1f5 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:28:03 +0100
-Subject: [PATCH] Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
-
----
- Xext/cup.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/Xext/cup.c b/Xext/cup.c
-index 6bfa278..781b9ce 100644
---- a/Xext/cup.c
-+++ b/Xext/cup.c
-@@ -196,6 +196,9 @@ int ProcGetReservedColormapEntries(
-
- REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq);
-
-+ if (stuff->screen >= screenInfo.numScreens)
-+ return BadValue;
-+
- #ifndef HAVE_SPECIAL_DESKTOP_COLORS
- citems[CUP_BLACK_PIXEL].pixel =
- screenInfo.screens[stuff->screen]->blackPixel;
---
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
deleted file mode 100644
index ffbf8ac..0000000
--- a/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From d244c8272e0ac47c41a9416e37293903b842a78b Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:27:34 +0100
-Subject: [PATCH] Fix for CVE-2007-6427 - Xinput extension memory corruption.
-
----
- Xi/chgfctl.c | 7 +------
- Xi/chgkmap.c | 13 ++++++-------
- Xi/chgprop.c | 10 +++-------
- Xi/grabdev.c | 12 +++++-------
- Xi/grabdevb.c | 10 +++-------
- Xi/grabdevk.c | 9 ++-------
- Xi/selectev.c | 11 ++++-------
- Xi/sendexev.c | 14 ++++++++------
- 8 files changed, 32 insertions(+), 54 deletions(-)
-
-diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
-index 2e0e13c..235d659 100644
---- a/Xi/chgfctl.c
-+++ b/Xi/chgfctl.c
-@@ -327,18 +327,13 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
- xStringFeedbackCtl * f)
- {
- char n;
-- long *p;
- int i, j;
- KeySym *syms, *sup_syms;
-
- syms = (KeySym *) (f + 1);
- if (client->swapped) {
- swaps(&f->length, n); /* swapped num_keysyms in calling proc */
-- p = (long *)(syms);
-- for (i = 0; i < f->num_keysyms; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ SwapLongs((CARD32 *) syms, f->num_keysyms);
- }
-
- if (f->num_keysyms > s->ctrl.max_symbols) {
-diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
-index eac520f..f8f85bc 100644
---- a/Xi/chgkmap.c
-+++ b/Xi/chgkmap.c
-@@ -79,18 +79,14 @@ int
- SProcXChangeDeviceKeyMapping(ClientPtr client)
- {
- char n;
-- long *p;
-- int i, count;
-+ unsigned int count;
-
- REQUEST(xChangeDeviceKeyMappingReq);
- swaps(&stuff->length, n);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
-- p = (long *)&stuff[1];
- count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-- for (i = 0; i < count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), count);
- return (ProcXChangeDeviceKeyMapping(client));
- }
-
-@@ -106,10 +102,13 @@ ProcXChangeDeviceKeyMapping(ClientPtr client)
- int ret;
- unsigned len;
- DeviceIntPtr dev;
-+ unsigned int count;
-
- REQUEST(xChangeDeviceKeyMappingReq);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
-
-+ count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
- dev = LookupDeviceIntRec(stuff->deviceid);
- if (dev == NULL) {
- SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
-diff --git a/Xi/chgprop.c b/Xi/chgprop.c
-index 59a93c6..21bda5b 100644
---- a/Xi/chgprop.c
-+++ b/Xi/chgprop.c
-@@ -81,19 +81,15 @@ int
- SProcXChangeDeviceDontPropagateList(ClientPtr client)
- {
- char n;
-- long *p;
-- int i;
-
- REQUEST(xChangeDeviceDontPropagateListReq);
- swaps(&stuff->length, n);
- REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
- swapl(&stuff->window, n);
- swaps(&stuff->count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
-+ stuff->count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
- return (ProcXChangeDeviceDontPropagateList(client));
- }
-
-diff --git a/Xi/grabdev.c b/Xi/grabdev.c
-index e2809ef..d0b4ae7 100644
---- a/Xi/grabdev.c
-+++ b/Xi/grabdev.c
-@@ -82,8 +82,6 @@ int
- SProcXGrabDevice(ClientPtr client)
- {
- char n;
-- long *p;
-- int i;
-
- REQUEST(xGrabDeviceReq);
- swaps(&stuff->length, n);
-@@ -91,11 +89,11 @@ SProcXGrabDevice(ClientPtr client)
- swapl(&stuff->grabWindow, n);
- swapl(&stuff->time, n);
- swaps(&stuff->event_count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->event_count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+
-+ if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
-+ return BadLength;
-+
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
-
- return (ProcXGrabDevice(client));
- }
-diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
-index df62d0c..18db1f7 100644
---- a/Xi/grabdevb.c
-+++ b/Xi/grabdevb.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceButton(ClientPtr client)
- {
- char n;
-- long *p;
-- int i;
-
- REQUEST(xGrabDeviceButtonReq);
- swaps(&stuff->length, n);
-@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(ClientPtr client)
- swapl(&stuff->grabWindow, n);
- swaps(&stuff->modifiers, n);
- swaps(&stuff->event_count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->event_count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
-+ stuff->event_count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
-
- return (ProcXGrabDeviceButton(client));
- }
-diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
-index b74592f..429b2f7 100644
---- a/Xi/grabdevk.c
-+++ b/Xi/grabdevk.c
-@@ -80,8 +80,6 @@ int
- SProcXGrabDeviceKey(ClientPtr client)
- {
- char n;
-- long *p;
-- int i;
-
- REQUEST(xGrabDeviceKeyReq);
- swaps(&stuff->length, n);
-@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(ClientPtr client)
- swapl(&stuff->grabWindow, n);
- swaps(&stuff->modifiers, n);
- swaps(&stuff->event_count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->event_count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
- return (ProcXGrabDeviceKey(client));
- }
-
-diff --git a/Xi/selectev.c b/Xi/selectev.c
-index d52db1b..19415c5 100644
---- a/Xi/selectev.c
-+++ b/Xi/selectev.c
-@@ -131,19 +131,16 @@ int
- SProcXSelectExtensionEvent(ClientPtr client)
- {
- char n;
-- long *p;
-- int i;
-
- REQUEST(xSelectExtensionEventReq);
- swaps(&stuff->length, n);
- REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
- swapl(&stuff->window, n);
- swaps(&stuff->count, n);
-- p = (long *)&stuff[1];
-- for (i = 0; i < stuff->count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
-+ stuff->count * sizeof(CARD32));
-+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
-+
- return (ProcXSelectExtensionEvent(client));
- }
-
-diff --git a/Xi/sendexev.c b/Xi/sendexev.c
-index eac9abe..9803cf3 100644
---- a/Xi/sendexev.c
-+++ b/Xi/sendexev.c
-@@ -83,7 +83,7 @@ int
- SProcXSendExtensionEvent(ClientPtr client)
- {
- char n;
-- long *p;
-+ CARD32 *p;
- int i;
- xEvent eventT;
- xEvent *eventP;
-@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(ClientPtr client)
- REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
- swapl(&stuff->destination, n);
- swaps(&stuff->count, n);
-+
-+ if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
-+ (stuff->num_events * (sizeof(xEvent) >> 2)))
-+ return BadLength;
-+
- eventP = (xEvent *) & stuff[1];
- for (i = 0; i < stuff->num_events; i++, eventP++) {
- proc = EventSwapVector[eventP->u.u.type & 0177];
-@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(ClientPtr client)
- *eventP = eventT;
- }
-
-- p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
-- for (i = 0; i < stuff->count; i++) {
-- swapl(p, n);
-- p++;
-- }
-+ p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
-+ SwapLongs(p, stuff->count);
- return (ProcXSendExtensionEvent(client));
- }
-
---
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch b/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
deleted file mode 100644
index ac66b4d..0000000
--- a/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 8b14f7b74284900b95a319ec80c4333e63af2296 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:28:42 +0100
-Subject: [PATCH] Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
-
----
- Xext/EVI.c | 15 ++++++++++++++-
- Xext/sampleEVI.c | 29 ++++++++++++++++++++++++-----
- Xext/shm.c | 46 ++++++++++++++++++++++++++++++++++++++--------
- 3 files changed, 76 insertions(+), 14 deletions(-)
-
-diff --git a/Xext/EVI.c b/Xext/EVI.c
-index 8fe3481..13bd32a 100644
---- a/Xext/EVI.c
-+++ b/Xext/EVI.c
-@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/XEVIstr.h>
- #include "EVIstruct.h"
- #include "modinit.h"
-+#include "scrnintstr.h"
-
- #if 0
- static unsigned char XEVIReqCode = 0;
-@@ -87,10 +88,22 @@ ProcEVIGetVisualInfo(ClientPtr client)
- {
- REQUEST(xEVIGetVisualInfoReq);
- xEVIGetVisualInfoReply rep;
-- int n, n_conflict, n_info, sz_info, sz_conflict;
-+ int i, n, n_conflict, n_info, sz_info, sz_conflict;
- VisualID32 *conflict;
-+ unsigned int total_visuals = 0;
- xExtendedVisualInfo *eviInfo;
- int status;
-+
-+ /*
-+ * do this first, otherwise REQUEST_FIXED_SIZE can overflow. we assume
-+ * here that you don't have more than 2^32 visuals over all your screens;
-+ * this seems like a safe assumption.
-+ */
-+ for (i = 0; i < screenInfo.numScreens; i++)
-+ total_visuals += screenInfo.screens[i]->numVisuals;
-+ if (stuff->n_visual > total_visuals)
-+ return BadValue;
-+
- REQUEST_FIXED_SIZE(xEVIGetVisualInfoReq, stuff->n_visual * sz_VisualID32);
- status = eviPriv->getVisualInfo((VisualID32 *)&stuff[1], (int)stuff->n_visual,
- &eviInfo, &n_info, &conflict, &n_conflict);
-diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
-index 7508aa7..b871bfd 100644
---- a/Xext/sampleEVI.c
-+++ b/Xext/sampleEVI.c
-@@ -34,6 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/XEVIstr.h>
- #include "EVIstruct.h"
- #include "scrnintstr.h"
-+
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- static int sampleGetVisualInfo(
- VisualID32 *visual,
- int n_visual,
-@@ -42,24 +49,36 @@ static int sampleGetVisualInfo(
- VisualID32 **conflict_rn,
- int *n_conflict_rn)
- {
-- int max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
-+ unsigned int max_sz_evi;
- VisualID32 *temp_conflict;
- xExtendedVisualInfo *evi;
-- int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
-+ unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
- register int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
-- *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
-- if (!*evi_rn)
-- return BadAlloc;
-+
-+ if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens))
-+ return BadAlloc;
-+ max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
-+
- for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
- if (screenInfo.screens[scrI]->numVisuals > max_visuals)
- max_visuals = screenInfo.screens[scrI]->numVisuals;
- }
-+
-+ if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens
-+ * max_visuals))
-+ return BadAlloc;
- max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals;
-+
-+ *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
-+ if (!*evi_rn)
-+ return BadAlloc;
-+
- temp_conflict = (VisualID32 *)xalloc(max_sz_conflict);
- if (!temp_conflict) {
- xfree(*evi_rn);
- return BadAlloc;
- }
-+
- for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
- for (visualI = 0; visualI < n_visual; visualI++) {
- evi[sz_evi].core_visual_id = visual[visualI];
-diff --git a/Xext/shm.c b/Xext/shm.c
-index ac587be..5633be9 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -711,6 +711,8 @@ ProcPanoramiXShmCreatePixmap(
- int i, j, result, rc;
- ShmDescPtr shmdesc;
- REQUEST(xShmCreatePixmapReq);
-+ unsigned int width, height, depth;
-+ unsigned long size;
- PanoramiXRes *newPix;
-
- REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
-@@ -724,11 +726,26 @@ ProcPanoramiXShmCreatePixmap(
- return rc;
-
- VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
-- if (!stuff->width || !stuff->height)
-+
-+ width = stuff->width;
-+ height = stuff->height;
-+ depth = stuff->depth;
-+ if (!width || !height || !depth)
- {
- client->errorValue = 0;
- return BadValue;
- }
-+ if (width > 32767 || height > 32767)
-+ return BadAlloc;
-+ size = PixmapBytePad(width, depth) * height;
-+ if (sizeof(size) == 4) {
-+ if (size < width * height)
-+ return BadAlloc;
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-+ }
-+
- if (stuff->depth != 1)
- {
- pDepth = pDraw->pScreen->allowedDepths;
-@@ -739,9 +756,7 @@ ProcPanoramiXShmCreatePixmap(
- return BadValue;
- }
- CreatePmap:
-- VERIFY_SHMSIZE(shmdesc, stuff->offset,
-- PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
-- client);
-+ VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-
- if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
- return BadAlloc;
-@@ -1040,6 +1055,8 @@ ProcShmCreatePixmap(client)
- register int i, rc;
- ShmDescPtr shmdesc;
- REQUEST(xShmCreatePixmapReq);
-+ unsigned int width, height, depth;
-+ unsigned long size;
-
- REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
- client->errorValue = stuff->pid;
-@@ -1052,11 +1069,26 @@ ProcShmCreatePixmap(client)
- return rc;
-
- VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
-- if (!stuff->width || !stuff->height)
-+
-+ width = stuff->width;
-+ height = stuff->height;
-+ depth = stuff->depth;
-+ if (!width || !height || !depth)
- {
- client->errorValue = 0;
- return BadValue;
- }
-+ if (width > 32767 || height > 32767)
-+ return BadAlloc;
-+ size = PixmapBytePad(width, depth) * height;
-+ if (sizeof(size) == 4) {
-+ if (size < width * height)
-+ return BadAlloc;
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-+ }
-+
- if (stuff->depth != 1)
- {
- pDepth = pDraw->pScreen->allowedDepths;
-@@ -1067,9 +1099,7 @@ ProcShmCreatePixmap(client)
- return BadValue;
- }
- CreatePmap:
-- VERIFY_SHMSIZE(shmdesc, stuff->offset,
-- PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
-- client);
-+ VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
- pDraw->pScreen, stuff->width,
- stuff->height, stuff->depth,
---
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch b/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
deleted file mode 100644
index bb09eb8..0000000
--- a/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f09b8007e7f6e60e0b9c9665ec632b578ae08b6f Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 15:29:06 +0100
-Subject: [PATCH] Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
-
----
- dix/dixfonts.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index c21b3ec..7bb2404 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -325,6 +325,13 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
- err = BadFontName;
- goto bail;
- }
-+ /* check values for firstCol, lastCol, firstRow, and lastRow */
-+ if (pfont->info.firstCol > pfont->info.lastCol ||
-+ pfont->info.firstRow > pfont->info.lastRow ||
-+ pfont->info.lastCol - pfont->info.firstCol > 255) {
-+ err = AllocError;
-+ goto bail;
-+ }
- if (!pfont->fpe)
- pfont->fpe = fpe;
- pfont->refcnt++;
---
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
deleted file mode 100644
index 61cc4da..0000000
--- a/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 19b95cdd1d14a1e7d1abba1880ab023c96f19bf5 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@bluenote.herrb.com>
-Date: Thu, 17 Jan 2008 17:03:39 +0100
-Subject: [PATCH] Fix for CVE-2007-5958 - File existence disclosure.
-
----
- Xext/security.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Xext/security.c b/Xext/security.c
-index ba057de..e9d48c9 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -1563,7 +1563,7 @@ SecurityLoadPropertyAccessList(void)
- if (!SecurityPolicyFile)
- return;
-
-- f = fopen(SecurityPolicyFile, "r");
-+ f = Fopen(SecurityPolicyFile, "r");
- if (!f)
- {
- ErrorF("error opening security policy file %s\n",
-@@ -1646,7 +1646,7 @@ SecurityLoadPropertyAccessList(void)
- }
- #endif /* PROPDEBUG */
-
-- fclose(f);
-+ Fclose(f);
- } /* SecurityLoadPropertyAccessList */
-
-
---
-1.5.3.5
-
diff --git a/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch b/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
deleted file mode 100644
index 903f2be..0000000
--- a/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From e9fa7c1c88a8130a48f772c92b186b8b777986b5 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 18 Jan 2008 14:41:20 -0500
-Subject: [PATCH] CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
-
-Move size validation after depth validation, and only validate size if
-the bpp of the pixmap format is > 8. If bpp < 8 then we're already
-protected from overflow by the width and height checks.
----
- Xext/shm.c | 36 ++++++++++++++++++++----------------
- 1 files changed, 20 insertions(+), 16 deletions(-)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index c545e49..e46f6fc 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -783,14 +783,6 @@ ProcPanoramiXShmCreatePixmap(
- }
- if (width > 32767 || height > 32767)
- return BadAlloc;
-- size = PixmapBytePad(width, depth) * height;
-- if (sizeof(size) == 4) {
-- if (size < width * height)
-- return BadAlloc;
-- /* thankfully, offset is unsigned */
-- if (stuff->offset + size < size)
-- return BadAlloc;
-- }
-
- if (stuff->depth != 1)
- {
-@@ -801,7 +793,17 @@ ProcPanoramiXShmCreatePixmap(
- client->errorValue = stuff->depth;
- return BadValue;
- }
-+
- CreatePmap:
-+ size = PixmapBytePad(width, depth) * height;
-+ if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
-+ if (size < width * height)
-+ return BadAlloc;
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-+ }
-+
- VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-
- if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
-@@ -1126,14 +1128,6 @@ ProcShmCreatePixmap(client)
- }
- if (width > 32767 || height > 32767)
- return BadAlloc;
-- size = PixmapBytePad(width, depth) * height;
-- if (sizeof(size) == 4) {
-- if (size < width * height)
-- return BadAlloc;
-- /* thankfully, offset is unsigned */
-- if (stuff->offset + size < size)
-- return BadAlloc;
-- }
-
- if (stuff->depth != 1)
- {
-@@ -1144,7 +1138,17 @@ ProcShmCreatePixmap(client)
- client->errorValue = stuff->depth;
- return BadValue;
- }
-+
- CreatePmap:
-+ size = PixmapBytePad(width, depth) * height;
-+ if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
-+ if (size < width * height)
-+ return BadAlloc;
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-+ }
-+
- VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
- pDraw->pScreen, stuff->width,
---
-1.5.3.8
-
diff --git a/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch b/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
deleted file mode 100644
index 6e5baf1..0000000
--- a/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161 Mon Sep 17 00:00:00 2001
-From: Matthias Hopf <mhopf@suse.de>
-Date: Mon, 21 Jan 2008 16:13:21 +0100
-Subject: [PATCH] CVE-2007-6429: Always test for size+offset wrapping.
-
----
- Xext/shm.c | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index e46f6fc..a7a1ecf 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -799,10 +799,10 @@ CreatePmap:
- if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
- if (size < width * height)
- return BadAlloc;
-- /* thankfully, offset is unsigned */
-- if (stuff->offset + size < size)
-- return BadAlloc;
- }
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-
- VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-
-@@ -1144,10 +1144,10 @@ CreatePmap:
- if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
- if (size < width * height)
- return BadAlloc;
-- /* thankfully, offset is unsigned */
-- if (stuff->offset + size < size)
-- return BadAlloc;
- }
-+ /* thankfully, offset is unsigned */
-+ if (stuff->offset + size < size)
-+ return BadAlloc;
-
- VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
- pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
---
-1.5.3.8
-
diff --git a/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch b/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
deleted file mode 100644
index 3a8dbd9..0000000
--- a/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
-Date: Wed, 16 Jan 2008 20:24:11 -0500
-Subject: [PATCH] Don't break grab and focus state for a window when redirecting it.
-
-Composite uses an unmap/map cycle to trigger backing pixmap allocation
-and cliprect recomputation when a window is redirected or unredirected.
-To avoid protocol visible side effects, map and unmap events are
-disabled temporarily. However, when a window is unmapped it is also
-removed from grabs and loses focus, but these state changes are not
-disabled.
-
-This change supresses the unmap side effects during the composite
-unmap/map cycle and fixes this bug:
-
- http://bugzilla.gnome.org/show_bug.cgi?id=488264
-
-where compiz would cause gnome-screensaver to lose its grab when
-compiz unredirects the fullscreen lock window.
----
- dix/window.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/dix/window.c b/dix/window.c
-index 33cf76b..1ccf126 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -2993,7 +2993,8 @@ UnrealizeTree(
- }
- #endif
- (* Unrealize)(pChild);
-- DeleteWindowFromAnyEvents(pChild, FALSE);
-+ if (MapUnmapEventsEnabled(pWin))
-+ DeleteWindowFromAnyEvents(pChild, FALSE);
- if (pChild->viewable)
- {
- #ifdef DO_SAVE_UNDERS
---
-1.5.3.8
-
diff --git a/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch b/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
deleted file mode 100644
index e9a6aad..0000000
--- a/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
-index aac3b51..c9ee019 100644
---- a/doc/Xserver.man.pre
-+++ b/doc/Xserver.man.pre
-@@ -508,8 +508,7 @@ its parent process after it has set up the various connection schemes.
- \fIXdm\fP uses this feature to recognize when connecting to the server
- is possible.
- .SH FONTS
--The X server
--can obtain fonts from directories and/or from font servers.
-+The X server can obtain fonts from directories and/or from font servers.
- The list of directories and font servers
- the X server uses when trying to open a font is controlled
- by the \fIfont path\fP.
-@@ -517,8 +516,45 @@ by the \fIfont path\fP.
- The default font path is
- __default_font_path__ .
- .LP
-+A special kind of directory can be specified using the the \fBcatalogue\fP:
-+prefix. Directories specified this way can contain symlinks pointing to the
-+real font directories. See the FONTPATH.D section for details.
-+.LP
- The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
- after the server has started.
-+.SH "FONTPATH.D"
-+You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
-+The directory specified after the catalogue: prefix will be scanned for symlinks
-+and each symlink destination will be added as a local fontfile FPE.
-+.PP
-+The symlink can be suffixed by attributes such as '\fBunscaled\fR', which
-+will be passed through to the underlying fontfile FPE. The only exception is
-+the newly introduced '\fBpri\fR' attribute, which will be used for ordering
-+the font paths specified by the symlinks.
-+
-+An example configuration:
-+
-+.nf
-+ 75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi
-+ ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript
-+ misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
-+ type1:pri=40 \-> /usr/share/X11/fonts/Type1
-+ type1:pri=50 \-> /usr/share/fonts/default/Type1
-+.fi
-+
-+This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
-+'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
-+the attribute unscaled etc. This is functionally equivalent to setting
-+the following font path:
-+
-+.nf
-+ /usr/share/X11/fonts/misc:unscaled,
-+ /usr/share/X11/fonts/75dpi:unscaled,
-+ /usr/share/X11/fonts/Type1,
-+ /usr/share/fonts/default/Type1,
-+ /usr/share/fonts/default/ghostscript
-+.fi
-+
- .SH FILES
- .TP 30
- .I /etc/X\fBn\fP.hosts
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index ce54ea9..54d8eaa 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -293,15 +293,50 @@ server searches for font databases.
- Multiple
- .B FontPath
- entries may be specified, and they will be concatenated to build up the
--fontpath used by the server. Font path elements may be either absolute
--directory paths, or a font server identifier.
-+fontpath used by the server. Font path elements can be absolute
-+directory paths, catalogue directories or a font server identifier. The
-+formats of the later two are explained below:
-+.PP
-+.RS 7
-+Catalogue directories:
-+.PP
-+.RS 4
-+Catalogue directories can be specified using the prefix \fBcatalogue:\fR
-+before the directory name. The directory can then be populated with
-+symlinks pointing to the real font directories, using the following
-+syntax in the symlink name:
-+.PP
-+.RS 4
-+.IR <identifier> : [attribute]: pri= <priority>
-+.RE
-+.PP
-+where
-+.I <identifier>
-+is an alphanumeric identifier,
-+.I [attribute]
-+is an attribute wich will be passed to the underlying FPE and
-+.I <priority>
-+is a number used to order the fontfile FPEs. Examples:
-+.PP
-+.RS 4
-+.nf
-+.I 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
-+.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript
-+.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
-+.fi
-+.PP
-+.RE .RE .RE
-+.PP
-+.RS 7
-+Font server identifiers:
-+.PP
-+.RS 4
- Font server identifiers have the form:
-+.RS 4
- .PP
--.RS 11
- .IR <trans> / <hostname> : <port\-number>
- .RE
- .PP
--.RS 7
- where
- .I <trans>
- is the transport type to use to connect to the font server (e.g.,
-@@ -313,10 +348,11 @@ for a TCP/IP connection),
- is the hostname of the machine running the font server, and
- .I <port\-number>
- is the port number that the font server is listening on (usually 7100).
-+.RE
- .PP
- When this entry is not specified in the config file, the server falls back
- to the compiled\-in default font path, which contains the following
--font path elements:
-+font path elements (which can be set inside a catalogue directory):
- .PP
- .RS 4
- .nf
diff --git a/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch b/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch
deleted file mode 100644
index 9ec79fd..0000000
--- a/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Title : x11-base/xorg-server-1.3 and 1.4 consumes 100% CPU, locking the ke
-yboard, apparently triggered by opening an OpenOffice pulldown menu
-Assignee : x11@gentoo.org
-Reported : 2007-10-26 03:51 0000
-Updated : 2007-11-07 07:21:56 0000
-Status : NEW
-URL : https://bugs.freedesktop.org/show_bug.cgi?id=10525
-Severity : critical
-Priority : P2
-Reporter : smw@alcor.concordia.ca
-Product : Gentoo Linux
-Component : Server
-Keywords : Inclusion
-CC : tetromino@gmail.com
-Comments : 3
-Attachments : 0
-URL : http://bugs.gentoo.org/show_bug.cgi?id=197104
-
-commit a5b8053606d6e786cdcf6734f271acc05f9cc588
-Author: Adam Jackson <ajax@benzedrine.nwnk.net>
-Date: Tue Sep 11 11:37:06 2007 -0400
-
- Ignore - not just block - SIGALRM around Popen()/Pclose().
-
- Because our "popen" implementation uses stdio, and because nobody's stdio
- library is capable of surviving signals, we need to make absolutely sure
- that we hide the SIGALRM from the smart scheduler. Otherwise, when you
- open a menu in openoffice, and it recompiles XKB to deal with the
- accelerators, and you popen xkbcomp because we suck, then the scheduler
- will tell you you're taking forever doing something stupid, and the
- wait() code will get confused, and input will hang and your CPU usage
- slams to 100%. Down, not across.
-
-diff --git a/os/utils.c b/os/utils.c
-index 3bb7dbe..afcaae4 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1720,6 +1720,8 @@ static struct pid {
- int pid;
- } *pidlist;
-
-+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
-+
- pointer
- Popen(char *command, char *type)
- {
-@@ -1741,11 +1743,15 @@ Popen(char *command, char *type)
- return NULL;
- }
-
-+ /* Ignore the smart scheduler while this is going on */
-+ old_alarm = signal(SIGALRM, SIG_IGN);
-+
- switch (pid = fork()) {
- case -1: /* error */
- close(pdes[0]);
- close(pdes[1]);
- xfree(cur);
-+ signal(SIGALRM, old_alarm);
- return NULL;
- case 0: /* child */
- if (setgid(getgid()) == -1)
-@@ -1921,6 +1927,8 @@ Pclose(pointer iop)
- /* allow EINTR again */
- OsReleaseSignals ();
-
-+ signal(SIGALRM, old_alarm);
-+
- return pid == -1 ? -1 : pstat;
- }
-
diff --git a/x11-base/xorg-server/files/1.4-fix-dmx-build.patch b/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
deleted file mode 100644
index 07f43ab..0000000
--- a/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
-index d644b5d..83f8a4a 100644
---- a/hw/dmx/dmxinput.c
-+++ b/hw/dmx/dmxinput.c
-@@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
- if (!dmxInput->detached && dmxInput->updateWindowInfo)
- dmxInput->updateWindowInfo(dmxInput, type, pWindow);
- }
-+
-+int
-+NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
-+{
-+ return BadRequest;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr pDev)
-+{
-+}
diff --git a/x11-base/xorg-server/files/1.4-fix-dmx-link.patch b/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
deleted file mode 100644
index 909442d..0000000
--- a/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
-index 002ea11..15dc281 100644
---- a/hw/dmx/Makefile.am
-+++ b/hw/dmx/Makefile.am
-@@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
- $(GLX_LIBS) \
- input/libdmxinput.a \
- config/libdmxconfig.a \
-+ @XSERVER_LIBS@ \
- @DMXMODULES_LIBS@
-
- # Man page
diff --git a/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch b/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
deleted file mode 100644
index 35ca029..0000000
--- a/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 62fdd78..7a37590 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then
- XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
- fi
-
-- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
-+ PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"])
- if test "x$XEPHYR" = xauto; then
- XEPHYR=$xephyr
- fi
-diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
-index cc3019f..1738d0f 100644
---- a/hw/kdrive/ephyr/Makefile.am
-+++ b/hw/kdrive/ephyr/Makefile.am
-@@ -28,6 +28,7 @@ Xephyr_LDADD = \
- libxephyr-hostx.a \
- ../../../exa/libexa.la \
- @KDRIVE_LIBS@ \
-+ @XSERVER_LIBS@ \
- @XEPHYR_LIBS@
-
- Xephyr_DEPENDENCIES = \
diff --git a/x11-base/xorg-server/files/1.4-fix-xprint-build.patch b/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
deleted file mode 100644
index 98fbacf..0000000
--- a/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
-index a465c4c..1e7652e 100644
---- a/hw/xprint/ddxInit.c
-+++ b/hw/xprint/ddxInit.c
-@@ -310,6 +310,17 @@ ChangeDeviceControl (
- return BadMatch;
- }
-
-+int
-+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
-+{
-+ return BadValue;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr dev)
-+{
-+}
-+
- void
- OpenInputDevice (
- DeviceIntPtr dev,
diff --git a/x11-base/xorg-server/files/1.4-fix-xprint-link.patch b/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
deleted file mode 100644
index 1cf7205..0000000
--- a/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
-index dc8764a..728e69d 100644
---- a/hw/xprint/Makefile.am
-+++ b/hw/xprint/Makefile.am
-@@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir)
- Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
- pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
- $(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
-- $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@
-+ $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ @XSERVER_LIBS@
-
- miinitext-wrapper.c:
- echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
diff --git a/x11-base/xorg-server/files/1.4-ia64.patch b/x11-base/xorg-server/files/1.4-ia64.patch
deleted file mode 100644
index 13ffb5f..0000000
--- a/x11-base/xorg-server/files/1.4-ia64.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- /dev/null 1969-12-31 16:00:00.000000000 -0800
-+++ hw/xfree86/os-support/shared/ia64Pci.h 2007-08-03 12:56:38.000000000 -0700
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright 2004, Egbert Eich
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to
-+ * deal in the Software without restriction, including without limitation the
-+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-+ * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of Egbert Eich shall not
-+ * be used in advertising or otherwise to promote the sale, use or other deal-
-+ *ings in this Software without prior written authorization from Egbert Eich.
-+ *
-+ */
-+#ifdef HAVE_XORG_CONFIG_H
-+#include <xorg-config.h>
-+#endif
-+
-+#ifndef _IA64_PCI_H
-+# define _IA64_PCI_H
-+
-+#include "Pci.h"
-+
-+typedef enum {
-+ NONE_CHIPSET,
-+ I460GX_CHIPSET,
-+ E8870_CHIPSET,
-+ ZX1_CHIPSET,
-+ ALTIX_CHIPSET
-+} IA64Chipset;
-+
-+# ifdef OS_PROBE_PCI_CHIPSET
-+extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags);
-+# endif
-+#endif
diff --git a/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch b/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch
deleted file mode 100644
index ece24eb..0000000
--- a/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d988da6eee8422774dff364050bf431b843a714a
-Author: Arkadiusz Miskiewicz <arekm@maven.pl>
-Date: Thu Dec 13 00:09:08 2007 +0200
-
- Xprint: Clean up generated files
-
- Remember to clean generated wrapper files.
- (cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3)
-
-diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
-index dc8764a..f834966 100644
---- a/hw/xprint/Makefile.am
-+++ b/hw/xprint/Makefile.am
-@@ -41,3 +41,5 @@ Xprt_SOURCES = \
- $(top_srcdir)/fb/fbcmap_mi.c
-
- EXTRA_DIST = ValTree.c
-+
-+CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c
diff --git a/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
deleted file mode 100644
index 9c48b37..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
-+ extern unsigned int IOPortBase;
- #endif
-
- if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- }
- close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
-+#elif defined(__mips__)
-+ fd = open("/dev/mem", O_RDWR);
-+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
-+ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+ 0x1fd00000);
-+ if (IOPortBase == MAP_FAILED) {
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+ strerror(errno));
-+ return FALSE;
-+ }
-+ close(fd);
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: map iobase (%x)\n",
-+ IOPortBase);
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
- if (ioperm(0, 1024, 1) || iopl(3)) {
- if (errno == ENODEV)
- ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
deleted file mode 100644
index 3a111cf..0000000
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
+++ /dev/null
@@ -1,604 +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.4.0.90-r3.ebuild,v 1.1 2008/02/01 21:47:19 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="7.0.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
- mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
- http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-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_ur98
- input_devices_vmmouse
- input_devices_void
-
- input_devices_synaptics
- input_devices_wacom"
-IUSE_VIDEO_CARDS="
- video_cards_amd
- video_cards_apm
- video_cards_ark
- video_cards_chips
- video_cards_cirrus
- video_cards_cyrix
- video_cards_dummy
- video_cards_epson
- video_cards_fbdev
- video_cards_glint
- video_cards_i128
- video_cards_i740
- video_cards_i810
- 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_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
- dri hal ipv6 minimal nptl sdl xprint"
-RDEPEND="hal? ( sys-apps/hal )
- >=x11-libs/libXfont-1.3.1
- >=x11-libs/xtrans-1.0.4
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXext-1.0.2
- >=x11-libs/libX11-1.1.3
- >=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.9.5
- media-libs/freetype
- >=media-libs/mesa-7.0.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-0.9
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.1
- >=x11-apps/xauth-1.0.2
- >=x11-apps/xinit-1.0.5
- 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.1
- 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.1
- >=x11-proto/renderproto-0.9.3
- >=x11-proto/fixesproto-4
- >=x11-proto/damageproto-1.1
- >=x11-proto/xextproto-7.0.2
- >=x11-proto/xproto-7.0.10
- >=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-r1
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/inputproto-1.4.2.1
- >=x11-proto/bigreqsproto-1.0.2
- >=x11-proto/xcmiscproto-1.1.2
- >=x11-proto/glproto-1.4.8
- dmx? ( >=x11-proto/dmxproto-2.2.2 )
- dri? ( >=x11-proto/xf86driproto-2.0.3
- >=x11-libs/libdrm-2.3 )
- xprint? ( >=x11-proto/printproto-1.0.3
- >=x11-apps/mkfontdir-1.0.3
- >=x11-apps/mkfontscale-1.0.3
- >=x11-apps/xplsprinters-1.0.1 )"
-
-# Drivers
-PDEPEND="
- xorg? (
- input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
- input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
- input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.1 )
- input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
- input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
- input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
- input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.1 )
- input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.1 )
- input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
- input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
- input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
- input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
- input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
- input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
- input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.2.0 )
- input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.1 )
- input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.1 )
- input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
- input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
- input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
- input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.2.1 )
- input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
- input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
- input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
- input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
- input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.2 )
- input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
- input_devices_synaptics? ( x11-drivers/synaptics )
- input_devices_wacom? ( x11-drivers/linuxwacom )
-
- video_cards_amd? ( >=x11-drivers/xf86-video-amd-2.7.7.0 )
- video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
- video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
- video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
- video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
- video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
- video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
- video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
- video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
- video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
- video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
- video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
- video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
- video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
- video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
- video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
- video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
- video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
- video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
- video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
- video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
- video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
- video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
- video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
- video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
- video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
- video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
- video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
- video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
- video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
- video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
- video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
- video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
- video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
- video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
- video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
- video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
- video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
- video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
- video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
- video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
- video_cards_vermilion? ( >=x11-drivers/xf86-video-vermilion-1.0.0 )
- video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
- video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
- video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
- video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
- video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
- video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
- video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
- video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.433 )
- video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-71.86.01 )
- )"
-LICENSE="${LICENSE} MIT"
-
-PATCHES="
- ${FILESDIR}/${PN}-1.4-loongson.patch
- ${FILESDIR}/1.4-ia64.patch
- ${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
- ${FILESDIR}/1.4-fpic-libxf86config.patch
- ${FILESDIR}/1.4-document-new-font-catalogs.patch
- ${FILESDIR}/1.4-fix-dmx-build.patch
- ${FILESDIR}/1.4-fix-dmx-link.patch
- ${FILESDIR}/1.4-fix-xephyr-link.patch
- ${FILESDIR}/1.4-fix-xprint-build.patch
- ${FILESDIR}/1.4-fix-xprint-link.patch
- ${FILESDIR}/1.4-fix-kdrive-automake.patch
- ${FILESDIR}/1.4-dont-hang-openoffice.patch
- ${FILESDIR}/${PV}-clean-generated-files.patch
- ${FILESDIR}/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
- ${FILESDIR}/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
- ${FILESDIR}/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
- ${FILESDIR}/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
- ${FILESDIR}/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
- ${FILESDIR}/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
- ${FILESDIR}/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
- ${FILESDIR}/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
- ${FILESDIR}/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
- "
-
-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
-
- # Only Xorg and Xgl support this, and we won't build Xgl
- # until it merges to trunk
- if use xorg; then
- conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
- 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 !minimal xvfb)
- $(use_enable !minimal xnest)
- $(use_enable !minimal install-libxf86config)
- $(use_enable dri)
- $(use_enable xorg)
- $(use_enable xprint)
- $(use_enable nptl glx-tls)
- $(use_enable !minimal xorgcfg)
- $(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
- ${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
-
- # Clean up for ${PV}-clean-generated-files.patch
- pushd hw/xprint >/dev/null
- rm -f *-wrapper.c || die
- popd >/dev/null
-
- # 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 || use xprint; 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
- #do not install xprint's Xsession.d files, we'll do it later
- if use xprint; then
- sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \
- -i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \
- || die "sed of Xsession.d makefile failed"
- fi
-}
-
-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.3"
- ewarn "or earlier, because the ABI changed. If you cannot start X because"
- ewarn "of module version mismatch errors, this is your problem."
-
- ewarn "Here's a list of installed X drivers to emerge:"
- print_installed x11-drivers/
-
- echo
- ewarn "You can generate a similar list at any point 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() {
- use xprint && xprint_src_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}
-}
-
-print_installed() {
- local command line token=$1
-
- if $(type -P qlist >/dev/null 2>&1); then
- command="qlist -I -C ${token}"
- elif $(type -P equery >/dev/null 2>&1); then
- command="equery -q -C list ${token} | grep -o '${token}[[:alnum:].-]*'"
- elif $(type -P epm >/dev/null 2>&1); then
- command="epm -qaG | grep ${token}"
- else
- local dir
- command="true"
- for dir in "${PORTDIR}"/${token}*; do
- command="${command} ; best_version ${dir#${PORTDIR}/}"
- done
- fi
- while read line; do
- ewarn "${line}"
- done < <(eval ${command})
-}
-
-xprint_src_install() {
- # RH-style init script, we provide a wrapper
- exeinto /usr/$(get_libdir)/misc
- doexe "${S}"/hw/xprint/etc/init.d/xprint
- # Install the wrapper
- newinitd "${FILESDIR}"/xprint.init xprint
- # Install profile scripts
- insinto /etc/profile.d
- doins "${S}"/hw/xprint/etc/profile.d/xprint*
- exeinto /etc/X11/xinit/xinitrc.d
- doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
- # Patch profile scripts
- sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
- get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
- "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
- # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
- dodoc "${D}"/etc/profile.d/xprint*
- rm -f "${D}"/etc/profile.d/xprint*
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: df665ca51eebd771c1fd3f0b69d822776c900bc3
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 9 00:17:18 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Mar 9 00:17:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=df665ca5
xorg-server: Sync 1.9 with portage until we can move to 1.10 and beyond
This version bumps to 1.9.5 from portage, and includes the security fix in portage -r1.
The immediate benefits are the syncing the USE flags, so that virtualx.eclass based
test USE dependencies can be met, and the version bump to 1.9.5 itself with the security fix.
For upgrading to the 1.10 and 1.11 series need to first test the loongson patches
---
x11-base/xorg-server/Manifest | 7 +++--
.../files/xorg-cve-2011-4028+4029.patch | 22 ++++++++++++++++++++
...gson.patch => xorg-server-1.9.5-loongson.patch} | 0
...er-1.9.4.ebuild => xorg-server-1.9.5-r1.ebuild} | 13 ++++++-----
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 908871f..79e0d21 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,13 +1,14 @@
AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
+AUX xorg-cve-2011-4028+4029.patch 671 RMD160 f9c607b5bfe20259f2adb320b6a1a0819f59f7ab SHA1 84797b66434aa05acc9f6881050d1b46487caf77 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
-AUX xorg-server-1.9.4-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
+AUX xorg-server-1.9.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-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.9.4.ebuild 7969 RMD160 dcc813a298974013c0fcc41643cbbdcca89fb54e SHA1 1d735aad993099fd3b813335882345c4343d0846 SHA256 1784ccb94d1596190e2d9ffc47788c2de10db989d870d4316472c982f3abbf0d
+DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
+EBUILD xorg-server-1.9.5-r1.ebuild 8011 RMD160 4db5d07629aa985fa58f7274985a669ed437ef3d SHA1 32207cbd09f746e7e87d2483ef416002fcfa8b3e SHA256 9eb896d532a72a4962cc085ada9889f63fceb5f34c1df351ed5e9f229b224839
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/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
new file mode 100644
index 0000000..66e77f6
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
@@ -0,0 +1,22 @@
+diff --git a/os/utils.c b/os/utils.c
+index e8ecb71..18ff1ca 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -297,7 +297,7 @@ LockServer(void)
+ FatalError("Could not create lock file in %s\n", tmp);
+ (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+ (void) write(lfd, pid_str, 11);
+- (void) chmod(tmp, 0444);
++ (void) fchmod(lfd, 0444);
+ (void) close(lfd);
+
+ /*
+@@ -318,7 +318,7 @@ LockServer(void)
+ /*
+ * Read the pid from the existing file
+ */
+- lfd = open(LockFile, O_RDONLY);
++ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+ if (lfd < 0) {
+ unlink(tmp);
+ FatalError("Can't read lock file %s\n", LockFile);
diff --git a/x11-base/xorg-server/files/xorg-server-1.9.4-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch
similarity index 100%
rename from x11-base/xorg-server/files/xorg-server-1.9.4-loongson.patch
rename to x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch
diff --git a/x11-base/xorg-server/xorg-server-1.9.4.ebuild b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
similarity index 96%
rename from x11-base/xorg-server/xorg-server-1.9.4.ebuild
rename to x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
index 308a237..275dfd2 100644
--- a/x11-base/xorg-server/xorg-server-1.9.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.9.4.ebuild,v 1.6 2011/03/01 10:07:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild,v 1.4 2011/10/22 16:57:28 xarthisius Exp $
EAPI=3
inherit xorg-2 multilib versionator
@@ -10,9 +10,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
OPENGL_DIR="xorg-x11"
DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE_SERVERS="dmx kdrive xorg"
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
RDEPEND=">=app-admin/eselect-opengl-1.0.8
dev-libs/openssl
@@ -105,6 +105,7 @@ PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
"${FILESDIR}"/${PN}-disable-acpi.patch
"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+ "${FILESDIR}"/xorg-cve-2011-4028+4029.patch
# A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622
"${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch"
"${FILESDIR}/${P}-loongson.patch"
@@ -121,7 +122,7 @@ pkg_setup() {
# --enable-install-setuid needed because sparcs default off
# NOTE: fop is used for doc generating ; and i have no idea if gentoo
# package it somewhere
- CONFIGURE_OPTIONS="
+ XORG_CONFIGURE_OPTIONS="
$(use_enable ipv6)
$(use_enable dmx)
$(use_enable kdrive)
@@ -130,15 +131,15 @@ pkg_setup() {
$(use_enable kdrive kdrive-evdev)
$(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 xnest)
$(use_enable xorg)
+ $(use_enable xvfb)
$(use_enable nptl glx-tls)
$(use_enable udev config-udev)
$(use_with doc doxygen)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 86b04214c172fbf055ae8181fb0fe3c96e2d0910
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 23:46:55 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 23:46:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=86b04214
Remove ancient xorg-server-1.8 version
---
x11-base/xorg-server/Manifest | 5 -
x11-base/xorg-server/files/xdm.initd | 203 --------------
.../files/xorg-server-1.8-nouveau-default.patch | 32 ---
.../files/xorg-server-1.8.2-loongson.patch | 53 ----
x11-base/xorg-server/xorg-server-1.8.2.ebuild | 291 --------------------
5 files changed, 0 insertions(+), 584 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 69f62f3..a2a1bdc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,11 +1,8 @@
AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
-AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
-AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31
-AUX xorg-server-1.8.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
AUX xorg-server-1.9.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.9.2.902-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
@@ -14,11 +11,9 @@ AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed186ec0163a4a1a81574040592ab
AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.8.2.ebuild 8241 RMD160 2fa4126a8c52b3f8be9ae45b0d087cfe669e4d1d SHA1 8fea1dede1e3bcd9c5a0729920e3a6750043251a SHA256 52f9a3925448037b9e68aa538c238401c07b0ce19850371dd925a46e905da37a
EBUILD xorg-server-1.9.0.ebuild 7853 RMD160 a5e96a4414e17fecde10ab9b16e8d726d909c140 SHA1 00c4a70acc477aa1cf95ae9eef9af7930efeed9a SHA256 9c4b389edecbd3baeef6c46bd525ae3434a02ad2d816c47f27f70165ec40d76f
EBUILD xorg-server-1.9.2.902.ebuild 8067 RMD160 f835be6b42d62dc44050145ffedf8c0ce7eac99e SHA1 ca35dedcba423f17be3be2dd15af65834c262c6f SHA256 ba801538aca09efd026508a8ffcaf18e9208530b303dc91cbd46cbcf5c19fa82
EBUILD xorg-server-1.9.4.ebuild 7969 RMD160 dcc813a298974013c0fcc41643cbbdcca89fb54e SHA1 1d735aad993099fd3b813335882345c4343d0846 SHA256 1784ccb94d1596190e2d9ffc47788c2de10db989d870d4316472c982f3abbf0d
diff --git a/x11-base/xorg-server/files/xdm.initd b/x11-base/xorg-server/files/xdm.initd
deleted file mode 100755
index 6d10e1f..0000000
--- a/x11-base/xorg-server/files/xdm.initd
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem: if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2. When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-# x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
- need localmount xdm-setup
-
- # this should start as early as possible
- # we can't do 'before *' as that breaks it
- # (#139824) Start after ypbind and autofs for network authentication
- # (#145219 #180163) Could use lirc mouse as input device
- # (#70689 comment #92) Start after consolefont to avoid display corruption
- # (#291269) Start after quota, since some dm need readable home
- after bootmisc consolefont modules netmount
- after readahead-list ypbind autofs openvpn gpm lircmd
- after quota
- before alsasound
-
- # Start before X
- use consolekit xfs
- @HALD_DEPEND@
-}
-
-setup_dm() {
- local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')"
-
- # Load our root path from profile.env
- # Needed for kdm
- PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")"
-
- case "${MY_XDM}" in
- kdm|kde)
- EXE="$(which kdm)"
- PIDFILE=/var/run/kdm.pid
- ;;
- kdm-*)
- EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
- PIDFILE=/var/run/kdm.pid
- ;;
- entrance*)
- EXE=/usr/sbin/entranced
- PIDFILE=/var/lib/entranced.pid
- ;;
- gdm|gnome)
- EXE=/usr/bin/gdm
- [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
- PIDFILE=/var/run/gdm.pid
- ;;
- wdm)
- EXE=/usr/bin/wdm
- PIDFILE=
- ;;
- gpe)
- EXE=/usr/bin/gpe-dm
- PIDFILE=/var/run/gpe-dm.pid
- ;;
- *)
- # first find out if there is such executable
- EXE="$(which ${MY_XDM} 2>/dev/null)"
- PIDFILE="/var/run/${MY_XDM}.pid"
-
- # warn user that he is doing sick things if the exe was not found
- if [ "${EXE}" = "" ]; then
- echo "ERROR: Your XDM value is invalid."
- echo " No ${MY_XDM} executable could be found on your system."
- fi
- ;;
- esac
-
- if ! [ -x "${EXE}" ]; then
- EXE=/usr/bin/xdm
- PIDFILE=/var/run/xdm.pid
- if ! [ -x "/usr/bin/xdm" ]; then
- echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
- echo " or install x11-apps/xdm package"
- eend 255
- fi
- fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
- if [ -e /etc/inittab ] ; then
- grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
- elif [ -e /etc/ttys ] ; then
- grep -q "^ttyv$(($1 - 1))" /etc/ttys
- else
- return 1
- fi
-}
-
-start() {
- local EXE= NAME= PIDFILE=
- setup_dm
-
- if [ -f /etc/.noxdm ] ; then
- einfo "Skipping ${EXE}, /etc/.noxdm found"
- rm /etc/.noxdm
- return 0
- fi
-
- ebegin "Setting up ${EXE##*/}"
-
- # save the prefered DM
- save_options "service" "${EXE}"
- save_options "name" "${NAME}"
- save_options "pidfile" "${PIDFILE}"
-
- if [ -n "${CHECKVT-y}" ] ; then
- if vtstatic "${CHECKVT:-7}" ; then
- if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ] ; then
- ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
- telinit a >/dev/null 2>/dev/null
- return 0
- else
- eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
- return 1
- fi
- fi
- fi
-
- /etc/X11/startDM.sh
- eend 0
-}
-
-stop() {
- local retval=0
- local curvt=
- if [ -t 0 ] ; then
- if type fgconsole >/dev/null 2>/dev/null ; then
- curvt="$(fgconsole 2>/dev/null)"
- else
- curvt="$(tty)"
- case "${curvt}" in
- /dev/ttyv[0-9]*) curvt="${curvt#/dev/ttyv*}" ;;
- *) curvt= ;;
- esac
- fi
- fi
- local myexe="$(get_options "service")"
- local myname="$(get_options "name")"
- local mypidfile="$(get_options "pidfile")"
- local myservice=${myexe##*/}
-
- [ -z "${myexe}" ] && return 0
-
- ebegin "Stopping ${myservice}"
-
- if start-stop-daemon --quiet --test --stop --exec "${myexe}" ; then
- start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
- ${mypidfile:+--pidfile} ${mypidfile} \
- ${myname:+--name} ${myname}
- retval=$?
- fi
-
- # switch back to original vt
- if [ -n "${curvt}" ] ; then
- if type chvt >/dev/null 2>/dev/null ; then
- chvt "${curvt}"
- else
- vidcontrol -s "$((${curvt} + 1))"
- fi
- fi
-
- eend ${retval} "Error stopping ${myservice}"
- return ${retval}
-}
-
-# vim: set ts=4 :
\ No newline at end of file
diff --git a/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch
deleted file mode 100644
index 3d144e2..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7f4ada8..d964c6c 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev,
- break;
- case 0x102b: driverList[0] = "mga"; break;
- case 0x10c8: driverList[0] = "neomagic"; break;
-- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
-+ case 0x10de: case 0x12d2:
-+ switch (dev->device_id) {
-+ /* NV1 */
-+ case 0x0008:
-+ case 0x0009:
-+ driverList[0] = "vesa";
-+ break;
-+ /* NV3 */
-+ case 0x0018:
-+ case 0x0019:
-+ driverList[0] = "nv";
-+ break;
-+ default:
-+ driverList[0] = "nouveau";
-+ driverList[1] = "nv";
-+ break;
-+ }
-+ break;
- case 0x1106: driverList[0] = "openchrome"; break;
- case 0x1b36: driverList[0] = "qxl"; break;
- case 0x1163: driverList[0] = "rendition"; break;
---
-1.6.5.2
diff --git a/x11-base/xorg-server/files/xorg-server-1.8.2-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.8.2-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.8.2-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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/xorg-server-1.8.2.ebuild b/x11-base/xorg-server/xorg-server-1.8.2.ebuild
deleted file mode 100644
index 73a4798..0000000
--- a/x11-base/xorg-server/xorg-server-1.8.2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# 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.8.2.ebuild,v 1.1 2010/07/21 22:35:42 chithanh Exp $
-
-EAPI=3
-XORG_EAUTORECONF="yes"
-inherit xorg-2 multilib versionator
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-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} doc hal ipv6 minimal nptl tslib +udev"
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libpciaccess-0.10.3
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.3.3
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/pixman-0.15.20
- >=x11-libs/xtrans-1.2.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.5
- >=x11-libs/libXfixes-4.0.3
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.3
- )
- !udev? ( hal? ( sys-apps/hal ) )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-7.8_rc[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- udev? ( sys-fs/udev )"
-
-DEPEND="${RDEPEND}
- !<x11-apps/xinit-1.2.1-r1
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-4.1
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.11
- >=x11-proto/inputproto-1.9.99.902
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.2.99.3
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.0.2
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.0.99.3
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.13
- dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
- doc? ( >=app-doc/doxygen-1.6.1 )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3.0
- )"
-
-PDEPEND="
- >=x11-apps/xinit-1.2.1-r1
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-# )
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622
- "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch"
- "${FILESDIR}/${P}-loongson.patch"
- "${FILESDIR}"/${PN}-disable-acpi.patch
- "${FILESDIR}"/${PN}-1.8-nouveau-default.patch
- )
-
-pkg_setup() {
- local myconf
-
- xorg-2_pkg_setup
-
- use minimal || ensure_a_server_is_building
-
- # HAL shebang
- if use hal; then
- ewarn "Usage of hal is strongly discouraged. Please migrate to udev."
- ewarn "From next major release on the hal support will be fully disabled."
- fi
- if use hal && use udev; then
- ewarn "Both hal and udev flags are enabled."
- ewarn "Enabling only udev!"
- myconf="
- $(use_enable udev config-udev)
- --disable-config-hal
- "
- else
- myconf="
- $(use_enable hal config-hal)
- $(use_enable udev config-udev)
- "
- 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_with doc doxygen)
- ${myconf}
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontrootdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --without-dtrace
- --with-os-vendor=Gentoo
- ${conf_opts}"
-
- # Due to the limitations of CONFIGURE_OPTIONS, we have to export this.
- mkdir -p "${T}/mesa-symlinks/GL"
- pushd "${T}/mesa-symlinks/GL" &> /dev/null
- for i in gl glx glxmd glxproto glxtokens; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" $i.h
- done
- for i in glext glxext; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" $i.h
- done
- popd &> /dev/null
- export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS} }-I${T}/mesa-symlinks"
-
- # (#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
-
- # Incompatible with GCC 3.x CPP, bug #314615
- if [[ $(gcc-major-version) -lt 4 ]]; then
- ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
- ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
- fi
-
- # detect if we should inform user about ebuild breakage
- if ! has_version "x11-base/xorg-server" ||
- has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
- INFO="yes"
- fi
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc hw/xfree86/xorg.conf.example \
- || die "couldn't install xorg.conf.example"
- fi
-
- # install the xdm.init
- cp "${FILESDIR}"/xdm.initd "${T}"
- if use hal && ! use udev; then
- sed -i \
- -e "s/@HALD_DEPEND@/need hald/g" \
- "${T}"/xdm.initd \
- || die "sed failed"
- else
- sed -i \
- -e "/@HALD_DEPEND@/ d" \
- "${T}"/xdm.initd \
- || die "sed failed"
- fi
- newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
- newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
-}
-
-pkg_postinst() {
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set --use-old xorg-x11
-
- if [[ ${INFO} = yes ]]; then
- einfo "You should consider reading upgrade guide for this release:"
- einfo " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
- echo
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
- ewarn "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/"
- fi
-}
-
-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
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-15 14:10 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2012-03-15 14:10 UTC (permalink / raw
To: gentoo-commits
commit: fa55ac5c69796572ad6638878ecd92f1666f8bc7
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 9 00:01:15 2012 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Mar 9 00:01:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=fa55ac5c
Remove older xorg-server-1.9.x versions
---
x11-base/xorg-server/Manifest | 8 -
.../files/1.7.5.902-fix-tslib-1.0-check.patch | 19 --
x11-base/xorg-server/files/xdm.initd-2 | 202 --------------
.../files/xorg-server-1.9.0-loongson.patch | 53 ----
.../files/xorg-server-1.9.2.902-loongson.patch | 53 ----
x11-base/xorg-server/xorg-server-1.9.0.ebuild | 274 --------------------
x11-base/xorg-server/xorg-server-1.9.2.902.ebuild | 274 --------------------
7 files changed, 0 insertions(+), 883 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a2a1bdc..908871f 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,21 +1,13 @@
-AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
-AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
-AUX xorg-server-1.9.0-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
-AUX xorg-server-1.9.2.902-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552
AUX xorg-server-1.9.4-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-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
-DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd90c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
-EBUILD xorg-server-1.9.0.ebuild 7853 RMD160 a5e96a4414e17fecde10ab9b16e8d726d909c140 SHA1 00c4a70acc477aa1cf95ae9eef9af7930efeed9a SHA256 9c4b389edecbd3baeef6c46bd525ae3434a02ad2d816c47f27f70165ec40d76f
-EBUILD xorg-server-1.9.2.902.ebuild 8067 RMD160 f835be6b42d62dc44050145ffedf8c0ce7eac99e SHA1 ca35dedcba423f17be3be2dd15af65834c262c6f SHA256 ba801538aca09efd026508a8ffcaf18e9208530b303dc91cbd46cbcf5c19fa82
EBUILD xorg-server-1.9.4.ebuild 7969 RMD160 dcc813a298974013c0fcc41643cbbdcca89fb54e SHA1 1d735aad993099fd3b813335882345c4343d0846 SHA256 1784ccb94d1596190e2d9ffc47788c2de10db989d870d4316472c982f3abbf0d
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.5.902-fix-tslib-1.0-check.patch b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
deleted file mode 100644
index 3675822..0000000
--- a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac 2010-03-16 22:24:14.000000000 +0100
-+++ configure.ac.new 2010-03-16 22:33:10.000000000 +0100
-@@ -1915,8 +1915,14 @@
- AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
- fi
-
--
-- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-+dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
-+ PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
-+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
-+ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
-+ HAVE_TSLIB="no"
-+ ])
-+ ])
-+ ])
- if test "x$HAVE_TSLIB" = xno; then
- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
- fi
diff --git a/x11-base/xorg-server/files/xdm.initd-2 b/x11-base/xorg-server/files/xdm.initd-2
deleted file mode 100755
index e8e954e..0000000
--- a/x11-base/xorg-server/files/xdm.initd-2
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem: if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2. When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-# x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
- need localmount xdm
-
- # this should start as early as possible
- # we can't do 'before *' as that breaks it
- # (#139824) Start after ypbind and autofs for network authentication
- # (#145219 #180163) Could use lirc mouse as input device
- # (#70689 comment #92) Start after consolefont to avoid display corruption
- # (#291269) Start after quota, since some dm need readable home
- after bootmisc consolefont modules netmount
- after readahead-list ypbind autofs openvpn gpm lircmd
- after quota
- before alsasound
-
- # Start before X
- use consolekit xfs
-}
-
-setup_dm() {
- local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')"
-
- # Load our root path from profile.env
- # Needed for kdm
- PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")"
-
- case "${MY_XDM}" in
- kdm|kde)
- EXE="$(which kdm)"
- PIDFILE=/var/run/kdm.pid
- ;;
- kdm-*)
- EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
- PIDFILE=/var/run/kdm.pid
- ;;
- entrance*)
- EXE=/usr/sbin/entranced
- PIDFILE=/var/lib/entranced.pid
- ;;
- gdm|gnome)
- EXE=/usr/bin/gdm
- [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
- PIDFILE=/var/run/gdm.pid
- ;;
- wdm)
- EXE=/usr/bin/wdm
- PIDFILE=
- ;;
- gpe)
- EXE=/usr/bin/gpe-dm
- PIDFILE=/var/run/gpe-dm.pid
- ;;
- *)
- # first find out if there is such executable
- EXE="$(which ${MY_XDM} 2>/dev/null)"
- PIDFILE="/var/run/${MY_XDM}.pid"
-
- # warn user that he is doing sick things if the exe was not found
- if [ "${EXE}" = "" ]; then
- echo "ERROR: Your XDM value is invalid."
- echo " No ${MY_XDM} executable could be found on your system."
- fi
- ;;
- esac
-
- if ! [ -x "${EXE}" ]; then
- EXE=/usr/bin/xdm
- PIDFILE=/var/run/xdm.pid
- if ! [ -x "/usr/bin/xdm" ]; then
- echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
- echo " or install x11-apps/xdm package"
- eend 255
- fi
- fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
- if [ -e /etc/inittab ] ; then
- grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
- elif [ -e /etc/ttys ] ; then
- grep -q "^ttyv$(($1 - 1))" /etc/ttys
- else
- return 1
- fi
-}
-
-start() {
- local EXE= NAME= PIDFILE=
- setup_dm
-
- if [ -f /etc/.noxdm ] || get_bootparam "nox" ; then
- einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
- rm /etc/.noxdm
- return 0
- fi
-
- ebegin "Setting up ${EXE##*/}"
-
- # save the prefered DM
- save_options "service" "${EXE}"
- save_options "name" "${NAME}"
- save_options "pidfile" "${PIDFILE}"
-
- if [ -n "${CHECKVT-y}" ] ; then
- if vtstatic "${CHECKVT:-7}" ; then
- if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ] ; then
- ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
- telinit a >/dev/null 2>/dev/null
- return 0
- else
- eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
- return 1
- fi
- fi
- fi
-
- /etc/X11/startDM.sh
- eend 0
-}
-
-stop() {
- local retval=0
- local curvt=
- if [ -t 0 ] ; then
- if type fgconsole >/dev/null 2>/dev/null ; then
- curvt="$(fgconsole 2>/dev/null)"
- else
- curvt="$(tty)"
- case "${curvt}" in
- /dev/ttyv[0-9]*) curvt="${curvt#/dev/ttyv*}" ;;
- *) curvt= ;;
- esac
- fi
- fi
- local myexe="$(get_options "service")"
- local myname="$(get_options "name")"
- local mypidfile="$(get_options "pidfile")"
- local myservice=${myexe##*/}
-
- [ -z "${myexe}" ] && return 0
-
- ebegin "Stopping ${myservice}"
-
- if start-stop-daemon --quiet --test --stop --exec "${myexe}" ; then
- start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
- ${mypidfile:+--pidfile} ${mypidfile} \
- ${myname:+--name} ${myname}
- retval=$?
- fi
-
- # switch back to original vt
- if [ -n "${curvt}" ] ; then
- if type chvt >/dev/null 2>/dev/null ; then
- chvt "${curvt}"
- else
- vidcontrol -s "$((${curvt} + 1))"
- fi
- fi
-
- eend ${retval} "Error stopping ${myservice}"
- return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/x11-base/xorg-server/files/xorg-server-1.9.0-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.9.0-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.9.0-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-1.9.2.902-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.9.2.902-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.9.2.902-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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/xorg-server-1.9.0.ebuild b/x11-base/xorg-server/xorg-server-1.9.0.ebuild
deleted file mode 100644
index b4eb78b..0000000
--- a/x11-base/xorg-server/xorg-server-1.9.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit xorg-2 multilib versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-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} doc ipv6 minimal nptl tslib +udev"
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libpciaccess-0.10.3
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/pixman-0.15.20
- >=x11-libs/xtrans-1.2.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.5
- >=x11-libs/libXfixes-4.0.3
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.3
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-7.8_rc[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- udev? ( >=sys-fs/udev-150 )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-4.1
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.11
- >=x11-proto/inputproto-1.9.99.902
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.2.99.3
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.0.2
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.0.99.3
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.17
- dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
- doc? (
- app-doc/doxygen
- app-text/xmlto
- )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.1
- >=x11-libs/libdrm-2.3.0
- )"
-
-PDEPEND="
- >=x11-apps/xinit-1.2.1-r1
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-# )
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622
- "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch"
- "${FILESDIR}/${P}-loongson.patch"
- "${FILESDIR}"/${PN}-disable-acpi.patch
- "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
- "${FILESDIR}"/1.7.5.902-fix-tslib-1.0-check.patch
- )
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- use minimal || ensure_a_server_is_building
-
- # 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
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo
- # package it somewhere
- CONFIGURE_OPTIONS="
- $(use_enable ipv6)
- $(use_enable dmx)
- $(use_enable kdrive)
- $(use_enable kdrive kdrive-kbd)
- $(use_enable kdrive kdrive-mouse)
- $(use_enable kdrive kdrive-evdev)
- $(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 udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontrootdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --disable-config-hal
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- ${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
-
- # Incompatible with GCC 3.x CPP, bug #314615
- if [[ $(gcc-major-version) -lt 4 ]]; then
- ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
- ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
- fi
-
- # detect if we should inform user about ebuild breakage
- if ! has_version "x11-base/xorg-server" ||
- has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
- INFO="yes"
- fi
-}
-
-src_configure() {
- # this is required only for configure and build time
- # we need to ensure having enough glxtokens
- # the subshell is needed so the addwrite is not shared in rest of that phase
- OLD_IMPLEM="$(eselect opengl show)"
- [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OPENGL_DIR}; )
- xorg-2_src_configure
-}
-
-src_compile() {
- emake # no die here intentional
- if [[ $? != 0 ]]; then
- [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
- die "Compilation failed"
- fi
- [[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc hw/xfree86/xorg.conf.example \
- || die "couldn't install xorg.conf.example"
- fi
-
- newinitd "${FILESDIR}"/xdm.initd-2 xdm || die "initd file install failed"
- newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
-}
-
-pkg_postinst() {
- if [[ ${INFO} = yes ]]; then
- einfo "You should consider reading upgrade guide for this release:"
- einfo " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
- echo
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
- ewarn "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/"
- fi
-}
-
-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
-}
-
-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.9.2.902.ebuild b/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild
deleted file mode 100644
index 26eabe2..0000000
--- a/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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.9.2.902.ebuild,v 1.1 2010/12/05 11:32:35 scarabeus Exp $
-
-EAPI=3
-# They generate the configure.ac with wrong version of util-macros
-# see bug #339988
-XORG_EAUTORECONF="yes"
-inherit xorg-2 multilib versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-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} doc ipv6 minimal nptl tslib +udev"
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libpciaccess-0.10.3
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/pixman-0.15.20
- >=x11-libs/xtrans-1.2.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.5
- >=x11-libs/libXfixes-4.0.3
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.3
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-7.8_rc[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- udev? ( >=sys-fs/udev-150 )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-4.1
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.11
- >=x11-proto/inputproto-1.9.99.902
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.2.99.3
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.0.2
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.0.99.3
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.17
- dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
- doc? (
- >=app-doc/doxygen-1.6.1
- app-text/xmlto
- )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.3
- >=x11-libs/libdrm-2.4.20
- )"
-
-PDEPEND="
- >=x11-apps/xinit-1.2.1-r1
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
- )
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622
- "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch"
- "${FILESDIR}/${P}-loongson.patch"
- "${FILESDIR}"/${PN}-disable-acpi.patch
- "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
- )
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- use minimal || ensure_a_server_is_building
-
- # 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
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo
- # package it somewhere
- CONFIGURE_OPTIONS="
- $(use_enable ipv6)
- $(use_enable dmx)
- $(use_enable kdrive)
- $(use_enable kdrive kdrive-kbd)
- $(use_enable kdrive kdrive-mouse)
- $(use_enable kdrive kdrive-evdev)
- $(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 udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- --sysconfdir=/etc/X11
- --localstatedir=/var
- --enable-install-setuid
- --with-fontrootdir=/usr/share/fonts
- --with-xkb-output=/var/lib/xkb
- --disable-config-hal
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- ${conf_opts}"
-
- # Xorg-server requires includes from OS mesa which are not visible for
- # users of binary drivers.
- # Due to the limitations of CONFIGURE_OPTIONS, we have to export this
- mkdir -p "${T}/mesa-symlinks/GL"
- for i in gl glx glxmd glxproto glxtokens; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- for i in glext glxext; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- append-cppflags "-I${T}/mesa-symlinks"
-
- # (#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
-
- # Incompatible with GCC 3.x CPP, bug #314615
- if [[ $(gcc-major-version) -lt 4 ]]; then
- ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
- ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
- fi
-
- # detect if we should inform user about ebuild breakage
- if ! has_version "x11-base/xorg-server" ||
- has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
- INFO="yes"
- fi
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc hw/xfree86/xorg.conf.example \
- || die "couldn't install xorg.conf.example"
- fi
-
- newinitd "${FILESDIR}"/xdm.initd-3 xdm || die "initd file install failed"
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
- newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
-}
-
-pkg_postinst() {
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set --use-old xorg-x11
-
- if [[ ${INFO} = yes ]]; then
- elog "You should consider reading upgrade guide for this release:"
- elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
- echo
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
- ewarn "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/"
- fi
-}
-
-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
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-05-10 18:09 Matt Turner
0 siblings, 0 replies; 9+ messages in thread
From: Matt Turner @ 2012-05-10 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 9baa869a425e367b0912e05c076daef4a12cfc8a
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu May 10 18:08:51 2012 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu May 10 18:08:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=9baa869a
x11-base/xorg-server: replace with 9999 ebuild and updated patches
---
x11-base/xorg-server/ChangeLog | 1175 --------------------
x11-base/xorg-server/Manifest | 22 +-
.../0001-compiler.h-split-MIPS-and-ARM-code.patch | 94 ++
...mpiler.h-change-MIPS-IOPortBase-to-ioBase.patch | 104 ++
...se-existing-PowerPC-code-paths-in-lnx_vid.patch | 78 ++
x11-base/xorg-server/files/xdm-setup.initd-1 | 2 +-
.../xorg-server/files/{xdm.confd-3 => xdm.confd-4} | 10 +-
.../xorg-server/files/{xdm.initd-3 => xdm.initd-8} | 29 +-
.../files/xorg-cve-2011-4028+4029.patch | 22 -
.../files/xorg-server-1.12-disable-acpi.patch | 11 +
.../files/xorg-server-1.9-nouveau-default.patch | 30 -
.../files/xorg-server-1.9.5-loongson.patch | 53 -
.../files/xorg-server-9999-loongson.patch | 112 --
.../files/xorg-server-disable-acpi.patch | 31 -
.../files/xorg-server-loongson-fix-smi-16bpp.patch | 11 -
x11-base/xorg-server/metadata.xml | 8 +
...ver-1.9.5-r1.ebuild => xorg-server-9999.ebuild} | 155 ++--
17 files changed, 391 insertions(+), 1556 deletions(-)
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
deleted file mode 100644
index 01538b2..0000000
--- a/x11-base/xorg-server/ChangeLog
+++ /dev/null
@@ -1,1175 +0,0 @@
-# ChangeLog for x11-base/xorg-server
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.219 2007/02/19 21:34:17 joshuabaergen Exp $
-
-*xorg-server-1.2.0-r1 (19 Feb 2007)
-
- 19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.2.0-server-damage-version.patch,
- +files/1.2.0-server-randr-version.patch, +xorg-server-1.2.0-r1.ebuild:
- Fix several issues:
-
- Bug #163613 - Server should report its damage implementation version rather
- than the protocol header version. (Todd Merrill)
-
- Bug #164146 - Xprint file locations have changed since 1.1, so fix the ebuild
- to find them correctly. (Ed Catmur)
-
- Bug #167651 - Server should report its randr implementation version rather
- than the protocol header version. (Me)
-
- 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/1.0.2-Xprint-xprintdir.patch, -files/1.0.2-dbe-render.diff,
- -files/1.0.2-fix-readKernelMapping-overrun.patch,
- -files/1.0.2-fix-rom-read-dualhead.patch,
- -files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch,
- -files/1.0.2-try-to-fix-xorgcfg.patch, -files/x11r7.0-setuid.diff,
- -files/xorg-server-1.0.2-64bit-fix-for-glx.patch,
- -files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch,
- -files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch,
- -files/xorg-server-1.0.2-Sbus.patch,
- -files/xorg-server-1.0.2-Xprt-build.patch,
- -files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch,
- -files/xorg-server-1.0.2-xprint-init.patch,
- -files/CVE-2006-1526-xrender-mitri.patch, -xorg-server-1.0.2-r8.ebuild:
- Stop supporting Xorg 7.0.
-
- 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/1.0.99.901-Xprint-xprintdir.patch,
- -files/xorg-server-1.1.99.901-GetDrawableAttributes.patch,
- -files/1.1.99.903-sparc-includes.patch,
- -files/xorg-server-1.1.0-setuid.diff, -files/1.1.99.903-mesa-6.5.2.patch,
- -xorg-server-1.0.2-r7.ebuild, -xorg-server-1.1.0-r1.ebuild,
- -xorg-server-1.1.1.ebuild, -xorg-server-1.1.1-r2.ebuild,
- -xorg-server-1.1.1-r3.ebuild, -xorg-server-1.1.99.903-r1.ebuild:
- Clean up.
-
-*xorg-server-1.2.0 (24 Jan 2007)
-
- 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-1.2.0.ebuild:
- Bump. Upstream incorporated some version of all of our patches, so no more
- need for the aiglx USE flag.
-
- 22 Jan 2007; Steve Dibb <beandog@gentoo.org> xorg-server-1.0.2-r8.ebuild,
- xorg-server-1.1.1-r4.ebuild:
- amd64 stable, bug 157421
-
- 22 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/1.1.1-fixdualhead.patch, +files/1.1.99.903-sparc-includes.patch,
- +files/1.1.1-sparc-includes.patch, xorg-server-1.1.1-r4.ebuild,
- xorg-server-1.1.99.903-r1.ebuild:
- (#159671) Fix sparc build with current kernel headers. (#159375) Fix dual
- head when direct rendering is enabled. No revision bump because these affect
- a minority of users.
-
- 15 Jan 2007; Tim Yamin <plasmaroo@gentoo.org> xorg-server-1.1.1-r4.ebuild:
- Stable on IA64; bug #157421.
-
- 15 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
- xorg-server-1.1.1-r4.ebuild:
- Stable on Alpha, bug 157421.
-
- 14 Jan 2007; René Nussbaumer <killerfox@gentoo.org>
- xorg-server-1.1.1-r4.ebuild:
- Stable on hppa. See bug #157421.
-
- 14 Jan 2007; Markus Rothe <corsair@gentoo.org>
- xorg-server-1.0.2-r8.ebuild, xorg-server-1.1.1-r4.ebuild:
- Stable on ppc64; bug #157421
-
- 14 Jan 2007; Ferris McCormick <fmccor@gentoo.org>
- xorg-server-1.1.1-r4.ebuild:
- Stable on sparc --- Security Bug #157421 --- everything as expected.
-
- 13 Jan 2007; Andrej Kacian <ticho@gentoo.org> xorg-server-1.0.2-r8.ebuild,
- xorg-server-1.1.1-r4.ebuild:
- Stable on x86, bug #157421.
-
- 13 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org>
- xorg-server-1.1.1-r4.ebuild:
- Stable on ppc wrt bug #157421.
-
-*xorg-server-1.1.1-r4 (13 Jan 2007)
-*xorg-server-1.0.2-r8 (13 Jan 2007)
-
- 13 Jan 2007; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.0.2-dbe-render.diff, +files/1.1.1-dbe-render.diff,
- +xorg-server-1.0.2-r8.ebuild, +xorg-server-1.1.1-r4.ebuild:
- Fix multiple vulnerabilities in Render and DBE extensions. (Bug #157421)
-
- 07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1-r3.ebuild:
- Only apply the GLX endianness fix if AIGLX is enabled, since it fixes one of
- the AIGLX patches. Thanks to Elisamuel Resto and Mike Auty for figuring out
- what the problem was. Closes bug #157401.
-
- 07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- Build against the Mesa 6.5.2 release instead of the snapshot.
-
-*xorg-server-1.1.1-r3 (07 Dec 2006)
-
- 07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.1.1-fix_big_endian_glx.patch, +xorg-server-1.1.1-r3.ebuild:
- Fix GLX endianness on big endian systems. This gets rid of the funky colours
- on systems such as PPC when running Compiz/Beryl. (Bug #156715, Rasmus Wiman)
-
- 05 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.99.903-r1.ebuild, xorg-server-1.2.99.0.ebuild:
- Require kbproto 1.0.3.
-
-*xorg-server-1.1.99.903-r1 (04 Dec 2006)
-
- 04 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.1.99.903-mesa-6.5.2.patch, -xorg-server-1.1.99.903.ebuild,
- +xorg-server-1.1.99.903-r1.ebuild:
- Build the 7.2 server against Mesa 6.5.2. Includes a patch from Hanno Böck.
-
-*xorg-server-1.1.99.903 (02 Dec 2006)
-
- 02 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/xorg-server-1.1.99.901-GetDrawableAttributes.patch,
- -xorg-server-1.1.99.902.ebuild, +xorg-server-1.1.99.903.ebuild:
- Version bump for 7.2RC3. Includes several more bugfixes.
-
- A patch has been added from upstream Bugzilla that fixes Compiz/AIGLX
- operation on the server. It's unknown if the patch has any negative
- side-effects yet, so it's hidden behind USE="aiglx" again.
-
- 01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Stable on hppa wrt #144549
-
- 14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.99.902.ebuild:
- xorgcfg appears to build OK again - re-enable it.
-
-*xorg-server-1.1.99.902 (13 Nov 2006)
-
- 13 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- -xorg-server-1.1.99.901.ebuild, +xorg-server-1.1.99.902.ebuild:
- Bump for 7.2RC2. Brings quite a few more bugfixes.
-
-*xorg-server-1.1.1-r2 (09 Nov 2006)
-
- 09 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.1.1-fix_acpi_tokenize.patch, +xorg-server-1.1.1-r2.ebuild:
- Fix X crashes when opening/closing laptop lids on some laptops. (Bug #152184,
- Wendall Cada for the report)
-
- 05 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.2.99.0-fix-sysconfdir-references.patch:
- Add missing patch.
-
- 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- SDL is also currently broken in 1.2.99.0 according to Daniel Stone.
-
- 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- 1.2.99.0:
- - xprint is broken (bug #154067, Cyrill Helg)
- - fix install location of dbus configuration file
-
- 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- Add DBUS dependency. Bump dependencies on evdev, keyboard and mouse drivers
- to enforce input hotplug-compatible versions.
-
- 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- Add 'dbus' USE-flag and disable dmx correctly.
-
- 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- 1.2.99 needs libdrm >= 2.2. Thanks to steev again.
-
- 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- 1.2.99 depends on inputproto >=1.4. Thanks to Steev for the catch.
-
- 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.2.99.0.ebuild:
- Eradicate all references to the currently broken DMX. (Jakub Moc, bug #153928)
-
-*xorg-server-1.2.99.0 (03 Nov 2006)
-
- 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-1.2.99.0.ebuild:
- Add initial input hotplug development release.
-
-*xorg-server-1.1.99.901 (30 Oct 2006)
-
- 30 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-1.1.99.901.ebuild:
- Add 7.2RC1 server snapshot. xorgcfg is broken (probably minorly), and compiz
- compatibility patches are also broken. Loads of fixes and changes since 7.1.
-
- 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1-r1.ebuild:
- Unbreaking kdrive, part 4: Move all the kdrive setup code out to a separate
- function kdrive_setup(). Make variables local to that function.
-
- 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1-r1.ebuild:
- Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other
- servers require them. This replaces the existing fix for bug #136370 and
- should also fix bug #152797.
-
- 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1-r1.ebuild:
- Unbreaking kdrive, part 2: Instead of checking whether a certain VIDEO_CARDS
- setting is in a long list of invalid cards for non-x86 systems, check
- whether it's the single valid setting; Check whether VIDEO_CARDS settings
- are valid kdrive servers before moving into the more complex processing.
-
- 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1-r1.ebuild:
- Unbreaking kdrive, part 1: Fix logic and variable names when forcing
- fbdev/vesa on for Xati; Don't skip binary drivers, it needlessly complicates
- the code for no useful end result.
-
- 18 Oct 2006; Aron Griffis <agriffis@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Mark 1.1.1-r1 stable on alpha. #144549
-
- 17 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Don't try to install xorg.conf.example if the xorg server isn't built. (Bug
- #151670, Balint Dobai-Pataky)
-
- 15 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Don't try to install xorg.conf.example with USE="minimal". (Bug #151421,
- George Kargiotakis)
-
- 14 Oct 2006; Aron Griffis <agriffis@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Mark 1.1.1-r1 stable on ia64. #144549
-
- 13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- AMD64/x86 stable for bug #144549 (X7.1).
-
- 13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Hide AIGLX patches behind the "aiglx" USE flag, since the patches seem to
- cause some EXA slowdowns (bug #147841, reported by Giacomo Perale).
-
- 12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1-r1.ebuild:
- Really fix bug #150052.
-
- 12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/xorg-conf-example.patch, xorg-server-1.1.1-r1.ebuild:
- Install xorg.conf.example like 6.x did. (Bug #138623, requested by
- Christopher Covington; patch written by Donnie and I) Don't build kdrive
- servers that use vm86.h on non-x86 systems. (Bug #150052, Shvetsov Alex)
-
- 06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild,
- xorg-server-1.1.1-r1.ebuild:
- Remove references to nvidia-glx now that it has been removed from the tree.
-
- 20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- files/1.1.1-sparc64-ati-lockups.patch:
- Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit
- kernel/32-bit userland, so sparc64 isn't defined when building the userland.
-
- 20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1-r1.ebuild:
- Use new glproto for eye candy to work properly.
-
- 16 Sep 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.1-r1.ebuild:
- Fix download URLs.
-
- 16 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1-r1.ebuild:
- Use Mesa 6.5.1 instead of a random prerelease snapshot.
-
- 15 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/1.1.1-remove-altix.patch, +files/1.1.1-sparc64-ati-lockups.patch,
- xorg-server-1.1.1.ebuild, xorg-server-1.1.1-r1.ebuild:
- Use upstream's fix for sparc mach64 lockups. An 18-line patch instead of a
- 582-line patch is a good thing.
-
- 12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild,
- xorg-server-1.1.1-r1.ebuild:
- Some comments got displaced to the wrong spot.
-
- 12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
- xorg-server-1.1.1.ebuild:
- Stable on hppa
-
- 08 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2-r7.ebuild, xorg-server-1.1.0-r1.ebuild,
- xorg-server-1.1.1.ebuild, xorg-server-1.1.1-r1.ebuild:
- (#128448) Depend on xplsprinters if USE=xprint, because it's used in profile
- scripts.
-
- 06 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-x11-server-1.1.1-mesa-6.5.1.patch:
- Forgot to cvs add the patch, thanks fmccor.
-
-*xorg-server-1.1.1-r1 (05 Sep 2006)
-
- 05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/01-no-move-damage.patch, +files/02-dont-backfill-bg-none.patch,
- +files/03-tfp-damage.patch, +files/04-mesa-copy-sub-buffer.patch,
- +files/05-offscreen-pixmaps.patch, +files/06-aiglx-happy-vt-switch.patch,
- +files/xorg-server-1.1.1-install-libxf86config-headers.patch,
- +files/1.1.1-fix-xrandr-zoom-keys.patch, +xorg-server-1.1.1-r1.ebuild:
- Bump. (#145797) Add patches for AIGLX+compiz. (#146197) Fix resolution
- switching with ctrl-alt-+/-. Install libxf86config + headers for
- pyxf86config, and extramodes and vesamodes for system-config-display. Do
- correct bash substitution for nvidia kdrive server. This uses a mesa
- snapshot in anticipation of the 6.5.1 release. Some changes will need to
- happen to get it back to using a standard Mesa release tarball.
-
- 03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
- kdrive's VESA driver does not build on AMD64. (Bruno Roggeri, bug #145274)
-
- 27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
- Remove trailing whitespace.
-
- 27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
- Allow 7.1-compatible nvidia-drivers and nvidia-legacy-drivers.
-
- 26 Aug 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.0-r1.ebuild,
- xorg-server-1.1.1.ebuild:
- linuxwacom moved from x11-misc to x11-drivers.
-
- 22 Aug 2006; Ferris McCormick <fmccor@gentoo.org>
- xorg-server-1.1.1.ebuild:
- Stable on sparc, Bug #144549 --- Thanks to dberkholz for incorporating
- remove-altix patch.
-
- 22 Aug 2006; Stephen P. Becker <geoman@gentoo.org>
- xorg-server-1.1.1.ebuild:
- stable on mips, bug 144549
-
- 21 Aug 2006; Markus Rothe <corsair@gentoo.org> xorg-server-1.1.1.ebuild:
- Stable on ppc64; bug #144549
-
- 21 Aug 2006; Joseph Jezak <josejx@gentoo.org> xorg-server-1.1.1.ebuild:
- Marked ppc stable for bug #144549.
-
- 20 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/1.1.1-remove-altix.patch, xorg-server-1.1.1.ebuild:
- (fd.o #3914) Altix support breaks some sparc64 systems with Mach64 video, so
- conditionally patch it out. This patch will be maintained and forward-ported
- by the sparc team. This is the last stable blocker for modular X on sparc.
-
- 18 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1.ebuild:
- Move architecture-specific video driver defaults into profiles.
-
- 12 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
- libdmx and dmxproto should be in USE=dmx dep, not USE=minimal.
-
- 02 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
- Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver.
-
- 19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xorg-server-1.0.2-r7.ebuild:
- Stable on hppa.
-
- 16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Add the warning to this version too.
-
- 16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.1.ebuild:
- Add some warnings about the change in reduced blanking behaviour. (Bug
- #135544, Steffen Strobel)
-
- 11 Jul 2006; Aron Griffis <agriffis@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Mark 1.1.0-r1 stable on ia64
-
- 09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.1.ebuild:
- Also don't build xorgcfg on USE=minimal.
-
- 09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- -xorg-server-1.0.2-r6.ebuild:
- Pull old version.
-
-*xorg-server-1.1.1 (09 Jul 2006)
-
- 09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-1.1.1.ebuild:
- Bump. Bunches of rendering and crasher fixes, incorporates security fix and
- the 2 xprint patches, and more.
-
- 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
- Update to my new email address.
-
- 06 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Added blocker on x11-drivers/nvidia-drivers and
- x11-drivers/nvidia-legacy-drivers since they don't work on 1.1 yet.
-
- 01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff:
- Fix the setuid patches. (Thanks to Rudo Thomas for the catch in bug #138688)
-
- 01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild:
- ppc/sparc/mips/alpha/arm/sh stable
-
- 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild:
- sparc shouldn't pull in vesa and vga.
-
- 30 Jun 2006; Markus Rothe <corsair@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Stable on ppc64
-
- 30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
- xorg-server-1.0.2-r7.ebuild:
- Stable on amd64.
-
- 30 Jun 2006; Markus Rothe <corsair@gentoo.org>
- xorg-server-1.0.2-r7.ebuild:
- Stable on ppc64
-
- 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2-r7.ebuild:
- x86 stable.
-
-*xorg-server-1.0.2-r7 (30 Jun 2006)
-
- 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/1.0.2-fix-rom-read-dualhead.patch, +xorg-server-1.0.2-r7.ebuild:
- Fix dual-head.
-
- 30 Jun 2006; Stephen P. Becker <geoman@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- added video_cards_impact to IUSE_VIDEO_CARDS, enable it for mips users
-
- 27 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Only pull in loadable drivers if the xorg USE-flag is set. (bug #135873)
-
- 28 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild:
- Fix typo video_cards_3dfx > video_cards_tdfx (Jakub Moc).
-
- 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Fix kdrive+ATI build. (Priit Laes, bug #136370)
-
- 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0-r1.ebuild:
- Allow USE="-* minimal" for xorg-server so that Xvfb can be built by itself.
- (Patch by Ed Catmur, bug #137991)
-
- 21 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.1.0-r1.ebuild:
- Fix up VIDEO_CARDS for mips, they don't want ati, mga, sisusb.
-
-*xorg-server-1.1.0-r1 (20 Jun 2006)
-*xorg-server-1.0.2-r6 (20 Jun 2006)
-
- 20 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.1.0-setuid.diff, +files/x11r7.0-setuid.diff,
- -xorg-server-1.0.2-r4.ebuild, -xorg-server-1.0.2-r5.ebuild,
- +xorg-server-1.0.2-r6.ebuild, -xorg-server-1.1.0.ebuild,
- +xorg-server-1.1.0-r1.ebuild:
- Security bump. Failure to check the return value of setuid() in a privileged
- process could be used by a local user for file overwriting and possible
- privilege escalation in corner cases. See
- http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for more
- information.
-
- 17 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0.ebuild:
- Drop nvidia and fglrx flags for now and block all nvidia-glx and ati-drivers
- versions since neither of the binary drivers are supported currently.
- (Jakub Moc, bug #136788)
-
-*xorg-server-1.0.2-r5 (11 Jun 2006)
-
- 11 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/1.0.2-fix-readKernelMapping-overrun.patch,
- +xorg-server-1.0.2-r5.ebuild:
- Fix an overrun that was causing various issues on VT switch. This is already
- fixed in 1.1. (Matthias Dahl, bug #127608)
-
- 04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0.ebuild:
- Ensure eautoreconf gets run when building xprint and kdrive. (Walter Meinl,
- bug #135263)
-
- 04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.1.0.ebuild:
- Have the ebuild fail if no server will be built, instead of appearing to
- complete successfully but not installing enough binaries for a usable X.
- (Bug #132140)
-
-*xorg-server-1.1.0 (23 May 2006)
-
- 23 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- -xorg-server-1.0.99.903.ebuild, +xorg-server-1.1.0.ebuild:
- Bump for 7.1 final. Includes various crash fixes, etc.
-
- 14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2-r4.ebuild:
- Force on xorg-x11 opengl implem for compile, to ensure we have recent enough
- glxtokens.h. Reported by johey on freenode.
-
- 14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.99.903.ebuild:
- (#133295) Fix kdrive build when s3 is on, because it also sedded out the s3
- from the middle of sis300. Also a fix for turning off sis300 at all. Fixes
- by Kent Fredric.
-
- 14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.903.ebuild:
- Add RESTRICT=stricter, because FEATURES=stricter dies on installing anything
- suid with lazy bindings. The X server needs lazy bindings because of how its
- module loading works. Hopefully at some point, upstream will change this.
- Suggested by Kevin F. Quinn.
-
- 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.0.99.903.ebuild:
- Move driver dependencies from the meta-ebuild to xorg-server as a
- PDEPEND. (Michal Suchanek, bug #132696)
-
-*xorg-server-1.0.99.903 (13 May 2006)
-
- 13 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- -xorg-server-1.0.99.902-r1.ebuild, +xorg-server-1.0.99.903.ebuild:
- Bump to 7.1RC3.
-
- 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.902-r1.ebuild:
- Force update to libxkbui-1.0.2 per dberkholz' suggestion, hopefully fixing
- _XkbStrCaseCmp-related issues.
-
-*xorg-server-1.0.99.902-r1 (02 May 2006)
-*xorg-server-1.0.2-r4 (02 May 2006)
-
- 02 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/CVE-2006-1526-xrender-mitri.patch, -xorg-server-1.0.2-r3.ebuild,
- +xorg-server-1.0.2-r4.ebuild, -xorg-server-1.0.99.902.ebuild,
- +xorg-server-1.0.99.902-r1.ebuild:
- Security bump and remove all affected versions. Please see Bug #130979 for
- details.
-
- 30 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/1.0.99.901-fix-kdrive-build.patch,
- -files/1.0.99.901-wrap-sdk-headers.patch,
- -xorg-server-1.0.99.901-r1.ebuild:
- Pull old 7.1RC ebuild.
-
- 30 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.99.902.ebuild:
- (#131817) Move the nptl diemsg out of an if, since we also use it in the else.
-
-*xorg-server-1.0.99.902 (29 Apr 2006)
-
- 29 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-1.0.99.902.ebuild:
- Version bump. Includes quite a few bugfixes.
-
- 24 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.99.901-r1.ebuild:
- We don't need to apply the xf86Sbus.h creation patch anymore. It was
- applying successfully by appending itself to the already-complete file in
- the tarball.
-
- 23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.99.901-r1.ebuild:
- Fix the USE=-xorg build, can't do use_with() on mesa-source because it won't
- accept the --without option.
-
- 23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- files/digest-xorg-server-1.0.99.901-r1:
- Fix digest.
-
- 23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.2-Xprt-build.patch,
- +files/1.0.2-Xprint-xprintdir.patch,
- +files/xorg-server-1.0.2-xprint-init.patch,
- +files/1.0.99.901-Xprint-xprintdir.patch, xorg-server-1.0.2-r3.ebuild,
- xorg-server-1.0.99.901-r1.ebuild:
- (#128448) Fix xprint (Ed Catmur). Still needs a dep added on xplsprinters
- when xprint is in USE, but arches haven't keyworded it yet.
-
-*xorg-server-1.0.99.901-r1 (21 Apr 2006)
-
- 21 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/1.0.99.901-fix-kdrive-build.patch,
- +files/1.0.99.901-wrap-sdk-headers.patch, -xorg-server-1.0.99.901.ebuild,
- +xorg-server-1.0.99.901-r1.ebuild:
- Add option to build kdrive, tiny X servers; also add VIDEO_CARDS settings to
- select kdrive servers to build. Add option to build AIGLX with TLS support
- (USE=nptl) -- mesa and xorg-server must be in sync on this. Update some
- deps: glproto, scrnsaverproto. Don't need to inherit flag-o-matic, x-modular
- eclass does this for us. Make Xdmx build its own USE flag, instead of part
- of minimal. Force xorg-x11 OpenGL to build, because it needs a newer
- glxtokens.h than some binary drivers provide. Add a server_based_install()
- function for any actions dependent on which servers get built. Add USE=xorg
- to build the Xorg X server, which will be on by default.
-
- 17 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.0.2-r3.ebuild:
- Drop the mesa version check since it shouldn't be required.
-
- 17 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.99.901.ebuild:
- AIGLX defaults on, don't need to enable it.
-
-*xorg-server-1.0.99.901 (14 Apr 2006)
-
- 14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.0.2-r3.ebuild, -xorg-server-1.0.99.2.ebuild,
- +xorg-server-1.0.99.901.ebuild:
- Bump xorg-server for 7.1RC1. Change Mesa dependencies on all servers to
- account for the changed paths in Mesa 6.5-r2.
-
-*xorg-server-1.0.99.2 (12 Apr 2006)
-
- 12 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-1.0.99.2.ebuild:
- Add a xorg-server snapshot from upstream. This snapshot compiles against Mesa
- 6.5 and has AIGLX enabled.
-
- 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
- xorg-server-1.0.2-r3.ebuild:
- Add ~x86-fbsd keyword.
-
- 31 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
- Only need that ChangeLog message once.
-
-*xorg-server-1.0.2-r3 (31 Mar 2006)
-
- 31 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.2-64bit-fix-for-glx.patch,
- -xorg-server-1.0.2-r2.ebuild, +xorg-server-1.0.2-r3.ebuild:
- Really fix 64-bit direct rendering. glcontextmodes.[ch] doesn't include
- glheader.h, so it also needs to include dix-config.h.
-
-*xorg-server-1.0.2-r2 (28 Mar 2006)
-
- 28 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch,
- +files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch,
- -xorg-server-1.0.2-r1.ebuild, +xorg-server-1.0.2-r2.ebuild:
- Re-add 64-bit direct rendering patches that got lost in the 1.0.2 bump.
-
- 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; +files/xprint.init,
- xorg-server-1.0.2-r1.ebuild:
- (#127425) Install xprint init scripts and directories, patch by Ed Catmur.
-
- 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2-r1.ebuild:
- Re-add font-adobe-75dpi to RDEPEND, caught by Jonathan Adamczewski.
-
- 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2-r1.ebuild:
- Add deps on compositeproto 0.3 and fixesproto 4.0, otherwise build may break
- with overlay window patch.
-
-*xorg-server-1.0.2-r1 (24 Mar 2006)
-
- 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- -xorg-server-1.0.2.ebuild, +xorg-server-1.0.2-r1.ebuild:
- (#127333) Fix crashing of pretty much all gtk+-2 apps. We had the
- client-side updates to composite and fixes extensions, but we didn't let the
- server know about them, which resulted in lots of BadRequests.
-
- 23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.2.ebuild:
- Depends on media-fonts/font-adobe-75dpi for xorgcfg.
-
- 23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch,
- +files/1.0.2-try-to-fix-xorgcfg.patch, xorg-server-1.0.2.ebuild:
- (#117299) Fix xorgconfig, which was producing an invalid RgbPath setting.
- (#117071) Attempt to fix xorgcfg. I couldn't test without /etc/X11/xorg.conf
- because it was producing invalid modes on my monitor, but it worked when
- xorg.conf was present.
-
-*xorg-server-1.0.2 (21 Mar 2006)
-
- 21 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch,
- -files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch,
- -files/xorg-server-1.0.1-Sbus.patch,
- -files/xorg-server-1.0.1-amd64-fix-for-glx.patch,
- -files/xorg-server-1.0.1-backtrace.patch,
- +files/xorg-server-1.0.2-Sbus.patch,
- +files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch,
- -xorg-server-1.0.1-r4.ebuild, +xorg-server-1.0.2.ebuild:
- (#125803) Fix local root vulnerability present in 6.8.99.x and newer. This
- does NOT affect 6.8.2.
-
-*xorg-server-1.0.1-r4 (19 Feb 2006)
-
- 19 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch,
- +files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch,
- -xorg-server-1.0.1-r3.ebuild, +xorg-server-1.0.1-r4.ebuild:
- Really fix GLX on 64-bit systems.
-
- 14 Feb 2006; Markus Rothe <corsair@gentoo.org>
- xorg-server-1.0.1-r3.ebuild:
- Added ~ppc64
-
-*xorg-server-1.0.1-r3 (13 Feb 2006)
-
- 13 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.1-amd64-fix-for-glx.patch,
- -xorg-server-1.0.1-r2.ebuild, +xorg-server-1.0.1-r3.ebuild:
- (#122140) Add patch to fix OpenGL on amd64, thanks to Igor V. Kovalenko
- <garrison@mail.ru>. Also update to Mesa 6.4.2 tarball so people only need to
- download one version of it.
-
- 06 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.1-r2.ebuild:
- Add an OR dependency with xkbdata for new x11-misc/xkeyboard-config, and
- prefer it over xkbdata.
-
- 03 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.1-r2.ebuild:
- (#121394) Filter -fweb, because it causes window corruption.
-
- 31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org>
- xorg-server-1.0.1-r2.ebuild:
- Unstable on hppa.
-
-*xorg-server-1.0.1-r2 (26 Jan 2006)
-
- 26 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.1-backtrace.patch, -xorg-server-1.0.1.ebuild,
- -xorg-server-1.0.1-r1.ebuild, +xorg-server-1.0.1-r2.ebuild:
- Fix the automatic backtraces at the bottom of /var/log/Xorg.*.log on segfaults.
-
- 19 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-1.0.1.ebuild, xorg-server-1.0.1-r1.ebuild:
- Update the license.
-
- 04 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.1-r1.ebuild:
- No need to specify configure options that are the default.
-
- 04 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-1.0.1-r1.ebuild:
- No need to manually create Xorg -> X symlink anymore.
-
-*xorg-server-1.0.1-r1 (03 Jan 2006)
-
- 03 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-1.0.1-r1.ebuild:
- Fix the libglx* relocation routine to look in the right place so that xorg-x11
- will play nice with eselect. Bug #117100.
-
- 26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org>
- xorg-server-1.0.1.ebuild:
- Marked ~alpha
-
-*xorg-server-1.0.1 (23 Dec 2005)
-
- 23 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-1.0.1-Sbus.patch, -xorg-server-0.99.4-r2.ebuild,
- -xorg-server-1.0.0.ebuild, +xorg-server-1.0.1.ebuild:
- Bump for 7.0. (#111361) Add patch to fix sparc build.
-
-*xorg-server-1.0.0 (17 Dec 2005)
-
- 17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-1.0.0.ebuild:
- Bump for 7.0RC4.
-
- 09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/fix-xkb-compile-path-2.patch:
- Unused file.
-
- 09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -xorg-server-0.99.2-r2.ebuild, -xorg-server-0.99.3.ebuild,
- -xorg-server-0.99.3-r1.ebuild, -xorg-server-0.99.4.ebuild,
- -xorg-server-0.99.4-r1.ebuild:
- Pull old versions.
-
-*xorg-server-0.99.4-r2 (06 Dec 2005)
-
- 06 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-0.99.4-r2.ebuild:
- Build against Mesa 6.4.1 instead of Mesa 6.4. Caught by dagb.
-
-*xorg-server-0.99.4-r1 (05 Dec 2005)
-
- 05 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-0.99.4-r1.ebuild:
- It would appear that libglx (silently) fails to build if libdrm is not >=
- version 2. Rev-bump so that anyone who has merged this already gets a forced
- re-merge and thus gets a working glx extension.
-
-*xorg-server-0.99.4 (04 Dec 2005)
-
- 04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-0.99.4.ebuild:
- Bump for 7.0RC3.
-
- 14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/fix-xkb-compile-path-2.patch, -files/fix-xkb-compile-path.patch,
- xorg-server-0.99.3-r1.ebuild:
- Remove CVS tags from patch as they don't do anything but break installs.
- Fixes bug #112476.
-
-*xorg-server-0.99.3-r1 (14 Nov 2005)
-
- 14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/fix-xkb-compile-path.patch, +xorg-server-0.99.3-r1.ebuild:
- Fix xkb issue spotted by dberkholz.
-
-*xorg-server-0.99.3 (11 Nov 2005)
-
- 11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +xorg-server-0.99.3.ebuild:
- Bump for 7.0RC2.
-
-*xorg-server-0.99.2-r2 (09 Nov 2005)
-
- 09 Nov 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -xorg-server-0.99.2-r1.ebuild, +xorg-server-0.99.2-r2.ebuild:
- Build against mesa 6.4 instead of 6.3.2.
-
- 31 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -xorg-server-0.99.1_p20051013-r1.ebuild, -xorg-server-0.99.2.ebuild:
- Pull old versions.
-
- 29 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.2-r1.ebuild:
- Note that X->Xorg symlink will be taken care of for any new snapshots, so we
- can remove the line from the ebuild.
-
- 20 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.2-r1.ebuild:
- Use --enable-install-setuid instead of manually changing permissions.
-
-*xorg-server-0.99.2-r1 (20 Oct 2005)
-
- 20 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.2-r1.ebuild:
- (#109926) No need to specify xkb path anymore, it's wrong now as well.
-
-*xorg-server-0.99.2 (20 Oct 2005)
-
- 20 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.2.ebuild:
- Bump for 7.0 RC1.
-
- 19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
- xorg-server-0.99.1_p20051013-r1.ebuild:
- added ~mips keyword
-
- 17 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1_p20051013-r1.ebuild:
- (#109354) In some mystical way all the dependency changes got reverted in
- the new revision.
-
- 16 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/0.99.1-r10-check-for-glproto.patch,
- -files/0.99.1-r10_CAN-2005-2495.patch, -files/fix-transparencies.patch,
- -xorg-server-0.99.1-r10.ebuild, -xorg-server-0.99.1_p20051013.ebuild:
- Pull old ebuilds.
-
-*xorg-server-0.99.1_p20051013-r1 (16 Oct 2005)
-
- 16 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.1_p20051013-r1.ebuild:
- (#109467) Set a non-broken default font path so things like Xvfb actually work.
-
- 15 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1_p20051013.ebuild:
- Add x11-libs/libXtst for dmx.
-
- 15 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1_p20051013.ebuild:
- (#109354) Add lots of deps -- libXaw, libXpm, libXxf86misc, libXxf86vm. Add
- notes on which parts depend on them.
-
- 14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1_p20051013.ebuild:
- Also wrap dmxproto dep in minimal USE.
-
- 14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1_p20051013.ebuild:
- (#109124) Add dep on libdmx, within check for USE=minimal. Also move libXres
- dep within there, because it's for dmx.
-
- 14 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- xorg-server-0.99.1_p20051013.ebuild:
- Add missing deps (x11-libs/libXres and x11-libs/libxkbui).
-
- 14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/0.99.1-r9_CAN-2005-2495.patch,
- -files/0.99.1-r9-check-for-glproto.patch, -xorg-server-0.99.1-r9.ebuild:
- Drop old revision.
-
-*xorg-server-0.99.1_p20051013 (14 Oct 2005)
-
- 14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.1_p20051013.ebuild:
- Update to today's CVS. Enable xprint USE flag. Stop filtering
- -fomit-frame-pointer, because it works now. Add dep on
- >=x11-proto/glproto-1.4.1_pre20051013 to fix build breakage.
-
- 04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/0.99.1-r10-check-for-glproto.patch,
- +files/0.99.1-r10_CAN-2005-2495.patch:
- Oops, forgot the version-dependent patches.
-
-*xorg-server-0.99.1-r10 (04 Oct 2005)
-
- 04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/fix-transparencies.patch, +xorg-server-0.99.1-r10.ebuild:
- Added fix for OO/wine transparencies from bug #96053. Thanks to bartron for
- both patches.
-
- 27 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r9.ebuild:
- As of 20050927, xprint will require mkfontdir/mkfontscale for XpConfig.
-
- 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- -files/0.99.1-r6-check-for-glproto.patch,
- -files/0.99.1-r8-check-for-glproto.patch, -files/fix-xnest.patch,
- -files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r7.ebuild,
- -xorg-server-0.99.1-r8.ebuild:
- Remove old versions and patches.
-
-*xorg-server-0.99.1-r9 (13 Sep 2005)
-
- 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/0.99.1-r9_CAN-2005-2495.patch,
- +files/0.99.1-r9-check-for-glproto.patch, +xorg-server-0.99.1-r9.ebuild:
- Bump to include security fix from bug #105688.
-
- 12 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r8.ebuild:
- Add some deps so we get a server that actually runs after emerging it. In
- specific: media-fonts/font-misc-misc media-fonts/font-cursor-misc
- x11-misc/xbitmaps x11-misc/xkbdata x11-apps/iceauth x11-apps/rgb
- x11-apps/xauth x11-apps/xinit.
-
- 09 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml:
- Add metadata.
-
-*xorg-server-0.99.1-r8 (08 Sep 2005)
-
- 08 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/0.99.1-r8-check-for-glproto.patch, +xorg-server-0.99.1-r8.ebuild:
- Update to CVS HEAD as of 20050907. Update glproto patch to apply cleanly.
-
- 06 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r7.ebuild:
- Make --enable-xcsecurity always on, remove nvidia USE.
-
- 03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
- xorg-server-0.99.1-r7.ebuild:
- Changed opengl-update envocation to use eselect instead.
-
- 03 Sep 2005; Doug Goldstein <cardoe@gentoo.org>
- +xorg-server-0.99.1-r7.ebuild, -xorg-server-0.99.1-r6.ebuild:
- Added support for the XCSecurity option, which is what's needed to make
- binary Nvidia drivers work
-
- 02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- -files/0.99.1-r5-check-for-glproto.patch,
- +files/0.99.1-r6-check-for-glproto.patch:
- Apparently this patch has a package revision-based name.
-
- 02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild,
- +xorg-server-0.99.1-r6.ebuild:
- Makes certain draw code endian-safe. Should fix things for big-endian
- arches. Thanks to Stanislaw Skowronek and geoman in bug #104318.
-
-*xorg-server-0.99.1-r6 (02 Sep 2005)
-
- 02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
- +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild,
- +xorg-server-0.99.1-r6.ebuild:
- Added fix to make colour calculations endian safe. Thanks to Stanislaw
- Skowronek for the patch and geoman for the heads-up. Fixes bug #104318.
-
- 30 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
- xorg-server-0.99.1-r5.ebuild:
- s/lib/$(get_libdir)
-
- 23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
- -files/xorg-server-0.99.1-x86_64-1.patch, -xorg-server-0.99.1-r4.ebuild:
- Pull old version.
-
- 23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/0.99.1-r5-check-for-glproto.patch, xorg-server-0.99.1-r5.ebuild:
- (#fd.o 3990) Add 0.99.1-r5-check-for-glproto.patch. Pass
- --with-xkb-path=/usr/lib/X11/xkb in attempt to get VT switching closer to
- working. Update CVS patch to 20050822-1, which makes xprint almost work.
-
-*xorg-server-0.99.1-r5 (22 Aug 2005)
-
- 22 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/fix-xnest.patch, +xorg-server-0.99.1-r5.ebuild:
- Update to CVS as of 20050822. This should make amd64 and sparc work. Update
- included mesa to 6.3.2. Stop forcing glx on, it's on by default. Add
- --disable-static so we don't build .a files for server modules. Add
- fix-xnest.patch to fix breakage in the Xnest linking, caused by the
- configure.ac reworking a couple of days ago.
-
- 21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r4.ebuild:
- xprint build is broken; force it off.
-
- 21 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
- xorg-server-0.99.1-r4.ebuild:
- Marked ~ppc
-
- 21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- -files/xorg-composite.patch, -files/xorg-server-fbmmx-local.patch,
- -xorg-server-0.99.1.ebuild, -xorg-server-0.99.1-r1.ebuild,
- -xorg-server-0.99.1-r2.ebuild, -xorg-server-0.99.1-r3.ebuild:
- Drop old versions.
-
-*xorg-server-0.99.1-r4 (21 Aug 2005)
-
- 21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.1-r4.ebuild:
- Update to today's CVS. This adds a USE flag for xprint. Also, get rid of the
- glx USE flag, because everybody should get it.
-
- 20 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1.ebuild, xorg-server-0.99.1-r1.ebuild,
- xorg-server-0.99.1-r2.ebuild, xorg-server-0.99.1-r3.ebuild:
- panoramixproto moved to xineramaproto.
-
- 17 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-fbmmx-local.patch, xorg-server-0.99.1-r3.ebuild:
- (fd.o #4073) Fix compilation failures at fbmmx.c. Patch from Diego Pettenò
- <flameeyes@gentoo.org>.
-
- 16 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r3.ebuild:
- Wrap opengl things in `if use glx..`
-
- 15 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
- xorg-server-0.99.1-r3.ebuild:
- Marked ~amd64.
-
- 14 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-server-0.99.1-x86_64-1.patch, xorg-server-0.99.1-r3.ebuild:
- Add xorg-server-0.99.1-x86_64-1.patch to fix configure.ac on amd64.
-
- 14 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r3.ebuild:
- Wrap pkg_postrm() module dir removal in ! has_version.
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r3.ebuild:
- No longer necessary to force --enable-composite; it's on by default.
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r3.ebuild:
- Update opengl-update dependency to 2.2.3 for proper handling of
- /usr/libdir/modules/extensions/.
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r3.ebuild:
- Remove xinerama USE flag; building without it causes major issues.
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r3.ebuild:
- Add pkg_postrm() to get rid of /usr/lib/xorg/modules. This should make
- things work better for people crazy enough to downgrade to monolithic.
-
-*xorg-server-0.99.1-r3 (12 Aug 2005)
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.1-r3.ebuild:
- Set /usr/bin/Xorg suid so it starts.
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r2.ebuild:
- Fix the patch that mysteriously broke.
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
- +xorg-server-0.99.1-r2.ebuild:
- Re-add, this time with a huge patch on the mirror.
-
- 12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
- -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
- -files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch,
- -xorg-server-0.99.1-r2.ebuild:
- Removed 0.99.1-r2 version (3.3MB patch is not good).
-
-*xorg-server-0.99.1-r2 (12 Aug 2005)
-
- 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
- +files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch,
- +xorg-server-0.99.1-r2.ebuild:
- Add xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch to fix big-endian
- breakage, composite, some other stuff. Split out non-composite things from
- xorg-composite.patch to check-for-glproto.patch and fix-xf86misc-typo.patch.
-
- 11 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r1.ebuild:
- Make an X->Xorg symlink in here until upstream can make one.
-
- 11 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r1.ebuild:
- Add more deps: inputproto, bigreqsproto, xcmiscproto. All reported by aaronf0.
-
- 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1-r1.ebuild:
- Move confopts into pkg_setup(), and therefore also CONFIGURE_OPTIONS.
-
-*xorg-server-0.99.1-r1 (10 Aug 2005)
-
- 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +xorg-server-0.99.1-r1.ebuild:
- Rev bump to make sure people get working GL setup.
-
- 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1.ebuild:
- Add GL handling, /usr/lib/opengl, opengl-update, etc.
-
- 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1.ebuild:
- Add dep on x11-proto/kbproto, again from aaronf0.
-
- 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1.ebuild:
- Add dep on fontsproto, reported by aaronf0 on irc.
-
- 09 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1.ebuild:
- (#101883) Add trapproto and panoramixproto as deps.
-
- 08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
- xorg-server-0.99.1.ebuild:
- Add ~sparc keyword (prepare for X Modular testing).
-
- 08 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- xorg-server-0.99.1.ebuild:
- (#101749) Add dependencies on videoproto, scrnsaverproto and evieext.
- Reported by Georgi Georgiev <chutz@gg3.net>.
-
-*xorg-server-0.99.1 (08 Aug 2005)
-
- 08 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
- +files/xorg-composite.patch, +xorg-server-0.99.1.ebuild:
- Initial commit for modular X.
-
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 79e0d21..3e64508 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,14 +1,10 @@
-AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
-AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
-AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
-AUX xorg-cve-2011-4028+4029.patch 671 RMD160 f9c607b5bfe20259f2adb320b6a1a0819f59f7ab SHA1 84797b66434aa05acc9f6881050d1b46487caf77 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c
-AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
-AUX xorg-server-1.9.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-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
-AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca
+AUX 0001-compiler.h-split-MIPS-and-ARM-code.patch 2848 RMD160 410c16e1d9f51b4958dcbe0b116b405e49253049 SHA1 57d93b61c3c25bdfa27e3b4529552f5346a05629 SHA256 6739a5abb3cac7c473736d476f171090cca8b03175ccc76f8f21d490df2a4b92
+AUX 0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch 3509 RMD160 1a672e811f8c26bbebc2fe3b79cfe40f93728e4f SHA1 66a81dbf50fdc593b3580c119457f8143b5c9f5c SHA256 d0bc87be968fd72dd6c17267457b11e7775274fb693a228f734ca1164b200baf
+AUX 0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch 2918 RMD160 72bca5acd05bd7ca236e7673ed6ffcfac58bc4b0 SHA1 2b0f082375fb4f77927e10d2b21bc24d076dd1bc SHA256 4d9ab2d51c833575f4cc6ed2cfe589cee816f6330a496320e157d12134245a23
+AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0
+AUX xdm.confd-4 562 RMD160 3440e564c5d52ec1d30902c870daf282698f04c4 SHA1 630b8e05706050a6b7260d2a1a19d6d54cba59fa SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8
+AUX xdm.initd-8 5703 RMD160 622a05f0f38e8e28137a577545d84feca47022fc SHA1 9b359c5cd8252b11b9bd6e29e7e56b6880002696 SHA256 068954df9d45d46b185e54fb3db77791c8afbd2424bcb49078f1288599142281
+AUX xorg-server-1.12-disable-acpi.patch 275 RMD160 01244888695fc7928c81c06cc1f4fcd3625fc9de SHA1 555a4d16f38ed54ed9efa6fff9ec230d11362e30 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
-EBUILD xorg-server-1.9.5-r1.ebuild 8011 RMD160 4db5d07629aa985fa58f7274985a669ed437ef3d SHA1 32207cbd09f746e7e87d2483ef416002fcfa8b3e SHA256 9eb896d532a72a4962cc085ada9889f63fceb5f34c1df351ed5e9f229b224839
-MISC ChangeLog 46548 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed SHA1 c1c264afd91f7d13bd8c4cd5d8d03cc9327e1e14 SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+EBUILD xorg-server-9999.ebuild 7094 RMD160 c575b468d80924b5cbc64f651a3d27f9cf923f4b SHA1 4229492472a0c80bf3db05d11b6c6c4f2d6d740f SHA256 8a97f163cdccb5cb95fac027916e4b9b3c26cbf7965a3a080c78a99f218cc1f3
+MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f
diff --git a/x11-base/xorg-server/files/0001-compiler.h-split-MIPS-and-ARM-code.patch b/x11-base/xorg-server/files/0001-compiler.h-split-MIPS-and-ARM-code.patch
new file mode 100644
index 0000000..b858ecb
--- /dev/null
+++ b/x11-base/xorg-server/files/0001-compiler.h-split-MIPS-and-ARM-code.patch
@@ -0,0 +1,94 @@
+From 66482b79cf539e53a522787fce7fdfe74989a0e4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 10 May 2012 13:11:12 -0400
+Subject: [PATCH 1/3] compiler.h: split MIPS and ARM code
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ hw/xfree86/common/compiler.h | 55 ++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 48 insertions(+), 7 deletions(-)
+
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index 0abdfb6..27bce92 100644
+--- a/hw/xfree86/common/compiler.h
++++ b/hw/xfree86/common/compiler.h
+@@ -703,12 +703,8 @@ xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
+ :"r"(val), "r"(addr), "i"(ASI_PL));
+ }
+
+-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+-#ifdef __arm32__
+-#define PORT_SIZE long
+-#else
++#elif defined(__mips__)
+ #define PORT_SIZE short
+-#endif
+
+ _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
+
+@@ -754,7 +750,6 @@ inl(unsigned PORT_SIZE port)
+ IOPortBase);
+ }
+
+-#if defined(__mips__)
+ #ifdef linux /* don't mess with other OSs */
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+ static __inline__ unsigned int
+@@ -780,7 +775,53 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
+ }
+ #endif
+ #endif /* !linux */
+-#endif /* __mips__ */
++
++#elif (defined(__arm32__) && !defined(__linux__))
++#define PORT_SIZE long
++
++_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
++
++static __inline__ void
++outb(unsigned PORT_SIZE port, unsigned char val)
++{
++ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++ val;
++}
++
++static __inline__ void
++outw(unsigned PORT_SIZE port, unsigned short val)
++{
++ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++ val;
++}
++
++static __inline__ void
++outl(unsigned PORT_SIZE port, unsigned int val)
++{
++ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++ val;
++}
++
++static __inline__ unsigned int
++inb(unsigned PORT_SIZE port)
++{
++ return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
++ IOPortBase);
++}
++
++static __inline__ unsigned int
++inw(unsigned PORT_SIZE port)
++{
++ return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
++ IOPortBase);
++}
++
++static __inline__ unsigned int
++inl(unsigned PORT_SIZE port)
++{
++ return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
++ IOPortBase);
++}
+
+ #elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
+
+--
+1.7.3.4
+
diff --git a/x11-base/xorg-server/files/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch b/x11-base/xorg-server/files/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch
new file mode 100644
index 0000000..a6bee61
--- /dev/null
+++ b/x11-base/xorg-server/files/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch
@@ -0,0 +1,104 @@
+From d83874593b04258cc5b866eb57d4d085eed67fae Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 10 May 2012 13:21:20 -0400
+Subject: [PATCH 2/3] compiler.h: change MIPS IOPortBase to ioBase
+
+This will allow us to use the existing __powerpc__ code paths in
+lnx_video.c.
+
+Also remove unnecessary casts.
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ hw/xfree86/common/compiler.h | 33 ++++++++++++------------------
+ hw/xfree86/os-support/linux/lnx_video.c | 5 +++-
+ 2 files changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index 27bce92..9669df9 100644
+--- a/hw/xfree86/common/compiler.h
++++ b/hw/xfree86/common/compiler.h
+@@ -704,50 +704,43 @@ xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
+ }
+
+ #elif defined(__mips__)
+-#define PORT_SIZE short
+
+-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
++extern _X_EXPORT volatile unsigned char *ioBase;
+
+ static __inline__ void
+-outb(unsigned PORT_SIZE port, unsigned char val)
++outb(unsigned short port, unsigned char val)
+ {
+- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+- val;
++ *(volatile unsigned char *) (port + (uintptr_t)ioBase) = val;
+ }
+
+ static __inline__ void
+-outw(unsigned PORT_SIZE port, unsigned short val)
++outw(unsigned short port, unsigned short val)
+ {
+- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+- val;
++ *(volatile unsigned short *) (port + (uintptr_t)ioBase) = val;
+ }
+
+ static __inline__ void
+-outl(unsigned PORT_SIZE port, unsigned int val)
++outl(unsigned short port, unsigned int val)
+ {
+- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+- val;
++ *(volatile unsigned int *) (port + (uintptr_t)ioBase) = val;
+ }
+
+ static __inline__ unsigned int
+-inb(unsigned PORT_SIZE port)
++inb(unsigned short port)
+ {
+- return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
+- IOPortBase);
++ return *(volatile unsigned char *) (port + (uintptr_t)ioBase);
+ }
+
+ static __inline__ unsigned int
+-inw(unsigned PORT_SIZE port)
++inw(unsigned short port)
+ {
+- return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
+- IOPortBase);
++ return *(volatile unsigned short *) (port + (uintptr_t)ioBase);
+ }
+
+ static __inline__ unsigned int
+-inl(unsigned PORT_SIZE port)
++inl(unsigned short port)
+ {
+- return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
+- IOPortBase);
++ return *(volatile unsigned int *) (port + (uintptr_t)ioBase);
+ }
+
+ #ifdef linux /* don't mess with other OSs */
+diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
+index 3526a21..cd46f97 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -472,8 +472,11 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+ /* I/O Permissions section */
+ /***************************************************************************/
+
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ volatile unsigned char *ioBase = NULL;
++#endif
++
++#if defined(__powerpc__)
+
+ #ifndef __NR_pciconfig_iobase
+ #define __NR_pciconfig_iobase 200
+--
+1.7.3.4
+
diff --git a/x11-base/xorg-server/files/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch b/x11-base/xorg-server/files/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch
new file mode 100644
index 0000000..54e7aae
--- /dev/null
+++ b/x11-base/xorg-server/files/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch
@@ -0,0 +1,78 @@
+From a20c36d4ea6ae8c553c81bf3def81591ff91dce6 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 10 May 2012 13:23:12 -0400
+Subject: [PATCH 3/3] Make MIPS use existing PowerPC code paths in lnx_video.c
+
+This allows X to work on the Lemote Yeeloong laptop.
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ hw/xfree86/dri/sarea.h | 2 ++
+ hw/xfree86/os-support/linux/lnx_video.c | 14 +++++++++-----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h
+index 7a55b49..e3b7763 100644
+--- a/hw/xfree86/dri/sarea.h
++++ b/hw/xfree86/dri/sarea.h
+@@ -41,6 +41,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 cd46f97..4b228ba 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -487,16 +487,20 @@ volatile unsigned char *ioBase = NULL;
+ Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ int fd;
+- unsigned int ioBase_phys;
++ unsigned long ioBase_phys;
+ #endif
+
+ if (ExtendedEnabled)
+ return TRUE;
+
++#if defined(__powerpc__) || defined(__mips__)
+ #if defined(__powerpc__)
+ ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
++#elif defined(__mips__)
++ ioBase_phys = 0x1fd00000;
++#endif
+
+ fd = open("/dev/mem", O_RDWR);
+ if (ioBase == NULL) {
+@@ -514,7 +518,7 @@ xf86EnableIO(void)
+ #endif
+ }
+ close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
+ if (ioperm(0, 1024, 1) || iopl(3)) {
+ if (errno == ENODEV)
+ ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+@@ -540,10 +544,10 @@ xf86DisableIO(void)
+ {
+ if (!ExtendedEnabled)
+ return;
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ munmap(ioBase, 0x20000);
+ ioBase = NULL;
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
+ iopl(0);
+ ioperm(0, 1024, 0);
+ #endif
+--
+1.7.3.4
+
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
index 365664e..6ed3922 100644
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -1,7 +1,7 @@
#!/sbin/runscript
# 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/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $
depend() {
need localmount
diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-4
similarity index 54%
rename from x11-base/xorg-server/files/xdm.confd-3
rename to x11-base/xorg-server/files/xdm.confd-4
index 9c560bb..c82fece 100644
--- a/x11-base/xorg-server/files/xdm.confd-3
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -5,12 +5,6 @@
# in your /etc/inittab file so that you don't get a dead keyboard.
CHECKVT=7
-# What display manager do you use ? [ xdm | gdm | kdm | kdm-4.3 | gpe | entrance ]
+# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ]
# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-#
-# KDE-specific note:
-# - If you are using kdeprefix go with "kdm-4.Y", e.g. "kdm-4.3".
-# You can find possible versions by looking at the directories in /usr/kde/.
-# - Else, if you are using KDE 3 enter "kdm-3.5"
-# - Else, if you are using KDE 4 enter "kdm" without a version
-DISPLAYMANAGER="xdm"
\ No newline at end of file
+DISPLAYMANAGER="xdm"
diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-8
similarity index 89%
rename from x11-base/xorg-server/files/xdm.initd-3
rename to x11-base/xorg-server/files/xdm.initd-8
index ae5f59e..063f88b 100644
--- a/x11-base/xorg-server/files/xdm.initd-3
+++ b/x11-base/xorg-server/files/xdm.initd-8
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.1 2010/09/28 12:43:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-7,v 1.1 2012/03/20 16:02:51 ssuominen Exp $
# This is here to serve as a note to myself, and future developers.
#
@@ -45,13 +45,15 @@ depend() {
# (#145219 #180163) Could use lirc mouse as input device
# (#70689 comment #92) Start after consolefont to avoid display corruption
# (#291269) Start after quota, since some dm need readable home
+ # (#390609) gdm-3 will fail when dbus is not running
+ # (#366753) starting keymaps after X causes problems
after bootmisc consolefont modules netmount
after readahead-list ypbind autofs openvpn gpm lircmd
- after quota
+ after quota keymaps
before alsasound
# Start before X
- use consolekit xfs
+ use consolekit dbus xfs
}
setup_dm() {
@@ -66,11 +68,7 @@ setup_dm() {
NAME=
case "${MY_XDM}" in
kdm|kde)
- EXE="$(which kdm)"
- PIDFILE=/var/run/kdm.pid
- ;;
- kdm-*)
- EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+ EXE=/usr/bin/kdm
PIDFILE=/var/run/kdm.pid
;;
entrance*)
@@ -90,9 +88,19 @@ setup_dm() {
EXE=/usr/bin/gpe-dm
PIDFILE=/var/run/gpe-dm.pid
;;
+ lxdm)
+ EXE=/usr/sbin/lxdm-binary
+ PIDFILE=/var/run/lxdm.pid
+ START_STOP_ARGS="--background"
+ ;;
+ lightdm)
+ EXE=/usr/sbin/lightdm
+ PIDFILE=/var/run/lightdm.pid
+ START_STOP_ARGS="--background"
+ ;;
*)
# first find out if there is such executable
- EXE="$(which ${MY_XDM} 2>/dev/null)"
+ EXE="$(command -v ${MY_XDM} 2>/dev/null)"
PIDFILE="/var/run/${MY_XDM}.pid"
# warn user that he is doing sick things if the exe was not found
@@ -141,6 +149,7 @@ start() {
save_options "service" "${EXE}"
save_options "name" "${NAME}"
save_options "pidfile" "${PIDFILE}"
+ save_options "start_stop_args" "${START_STOP_ARGS}"
if [ -n "${CHECKVT-y}" ] ; then
if vtstatic "${CHECKVT:-7}" ; then
diff --git a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
deleted file mode 100644
index 66e77f6..0000000
--- a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/os/utils.c b/os/utils.c
-index e8ecb71..18ff1ca 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -297,7 +297,7 @@ LockServer(void)
- FatalError("Could not create lock file in %s\n", tmp);
- (void) sprintf(pid_str, "%10ld\n", (long)getpid());
- (void) write(lfd, pid_str, 11);
-- (void) chmod(tmp, 0444);
-+ (void) fchmod(lfd, 0444);
- (void) close(lfd);
-
- /*
-@@ -318,7 +318,7 @@ LockServer(void)
- /*
- * Read the pid from the existing file
- */
-- lfd = open(LockFile, O_RDONLY);
-+ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
- if (lfd < 0) {
- unlink(tmp);
- FatalError("Can't read lock file %s\n", LockFile);
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
new file mode 100644
index 0000000..df43dbd
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
@@ -0,0 +1,11 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2011-10-31 19:40:02.000000000 +0100
++++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100
+@@ -1624,7 +1624,6 @@
+ linux_alpha=yes
+ ;;
+ i*86|amd64*|x86_64*|ia64*)
+- linux_acpi="yes"
+ ;;
+ *)
+ ;;
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
deleted file mode 100644
index 2b05967..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 74016af..9c296f5 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev,
- break;
- case 0x102b: driverList[0] = "mga"; break;
- case 0x10c8: driverList[0] = "neomagic"; break;
-- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
-+ case 0x10de: case 0x12d2:
-+ switch (dev->device_id) {
-+ /* NV1 */
-+ case 0x0008:
-+ case 0x0009:
-+ driverList[0] = "vesa";
-+ break;
-+ /* NV3 */
-+ case 0x0018:
-+ case 0x0019:
-+ driverList[0] = "nv";
-+ break;
-+ default:
-+ driverList[0] = "nouveau";
-+ break;
-+ }
-+ break;
- case 0x1106: driverList[0] = "openchrome"; break;
- case 0x1b36: driverList[0] = "qxl"; break;
- case 0x1163: driverList[0] = "rendition"; break;
---
diff --git a/x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch
deleted file mode 100644
index 4351f28..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-9999-loongson.patch b/x11-base/xorg-server/files/xorg-server-9999-loongson.patch
deleted file mode 100644
index cc94cec..0000000
--- a/x11-base/xorg-server/files/xorg-server-9999-loongson.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2601693..b631ba4 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -866,42 +866,42 @@ static __inline__ void stw_u(unsigned long val, unsigned short *p)
- # define PORT_SIZE short
- # endif
-
--_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
-+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */
-
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
- {
-- *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-+ *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase) = val;
- }
-
- static __inline__ void
- outw(unsigned PORT_SIZE port, unsigned short val)
- {
-- *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-+ *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase) = val;
- }
-
- static __inline__ void
- outl(unsigned PORT_SIZE port, unsigned int val)
- {
-- *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-+ *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase) = val;
- }
-
- static __inline__ unsigned int
- inb(unsigned PORT_SIZE port)
- {
-- return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-+ return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase);
- }
-
- static __inline__ unsigned int
- inw(unsigned PORT_SIZE port)
- {
-- return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-+ return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase);
- }
-
- static __inline__ unsigned int
- inl(unsigned PORT_SIZE port)
- {
-- return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-+ return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase);
- }
-
-
-diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
-index ed35766..f6df722 100644
---- a/hw/xfree86/os-support/linux/lnx_video.c
-+++ b/hw/xfree86/os-support/linux/lnx_video.c
-@@ -493,7 +493,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
- /* I/O Permissions section */
- /***************************************************************************/
-
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- volatile unsigned char *ioBase = NULL;
-
- #ifndef __NR_pciconfig_iobase
-@@ -505,7 +505,7 @@ volatile unsigned char *ioBase = NULL;
- Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
- #endif
-@@ -513,8 +513,12 @@ xf86EnableIO(void)
- if (ExtendedEnabled)
- return TRUE;
-
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-+#ifdef __powerpc__
- ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
-+#else
-+ ioBase_phys = 0x1fd00000;
-+#endif
-
- fd = open("/dev/mem", O_RDWR);
- if (ioBase == NULL) {
-@@ -532,7 +536,7 @@ xf86EnableIO(void)
- #endif
- }
- close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
-+#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");
-@@ -556,10 +560,10 @@ xf86DisableIO(void)
- {
- if (!ExtendedEnabled)
- return;
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- munmap(ioBase, 0x20000);
- ioBase = NULL;
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__)
- iopl(0);
- ioperm(0, 1024, 0);
- #endif
diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
deleted file mode 100644
index cc80e6c..0000000
--- a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
-Subject: [PATCH] Don't build the ACPI code.
-
-No good can come of this.
----
- configure.ac | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
- case $host_cpu in
- ia64*)
- linux_ia64=yes
-- linux_acpi="yes"
- ;;
- alpha*)
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
---
-1.6.1.3
-
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
deleted file mode 100644
index a974b2f..0000000
--- a/x11-base/xorg-server/files/xorg-server-loongson-fix-smi-16bpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/metadata.xml b/x11-base/xorg-server/metadata.xml
index 01c4c00..02528e0 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -2,4 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>x11</herd>
+<use>
+ <flag name='dmx'>Build the Distributed Multiheaded X server</flag>
+ <flag name='kdrive'>Build the kdrive X servers</flag>
+ <flag name='tslib'>Build with tslib support for touchscreen devices</flag>
+ <flag name='xnest'>Build the Xnest server</flag>
+ <flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+ <flag name='xvfb'>Build the Xvfb server</flag>
+</use>
</pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
similarity index 61%
rename from x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
rename to x11-base/xorg-server/xorg-server-9999.ebuild
index 275dfd2..7b2d5c5 100644
--- a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2011 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.9.5-r1.ebuild,v 1.4 2011/10/22 16:57:28 xarthisius Exp $
+# $Header: $
-EAPI=3
-inherit xorg-2 multilib versionator
+EAPI=4
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-OPENGL_DIR="xorg-x11"
-
DESCRIPTION="X.Org X servers"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
+
RDEPEND=">=app-admin/eselect-opengl-1.0.8
dev-libs/openssl
media-libs/freetype
@@ -21,26 +21,27 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3
x11-apps/xkbcomp
- >=x11-libs/libpciaccess-0.10.3
+ >=x11-libs/libpciaccess-0.12.901
>=x11-libs/libXau-1.0.4
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXfont-1.4.2
>=x11-libs/libxkbfile-1.0.4
- >=x11-libs/pixman-0.15.20
+ >=x11-libs/pixman-0.21.8
>=x11-libs/xtrans-1.2.2
>=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-1.4
+ >=x11-misc/xkeyboard-config-2.4.1-r3
dmx? (
x11-libs/libXt
>=x11-libs/libdmx-1.0.99.1
>=x11-libs/libX11-1.1.5
>=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.5
- >=x11-libs/libXfixes-4.0.3
+ >=x11-libs/libXext-1.0.99.4
+ >=x11-libs/libXfixes-5.0
>=x11-libs/libXi-1.2.99.1
>=x11-libs/libXmu-1.0.3
+ x11-libs/libXrender
>=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.3
+ >=x11-libs/libXtst-1.0.99.2
)
kdrive? (
>=x11-libs/libXext-1.0.5
@@ -51,18 +52,20 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
>=x11-libs/libXext-1.0.5
>=media-libs/mesa-7.8_rc[nptl=]
)
- tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
- udev? ( >=sys-fs/udev-150 )"
+ tslib? ( >=x11-libs/tslib-1.0 )
+ udev? ( >=sys-fs/udev-150 )
+ >=x11-apps/xinit-1.3
+ selinux? ( sec-policy/selinux-xserver )"
DEPEND="${RDEPEND}
sys-devel/flex
>=x11-proto/bigreqsproto-1.1.0
>=x11-proto/compositeproto-0.4
>=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-4.1
+ >=x11-proto/fixesproto-5.0
>=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.11
- >=x11-proto/inputproto-1.9.99.902
+ >=x11-proto/glproto-1.4.14
+ >=x11-proto/inputproto-2.1.99.3
>=x11-proto/kbproto-1.0.3
>=x11-proto/randrproto-1.2.99.3
>=x11-proto/recordproto-1.13.99.1
@@ -72,57 +75,63 @@ DEPEND="${RDEPEND}
>=x11-proto/trapproto-3.4.3
>=x11-proto/videoproto-2.2.2
>=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.0.99.3
+ >=x11-proto/xextproto-7.1.99
>=x11-proto/xf86dgaproto-2.0.99.1
>=x11-proto/xf86rushproto-1.1.2
>=x11-proto/xf86vidmodeproto-2.2.99.1
>=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.17
- dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
- doc? (
- >=app-doc/doxygen-1.6.1
- app-text/xmlto
+ >=x11-proto/xproto-7.0.22
+ dmx? (
+ >=x11-proto/dmxproto-2.2.99.1
+ doc? (
+ || (
+ www-client/links
+ www-client/lynx
+ www-client/w3m
+ )
+ )
)
!minimal? (
>=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.3
+ >=x11-proto/dri2proto-2.6
>=x11-libs/libdrm-2.4.20
- )
- >=x11-apps/xinit-1.3"
+ )"
PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
+REQUIRED_USE="!minimal? (
+ || ( ${IUSE_SERVERS} )
+ )"
-# These have been sent upstream
-UPSTREAMED_PATCHES=(
+#UPSTREAMED_PATCHES=(
# "${WORKDIR}/patches/"
- )
+#)
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-disable-acpi.patch
- "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
- "${FILESDIR}"/xorg-cve-2011-4028+4029.patch
- # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622
- "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch"
- "${FILESDIR}/${P}-loongson.patch"
- )
+ "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+ "${FILESDIR}"/0001-compiler.h-split-MIPS-and-ARM-code.patch
+ "${FILESDIR}"/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch
+ "${FILESDIR}"/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch
+)
+
+pkg_pretend() {
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+ die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
pkg_setup() {
xorg-2_pkg_setup
- use minimal || ensure_a_server_is_building
-
# 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
# NOTE: fop is used for doc generating ; and i have no idea if gentoo
# package it somewhere
- XORG_CONFIGURE_OPTIONS="
+ XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_enable dmx)
$(use_enable kdrive)
@@ -130,7 +139,6 @@ pkg_setup() {
$(use_enable kdrive kdrive-mouse)
$(use_enable kdrive kdrive-evdev)
$(use_enable tslib)
- $(use_enable tslib xcalibrate)
$(use_enable !minimal record)
$(use_enable !minimal xfree86-utils)
$(use_enable !minimal install-libxf86config)
@@ -153,11 +161,10 @@ pkg_setup() {
--without-dtrace
--without-fop
--with-os-vendor=Gentoo
- ${conf_opts}"
+ )
# Xorg-server requires includes from OS mesa which are not visible for
# users of binary drivers.
- # Due to the limitations of CONFIGURE_OPTIONS, we have to export this
mkdir -p "${T}/mesa-symlinks/GL"
for i in gl glx glxmd glxproto glxtokens; do
ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
@@ -166,28 +173,6 @@ pkg_setup() {
ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
done
append-cppflags "-I${T}/mesa-symlinks"
-
- # (#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
-
- # Incompatible with GCC 3.x CPP, bug #314615
- if [[ $(gcc-major-version) -lt 4 ]]; then
- ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
- ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
- fi
-
- # detect if we should inform user about ebuild breakage
- if ! has_version "x11-base/xorg-server" ||
- has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
- INFO="yes"
- fi
}
src_install() {
@@ -199,24 +184,23 @@ src_install() {
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
- dodoc "${WORKDIR}"/${P}_build/hw/xfree86/xorg.conf.example \
- || die "couldn't install xorg.conf.example"
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
fi
- newinitd "${FILESDIR}"/xdm.initd-3 xdm || die "initd file install failed"
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
- newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+ newinitd "${FILESDIR}"/xdm.initd-8 xdm
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf
}
pkg_postinst() {
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set --use-old xorg-x11
+ eselect opengl set xorg-x11 --use-old
- if [[ ${INFO} = yes ]]; then
+ if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
elog "You should consider reading upgrade guide for this release:"
elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
echo
@@ -228,26 +212,26 @@ pkg_postinst() {
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/"
+ ewarn "or using sets from portage-2.2:"
+ ewarn " emerge @x11-module-rebuild"
fi
}
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
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
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
+ dodir /usr/$(get_libdir)/opengl/xorg-x11/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
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
fi
done
eend 0
@@ -261,12 +245,3 @@ server_based_install() {
"${D}"/usr/share/man/man1/Xserver.1x
fi
}
-
-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."
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-05-10 18:09 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15 14:10 [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2012-05-10 18:09 Matt Turner
2012-03-15 14:10 Mart Raudsepp
2012-03-15 14:10 Mart Raudsepp
2012-03-15 14:10 Mart Raudsepp
2012-03-15 14:10 Mart Raudsepp
2012-03-15 14:10 Mart Raudsepp
2012-03-15 14:10 Mart Raudsepp
2012-03-15 14:10 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox