summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2012-03-08 23:23:49 (GMT)
committerMart Raudsepp <leio@gentoo.org>2012-03-08 23:23:49 (GMT)
commitdf89674de2c4f049ff60e4b7c6daa31d7c0c431e (patch)
treee06aaacb548ebd716f1229d73dec5f93db76e94e
parentRemove ancient xorg-server-1.6 version (diff)
downloadloongson-df89674d.zip
loongson-df89674d.tar.gz
loongson-df89674d.tar.bz2
xorg-server: Remove many stale patches and aux files from ancient versions
-rw-r--r--x11-base/xorg-server/Manifest25
-rw-r--r--x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch38
-rw-r--r--x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch38
-rw-r--r--x11-base/xorg-server/files/1.2.0-typo-fix.patch36
-rw-r--r--x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch36
-rw-r--r--x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch244
-rw-r--r--x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch22
-rw-r--r--x11-base/xorg-server/files/1.3-alpha-build-fix.patch36
-rw-r--r--x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch49
-rw-r--r--x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch58
-rw-r--r--x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch45
-rw-r--r--x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch55
-rw-r--r--x11-base/xorg-server/files/1.3.0.0-ramdac.patch91
-rw-r--r--x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch30
-rw-r--r--x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch55
-rw-r--r--x11-base/xorg-server/files/use-composite-for-unequal-depths.patch124
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.3.0.0-loongson.patch51
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.6.0-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.6.2-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.6.3-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.6.3.901-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.6.5-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.7.1-loongson.patch53
-rw-r--r--x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch14
-rw-r--r--x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch11
-rw-r--r--x11-base/xorg-server/files/xprint.init30
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 $?
-}