Add patches for various issues. (#171396) Memleaks; (#167052) Fix multi-domain systems like Sparc and Pegasos; (#181280) Minimized Xv window crashes X; (#176746) Resolution fix for SyncMaster 225BW; (#164240) Fix Alpha build with newer kernel headers.

Package-Manager: portage-2.1.3_rc9

11 files changed, 336 insertions, 10 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index f98fe1b9b4df..e8bcde7112c9 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,20 @@
 # 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.249 2007/07/31 18:52:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.250 2007/08/01 22:19:57 dberkholz Exp $
+
+  01 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.2.0-fix-amd-cpu-detection.patch,
+  +files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch,
+  +files/1.2.0-typo-fix.patch,
+  +files/1.2.0-zero-out-client-devprivates-on-allocation.patch,
+  +files/1.3.0.0-use-proc-instead-of-sys.patch,
+  +files/1.3-alpha-build-fix.patch,
+  +files/avoid-crash-on-minimized-xv-window.patch,
+  +files/xorg-server-sam225bw-quirks.patch, xorg-server-1.3.0.0.ebuild:
+  Add patches for various issues. (#171396) Memleaks; (#167052) Fix
+  multi-domain systems like Sparc and Pegasos; (#181280) Minimized Xv window
+  crashes X; (#176746) Resolution fix for SyncMaster 225BW; (#164240) Fix
+  Alpha build with newer kernel headers.
 
   31 Jul 2007; Doug Goldstein <doug@gentoo.org> xorg-server-1.1.1-r1.ebuild,
   xorg-server-1.1.1-r5.ebuild, xorg-server-1.2.0-r3.ebuild,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 987421a551a0..1b3d32d52c26 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -54,6 +54,14 @@ AUX 1.2.0-client-leak.patch 363 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a
 MD5 c46eeebdde41ceb57f1dca6ef4b1a8b7 files/1.2.0-client-leak.patch 363
 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a files/1.2.0-client-leak.patch 363
 SHA256 5969bf63e88ab4030c6913237379b76fb55e9e1f249a058eb17487a4b7103b87 files/1.2.0-client-leak.patch 363
+AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
+MD5 cd4cb28e832a2232b4a7c492f964d5bb files/1.2.0-fix-amd-cpu-detection.patch 1715
+RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c files/1.2.0-fix-amd-cpu-detection.patch 1715
+SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a files/1.2.0-fix-amd-cpu-detection.patch 1715
+AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
+MD5 a4b32046f3cfde77ae5f964faabf0254 files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199
+RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199
+SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199
 AUX 1.2.0-server-damage-version.patch 1322 RMD160 25ba5ce01bc338d3a906ec959a0f1ad3303c5dd2 SHA1 129565a0151d42b85c43f273da507396111bdc9b SHA256 28a049c39e7995f7768eed34993f12252da416093e2f919c1ae84cb2dfee9f09
 MD5 789e294aaa7f8a03551f639dc022c568 files/1.2.0-server-damage-version.patch 1322
 RMD160 25ba5ce01bc338d3a906ec959a0f1ad3303c5dd2 files/1.2.0-server-damage-version.patch 1322
@@ -62,10 +70,30 @@ AUX 1.2.0-server-randr-version.patch 444 RMD160 05a4c38c141bf5dddd1f94eb61dba62b
 MD5 e14a71605039b6cded7ce9541ded2f1e files/1.2.0-server-randr-version.patch 444
 RMD160 05a4c38c141bf5dddd1f94eb61dba62b79f17658 files/1.2.0-server-randr-version.patch 444
 SHA256 226560c2d5c0c76987e2e315c2eef805e96ee9189aa3394148968fa13392f17e files/1.2.0-server-randr-version.patch 444
+AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
+MD5 5e95f0f8fcc3af424c4404a1fcf485ca files/1.2.0-typo-fix.patch 1321
+RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 files/1.2.0-typo-fix.patch 1321
+SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd files/1.2.0-typo-fix.patch 1321
+AUX 1.2.0-zero-out-client-devprivates-on-allocation.patch 1284 RMD160 28bdf0c7b868736a788da69b8f4c6b1e0a88f425 SHA1 0cfd5dcb57c42197e39e5469032833ea932c0b4f SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34
+MD5 2da60d0b56f71d5443510127e368031b files/1.2.0-zero-out-client-devprivates-on-allocation.patch 1284
+RMD160 28bdf0c7b868736a788da69b8f4c6b1e0a88f425 files/1.2.0-zero-out-client-devprivates-on-allocation.patch 1284
+SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34 files/1.2.0-zero-out-client-devprivates-on-allocation.patch 1284
 AUX 1.2.99.0-fix-sysconfdir-references.patch 421 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 SHA1 3c836428f18aa6e42a8ab243c59c9693af57100e SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24
 MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
 SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24 files/1.2.99.0-fix-sysconfdir-references.patch 421
+AUX 1.3-alpha-build-fix.patch 1151 RMD160 b7eda6096e95835d998731c97aa70f13ec0c771c SHA1 210ef43db8ad8080db21a86c31f7744dbdb7e439 SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186
+MD5 57ebd1cc02ac21fcb364e4b72dfa7fb9 files/1.3-alpha-build-fix.patch 1151
+RMD160 b7eda6096e95835d998731c97aa70f13ec0c771c files/1.3-alpha-build-fix.patch 1151
+SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186 files/1.3-alpha-build-fix.patch 1151
+AUX 1.3.0.0-use-proc-instead-of-sys.patch 686 RMD160 26e9bee2d1be197fa456efdd5be16a8087b947cb SHA1 44112c3643d026f318850f2b763f3ca3952bb686 SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54
+MD5 27f7679638163b088c8b1ede97ac6070 files/1.3.0.0-use-proc-instead-of-sys.patch 686
+RMD160 26e9bee2d1be197fa456efdd5be16a8087b947cb files/1.3.0.0-use-proc-instead-of-sys.patch 686
+SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54 files/1.3.0.0-use-proc-instead-of-sys.patch 686
+AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
+MD5 c5f6f5dad5315cd737565bfbc58ff862 files/avoid-crash-on-minimized-xv-window.patch 1970
+RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 files/avoid-crash-on-minimized-xv-window.patch 1970
+SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd files/avoid-crash-on-minimized-xv-window.patch 1970
 AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
 MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924
 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924
@@ -74,6 +102,10 @@ AUX xorg-server-1.1.1-install-libxf86config-headers.patch 422 RMD160 297df8f5478
 MD5 f17556037156af0294c22e094172d1f6 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
+AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
+MD5 40692dd1eba5bf76e835a955a54b5b7b files/xorg-server-sam225bw-quirks.patch 380
+RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 files/xorg-server-sam225bw-quirks.patch 380
+SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517 files/xorg-server-sam225bw-quirks.patch 380
 AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 SHA1 287d09b104826c0ac852d401457c230fa96f7296 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0
 MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
@@ -108,14 +140,14 @@ EBUILD xorg-server-1.2.99.0.ebuild 16696 RMD160 da1537253a8d5e86c2e18046c0e361a2
 MD5 09584fb92a92abae07c2259846de21cd xorg-server-1.2.99.0.ebuild 16696
 RMD160 da1537253a8d5e86c2e18046c0e361a276e75404 xorg-server-1.2.99.0.ebuild 16696
 SHA256 81e948a22410d8f62ef6a338cbed7c7a1c72f60572a60a0be2996c410b1ecc47 xorg-server-1.2.99.0.ebuild 16696
-EBUILD xorg-server-1.3.0.0.ebuild 16165 RMD160 a39c8ad857c6c5cf0870039d1b8fe85ba517cf4b SHA1 cdd1d3245111be1b51fcecdaafb19f0195732644 SHA256 46beefa7b517655f6bcbac840d2a295801ba5af5880d92dfec9c15be8ddda36a
-MD5 83b6c0b4ab7bb00b45e4ff2135c2d29d xorg-server-1.3.0.0.ebuild 16165
-RMD160 a39c8ad857c6c5cf0870039d1b8fe85ba517cf4b xorg-server-1.3.0.0.ebuild 16165
-SHA256 46beefa7b517655f6bcbac840d2a295801ba5af5880d92dfec9c15be8ddda36a xorg-server-1.3.0.0.ebuild 16165
-MISC ChangeLog 52122 RMD160 70eaefc2ca4ed265cb701653d34e43a6f5deaf4b SHA1 cb8acd1456126eaf74f370503ac56be5da865140 SHA256 ce33c04850d83b72f6cf4543531932caefd240793a93cc34adb5866ba1a03967
-MD5 7e37cd57e8684750057d8103e4211c40 ChangeLog 52122
-RMD160 70eaefc2ca4ed265cb701653d34e43a6f5deaf4b ChangeLog 52122
-SHA256 ce33c04850d83b72f6cf4543531932caefd240793a93cc34adb5866ba1a03967 ChangeLog 52122
+EBUILD xorg-server-1.3.0.0.ebuild 16595 RMD160 c4737ef1e3439e47612d537e745ee89afe74ac4b SHA1 a9f92f9196fd6ac9414eac5a6eda90f44d92c2fb SHA256 6603fcb40a0b34f21702d667da198887a429403682201e5ec6e63853f02edeb3
+MD5 2b0ecbd298467ddd5bb83da2fc0ab249 xorg-server-1.3.0.0.ebuild 16595
+RMD160 c4737ef1e3439e47612d537e745ee89afe74ac4b xorg-server-1.3.0.0.ebuild 16595
+SHA256 6603fcb40a0b34f21702d667da198887a429403682201e5ec6e63853f02edeb3 xorg-server-1.3.0.0.ebuild 16595
+MISC ChangeLog 52858 RMD160 9c1e7c7027915b79fd4d0d70278a3fe141e003d8 SHA1 a44bc50551e52121afd1629d9b599a8b70db8a1c SHA256 a38c7706926ee21bba729ebd894eb4651e93d9abd85de57ed8a6fd72475d6e01
+MD5 da5f33650ad3407bed66f01574187132 ChangeLog 52858
+RMD160 9c1e7c7027915b79fd4d0d70278a3fe141e003d8 ChangeLog 52858
+SHA256 a38c7706926ee21bba729ebd894eb4651e93d9abd85de57ed8a6fd72475d6e01 ChangeLog 52858
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
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
new file mode 100644
index 000000000000..48775d336e05
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..b4747c481460
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..0a152171d743
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-typo-fix.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 000000000000..7c6144b549b4
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
@@ -0,0 +1,36 @@
+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-alpha-build-fix.patch b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
new file mode 100644
index 000000000000..481e4ad68011
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
@@ -0,0 +1,36 @@
+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-use-proc-instead-of-sys.patch b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
new file mode 100644
index 000000000000..600d0babd9d9
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
@@ -0,0 +1,16 @@
+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/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
new file mode 100644
index 000000000000..23eeca125de9
--- /dev/null
+++ b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
@@ -0,0 +1,55 @@
+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/xorg-server-sam225bw-quirks.patch b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
new file mode 100644
index 000000000000..ca5bbb4c27e0
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
@@ -0,0 +1,14 @@
+--- 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/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
index f8ebe646e0c0..76794a3ce7a7 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.11 2007/07/31 18:52:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.12 2007/08/01 22:19:57 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -262,6 +262,17 @@ PDEPEND="
 	)"
 LICENSE="${LICENSE} MIT"
 
+PATCHES="
+	${FILESDIR}/1.2.0-fix-amd-cpu-detection.patch
+	${FILESDIR}/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
+	${FILESDIR}/1.2.0-typo-fix.patch
+	${FILESDIR}/1.2.0-zero-out-client-devprivates-on-allocation.patch
+	${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
+	${FILESDIR}/avoid-crash-on-minimized-xv-window.patch
+	${FILESDIR}/xorg-server-sam225bw-quirks.patch
+	${FILESDIR}/1.3-alpha-build-fix.patch
+	"
+
 pkg_setup() {
 	use minimal || ensure_a_server_is_building