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

(Portage version: 2.1.2)

6 files changed, 89 insertions, 5 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/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.