(#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.

Package-Manager: portage-2.1.2

7 files changed, 113 insertions, 17 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 0272ef79f73f..7769be577245 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # 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.213 2007/01/15 22:05:17 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.214 2007/01/22 05:58:05 dberkholz Exp $
+
+  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.
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a7e0ffc64606..60e7796e0447 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -66,6 +66,14 @@ AUX 1.1.1-fix_big_endian_glx.patch 655 RMD160 aa6377a33c015af994053add2c5571a13b
 MD5 87c7bd720ae0573bf5ed8d5879bd781b files/1.1.1-fix_big_endian_glx.patch 655
 RMD160 aa6377a33c015af994053add2c5571a13bd0658a files/1.1.1-fix_big_endian_glx.patch 655
 SHA256 2b9f53f31fe9f4e36db01fcbf74745fddfa70a28e41614da608c53af81993dbf files/1.1.1-fix_big_endian_glx.patch 655
+AUX 1.1.1-fixdualhead.patch 625 RMD160 2b91d2feb1605c7fb7731e888f391e07ac6d6c67 SHA1 364b7d6ec0bb55547d81ff3ccbd84b41f5b537dd SHA256 e16f498897e470dbefb6ac38f73393b091b9bdd2f306f0441502eaaaa0d3bd61
+MD5 1b43b231253a92ff4c82565b94cb7158 files/1.1.1-fixdualhead.patch 625
+RMD160 2b91d2feb1605c7fb7731e888f391e07ac6d6c67 files/1.1.1-fixdualhead.patch 625
+SHA256 e16f498897e470dbefb6ac38f73393b091b9bdd2f306f0441502eaaaa0d3bd61 files/1.1.1-fixdualhead.patch 625
+AUX 1.1.1-sparc-includes.patch 1216 RMD160 fcfe14696821581f316413564c6a3f787dae3937 SHA1 55270574dbbc95cac7d8102a7a855e5c8800439f SHA256 1b80656cf450f0df3d25cda3e57909ff71834ad489d6033f9d16e2d6d76e34d4
+MD5 0600d155724d1a1c64ee02bfffca20ff files/1.1.1-sparc-includes.patch 1216
+RMD160 fcfe14696821581f316413564c6a3f787dae3937 files/1.1.1-sparc-includes.patch 1216
+SHA256 1b80656cf450f0df3d25cda3e57909ff71834ad489d6033f9d16e2d6d76e34d4 files/1.1.1-sparc-includes.patch 1216
 AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 SHA1 31f3b422d4dc621a7638cf4f9b388ce6a5cccec4 SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51
 MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652
 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652
@@ -74,6 +82,10 @@ AUX 1.1.99.903-mesa-6.5.2.patch 417 RMD160 c0db6578a25a5cc2763c5b72d027cc6f34290
 MD5 4b10725076194e7e63c96eb44afa9090 files/1.1.99.903-mesa-6.5.2.patch 417
 RMD160 c0db6578a25a5cc2763c5b72d027cc6f34290095 files/1.1.99.903-mesa-6.5.2.patch 417
 SHA256 49688c9c03977b7d23b5523195104caea91a0a77375820761eb264549d5df1e0 files/1.1.99.903-mesa-6.5.2.patch 417
+AUX 1.1.99.903-sparc-includes.patch 447 RMD160 a0aae498274c96fc5d305e044d109747fcf8dbc5 SHA1 460372939ddd0e2814123e3d6ceaa541124e16e8 SHA256 3fb8dfa651b9ae340551839f38f0713220758fc82ea8e2dc9e2e9cfca337b5f6
+MD5 b69ef0b3698a75c71a74176cb117c17f files/1.1.99.903-sparc-includes.patch 447
+RMD160 a0aae498274c96fc5d305e044d109747fcf8dbc5 files/1.1.99.903-sparc-includes.patch 447
+SHA256 3fb8dfa651b9ae340551839f38f0713220758fc82ea8e2dc9e2e9cfca337b5f6 files/1.1.99.903-sparc-includes.patch 447
 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
@@ -172,26 +184,26 @@ EBUILD xorg-server-1.1.1-r3.ebuild 17313 RMD160 72d71c3354cf5dbe311f9b0fd141e131
 MD5 845f1194f18874f9ac22d3049ac08823 xorg-server-1.1.1-r3.ebuild 17313
 RMD160 72d71c3354cf5dbe311f9b0fd141e1315764dce6 xorg-server-1.1.1-r3.ebuild 17313
 SHA256 4315cbac1783b2770ff3e3a17fb99a6feae347f4ea17e74e24d8b8ddf1fae6a8 xorg-server-1.1.1-r3.ebuild 17313
-EBUILD xorg-server-1.1.1-r4.ebuild 17338 RMD160 7a627451dc7fc101330fa95b3f2c67a51241a994 SHA1 7f5203743b0ddc0a19737cf585264a08fa0543e1 SHA256 bd7362dcde0afcf5e784357ac20b1a386270d776a528c9b439a635dc202ec036
-MD5 39822eebd4f925ac7181ede8a17ec74a xorg-server-1.1.1-r4.ebuild 17338
-RMD160 7a627451dc7fc101330fa95b3f2c67a51241a994 xorg-server-1.1.1-r4.ebuild 17338
-SHA256 bd7362dcde0afcf5e784357ac20b1a386270d776a528c9b439a635dc202ec036 xorg-server-1.1.1-r4.ebuild 17338
+EBUILD xorg-server-1.1.1-r4.ebuild 17417 RMD160 e3652fa5ae2b4cf4fd914669fc8c258315607726 SHA1 f0e314e9019bd483c496134c8913e1aa37efeca3 SHA256 8ca751dd07579241cbb6ac42c6f9b90f8507e2f5ab414359ec12a870fc5f3798
+MD5 f86da4f6c6e8636792811dedf7e8d5af xorg-server-1.1.1-r4.ebuild 17417
+RMD160 e3652fa5ae2b4cf4fd914669fc8c258315607726 xorg-server-1.1.1-r4.ebuild 17417
+SHA256 8ca751dd07579241cbb6ac42c6f9b90f8507e2f5ab414359ec12a870fc5f3798 xorg-server-1.1.1-r4.ebuild 17417
 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb
 MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-EBUILD xorg-server-1.1.99.903-r1.ebuild 16839 RMD160 c320b04944b3080f34559d26d8d7a08f902116d1 SHA1 48a1a6f4f864d6cb9d1f42dcf54406fa006e0d71 SHA256 90e45de7fd635ad3d2a7efffa8dc7373b9d5cae0947d9978e358b7ee5852f1cd
-MD5 33b5aa54dd4cfa685af1baad3d6d6e2d xorg-server-1.1.99.903-r1.ebuild 16839
-RMD160 c320b04944b3080f34559d26d8d7a08f902116d1 xorg-server-1.1.99.903-r1.ebuild 16839
-SHA256 90e45de7fd635ad3d2a7efffa8dc7373b9d5cae0947d9978e358b7ee5852f1cd xorg-server-1.1.99.903-r1.ebuild 16839
+EBUILD xorg-server-1.1.99.903-r1.ebuild 16880 RMD160 83973706cd6bb9ab525faea57990a59ee70875b2 SHA1 fcfd4970a6843d8a449f1f50191b0f96611563db SHA256 4faee7adae1d64ca9534047ed0f8307944d1be9059308f0f492dd1260b803411
+MD5 38a01755f5f88c828b2c67fb465932a3 xorg-server-1.1.99.903-r1.ebuild 16880
+RMD160 83973706cd6bb9ab525faea57990a59ee70875b2 xorg-server-1.1.99.903-r1.ebuild 16880
+SHA256 4faee7adae1d64ca9534047ed0f8307944d1be9059308f0f492dd1260b803411 xorg-server-1.1.99.903-r1.ebuild 16880
 EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 SHA1 8cc96925d7cd80784585c24d14f307f49d540b9d SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d
 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872
-MISC ChangeLog 43873 RMD160 a4b9b1dd40685a93a57a95bea8ae2fdfd090cceb SHA1 78270b5194eac851b5f6118effdf8d8d14ee60ae SHA256 1566f563a8f3f956f440c9760ca0d874178e77ff805fd85f480708e923df7a6a
-MD5 bab72a4f055cfd6b43940197ef079767 ChangeLog 43873
-RMD160 a4b9b1dd40685a93a57a95bea8ae2fdfd090cceb ChangeLog 43873
-SHA256 1566f563a8f3f956f440c9760ca0d874178e77ff805fd85f480708e923df7a6a ChangeLog 43873
+MISC ChangeLog 44283 RMD160 79c6371b12c34f8a6296e29f454a11c60d7cdac8 SHA1 ca02b5804e29f460c26ce22d456e786f5d9fe1e3 SHA256 936e87636fac57f6373d1a2e2534e007ed9eeb9ac8fe2c59f0d5f36bd58ceaa0
+MD5 5a59be4a9aa828a42eb4ce78a0443563 ChangeLog 44283
+RMD160 79c6371b12c34f8a6296e29f454a11c60d7cdac8 ChangeLog 44283
+SHA256 936e87636fac57f6373d1a2e2534e007ed9eeb9ac8fe2c59f0d5f36bd58ceaa0 ChangeLog 44283
 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.1.1-fixdualhead.patch b/x11-base/xorg-server/files/1.1.1-fixdualhead.patch
new file mode 100644
index 000000000000..7b0513d5d7bb
--- /dev/null
+++ b/x11-base/xorg-server/files/1.1.1-fixdualhead.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/show_bug.cgi?id=159375
+
+diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
+index 4935b0a..9c3cac0 100644
+--- a/GL/glx/glxdri.c
++++ b/GL/glx/glxdri.c
+@@ -121,19 +121,13 @@ static const char CREATE_NEW_SCREEN_FUNC
+ static void
+ __glXDRIleaveServer(void)
+ {
+-  int i;
+-
+-  for (i = 0; i < screenInfo.numScreens; i++)
+-    DRIDoBlockHandler(i, NULL, NULL, NULL);
++  DRIBlockHandler(NULL, NULL, NULL);
+ }
+     
+ static void
+ __glXDRIenterServer(void)
+ {
+-  int i;
+-
+-  for (i = 0; i < screenInfo.numScreens; i++)
+-    DRIDoWakeupHandler(i, NULL, 0, NULL);
++  DRIWakeupHandler(NULL, 0, NULL);
+ }
+ 
+ static void
diff --git a/x11-base/xorg-server/files/1.1.1-sparc-includes.patch b/x11-base/xorg-server/files/1.1.1-sparc-includes.patch
new file mode 100644
index 000000000000..3408d208646b
--- /dev/null
+++ b/x11-base/xorg-server/files/1.1.1-sparc-includes.patch
@@ -0,0 +1,28 @@
+diff -Nura xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_io.c
+--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c	2006-07-05 15:31:41.000000000 -0300
++++ xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_io.c	2007-01-18 14:43:53.000000000 -0300
+@@ -72,10 +72,6 @@
+ 
+ #include <linux/kd.h>
+ #include <linux/version.h>
+-#ifdef __sparc__
+-#include <asm/param.h>
+-#include <asm/kbio.h>
+-#endif
+ 
+ /* Deal with spurious kernel header change in struct kbd_repeat.
+    We undo this define after the routine using that struct is over,
+diff -Nura xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_kbd.c
+--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c	2006-07-05 15:31:41.000000000 -0300
++++ xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_kbd.c	2007-01-18 14:44:55.000000000 -0300
+@@ -102,10 +102,6 @@
+ 
+ #include <linux/kd.h>
+ #include <linux/version.h>
+-#ifdef __sparc__
+-#include <asm/param.h>
+-#include <asm/kbio.h>
+-#endif
+ 
+ /* Deal with spurious kernel header change in struct kbd_repeat.
+    We undo this define after the routine using that struct is over,
diff --git a/x11-base/xorg-server/files/1.1.99.903-sparc-includes.patch b/x11-base/xorg-server/files/1.1.99.903-sparc-includes.patch
new file mode 100644
index 000000000000..3dfd3831e740
--- /dev/null
+++ b/x11-base/xorg-server/files/1.1.99.903-sparc-includes.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=159671
+
+diff --git a/configure.ac b/configure.ac
+index 38fdc86..4c29909 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1129,10 +1129,6 @@ dnl has it in libc), or if libdl is needed to get it.
+ 		# on kernels < 2.5.42 it's called 'rate' instead.
+ 		AC_TRY_COMPILE([
+ #include <linux/kd.h>
+-#ifdef __sparc__
+-#include <asm/param.h>
+-#include <asm/kbio.h>
+-#endif
+ ],[
+ int main () { 
+ 	struct kbd_repeat k;
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild
index 84140987f337..c20b304117c5 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r4.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.1.1-r4.ebuild,v 1.8 2007/01/15 22:05:17 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild,v 1.9 2007/01/22 05:58:05 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -279,6 +279,8 @@ pkg_setup() {
 		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
 		${FILESDIR}/xorg-conf-example.patch
 		${FILESDIR}/${PV}-fix_acpi_tokenize.patch
+		${FILESDIR}/${PV}-fixdualhead.patch
+		${FILESDIR}/${PV}-sparc-includes.patch
 		${FILESDIR}/${PV}-dbe-render.diff"
 
 	# Patches required for compiz to work with AIGLX,
diff --git a/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild
index 08d795c5e563..2a9d1bb9abe8 100644
--- a/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1.99.903-r1.ebuild,v 1.2 2006/12/05 20:05:25 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild,v 1.3 2007/01/22 05:58:05 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -274,7 +274,8 @@ pkg_setup() {
 	use minimal || ensure_a_server_is_building
 
 	# Allow build against Mesa 6.5.2
-	PATCHES="${FILESDIR}/${PV}-mesa-6.5.2.patch"
+	PATCHES="${FILESDIR}/${PV}-mesa-6.5.2.patch
+		${FILESDIR}/${PV}-sparc-includes.patch"
 
 	# Adds missing functionality to GLX to
 	# allow compiz/beryl to work.