6559709 AIGLX should be enabled
6559710 When AIGLX is enabled, user can't return from X Window login GUI to command line login
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-i810/6559710.patch Wed Jun 06 18:12:13 2007 -0700
@@ -0,0 +1,15 @@
+--- src/i830_randr.c Wed May 30 10:33:16 2007
++++ src/i830_randr.c Wed May 30 10:32:58 2007
+@@ -339,6 +339,12 @@
+ xfree (randrp);
+ return FALSE;
+ }
++
++ if (i830RandRIndex == rrPrivIndex)
++ {
++ i830RandRIndex = AllocateScreenPrivateIndex();
++ }
++
+ rp = rrGetScrPriv(pScreen);
+ rp->rrGetInfo = I830RandRGetInfo;
+ rp->rrSetConfig = I830RandRSetConfig;
--- a/open-src/driver/xf86-video-i810/Makefile Wed Jun 06 13:48:17 2007 -0700
+++ b/open-src/driver/xf86-video-i810/Makefile Wed Jun 06 18:12:13 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.8 07/05/08
+# @(#)Makefile 1.9 07/06/01
#
# Package name used in tarballs
@@ -41,7 +41,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=6484688.patch build-dri.patch libraries.patch \
- 6538497_6554161.patch
+ 6538497_6554161.patch \
+ 6559710.patch
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/6559710.patch Wed Jun 06 18:12:13 2007 -0700
@@ -0,0 +1,11 @@
+--- src/mesa/drivers/dri/i915/intel_screen.c Fri Jun 1 14:32:10 2007
++++ src/mesa/drivers/dri/i915/intel_screen.c Fri Jun 1 14:31:24 2007
+@@ -362,8 +362,6 @@
+ (void) sigset(SIGTSTP, stop_handler);
+ (void) sigset(SIGTTIN, stop_handler);
+ (void) sigset(SIGTTOU, stop_handler);
+- (void) sigset(SIGINT, exit_handler);
+- (void) sigset(SIGTERM, exit_handler);
+
+
+ return GL_TRUE;
--- a/open-src/lib/mesa/Makefile Wed Jun 06 13:48:17 2007 -0700
+++ b/open-src/lib/mesa/Makefile Wed Jun 06 18:12:13 2007 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 07/05/16
+# @(#)Makefile 1.8 07/06/01
#
PWD:sh=pwd
@@ -54,7 +54,8 @@
mklib.patch \
solaris-dri-port.patch \
glext.h.patch \
- 6538497.patch
+ 6538497.patch \
+ 6559710.patch
# Directory created by unpacking source
SOURCE_DIR=$(BUILD_DIR)/Mesa-$(MESA_VERS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/6559710.patch Wed Jun 06 18:12:13 2007 -0700
@@ -0,0 +1,15 @@
+--- hw/xfree86/common/xf86RandR.c Tue Jan 23 13:39:16 2007
++++ hw/xfree86/common/xf86Randr.c Fri Jun 1 12:29:46 2007
+@@ -416,6 +416,12 @@
+ xfree (randrp);
+ return FALSE;
+ }
++
++ if (rrPrivIndex == xf86RandRIndex)
++ {
++ xf86RandRIndex = AllocateScreenPrivateIndex();
++ }
++
+ rp = rrGetScrPriv(pScreen);
+ rp->rrGetInfo = xf86RandRGetInfo;
+ rp->rrSetConfig = xf86RandRSetConfig;
--- a/open-src/xserver/xorg/Makefile Wed Jun 06 13:48:17 2007 -0700
+++ b/open-src/xserver/xorg/Makefile Wed Jun 06 18:12:13 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.43 07/05/23
+# @(#)Makefile 1.44 07/06/01
#
PWD:sh=pwd
@@ -99,7 +99,8 @@
6535006.patch \
6540484.patch \
signal-handler.patch \
- kbd-driver.patch
+ kbd-driver.patch \
+ 6559710.patch
# Directory created by unpacking source
SOURCE_DIR=$(BUILD_DIR)/$(MODULE_NAME)-$(XORGSERVER_VERS)
@@ -138,6 +139,7 @@
MESA_SRC_DIR=$(TOP)/lib/mesa/$(BUILD_DIR)/Mesa-6.5.2
MODULES_DIR='$${libdir}/modules$(MODULE_subdir)'
+DRI_MODULES_DIR='$${libdir}/modules/dri$(MODULE_subdir)'
# Command line options to GNU autoconf configure script
# XXX: --disable-dga
@@ -153,6 +155,7 @@
--with-os-name="`uname -srmv`" \
--with-log-dir=/var/log --with-xkb-output=/var/run/xkb \
--with-module-dir=$(MODULES_DIR) \
+ --with-dri-driver-path=$(DRI_MODULES_DIR) \
--with-xkb-path='$${libdir}/X11/xkb' \
--with-default-font-path="$(FONTDIR)/TrueType/,$(FONTDIR)/Type1/,$(FONTDIR)/Type1/sun/,$(FONTDIR)/F3bitmaps/,$(FONTDIR)/misc/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/"