OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=74

disable-aiglx.diff

@@ -1,11 +0,0 @@
---- ./hw/xfree86/common/xf86Config.c.orig	2006-08-12 11:45:01.000000000 +0200
-+++ ./hw/xfree86/common/xf86Config.c	2006-08-12 11:45:29.000000000 +0200
-@@ -1017,7 +1017,7 @@
-     else
- 	xf86Info.estimateSizesAggressively = 0;
- 
--    xf86Info.aiglx = TRUE;
-+    xf86Info.aiglx = FALSE; 
-     xf86Info.aiglxFrom = X_DEFAULT;
-     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
- 	xf86Info.aiglx = value;

fbdevhw.diff

@@ -10,3 +10,31 @@
  		set->right_margin == req->right_margin &&
  		set->hsync_len == req->hsync_len &&
  		set->left_margin == req->left_margin &&
+--- hw/xfree86/fbdevhw/fbdevhw.c.orig	2008-04-20 03:06:32.000000000 +0000
++++ hw/xfree86/fbdevhw/fbdevhw.c	2008-04-20 03:30:00.000000000 +0000
+@@ -923,9 +923,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo
+ 			return;
+ 	}
+ 
++	/* Novell Bug #146462 */
+ 	if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *)fbmode))
+-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+-			   "FBIOBLANK: %s\n", strerror(errno));
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++			   "FBIOBLANK: %s (Screen blanking not supported by vesafb of Linux Kernel)\n", strerror(errno));
+ }
+ 
+ Bool
+@@ -941,9 +942,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int
+ 
+ 	unblank = xf86IsUnblank(mode);
+ 
++	/* Novell Bug #146462 */
+ 	if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *)(1-unblank))) {
+-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+-			   "FBIOBLANK: %s\n", strerror(errno));
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++			   "FBIOBLANK: %s (Screen blanking not supported by vesafb of Linux Kernel)\n", strerror(errno));
+ 		return FALSE;
+ 	}
+ 

xorg-x11-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Apr 20 05:17:28 CEST 2008 - sndirsch@suse.de
+
+- fbdevhw.diff
+  * screen blanking not supported by vesafb of Linux kernel
+    (bnc #146462)  
+
+-------------------------------------------------------------------
+Tue Apr 15 03:52:12 CEST 2008 - sndirsch@suse.de
+
+- no longer disable AIGLX by default
+
 -------------------------------------------------------------------
 Thu Apr 10 06:55:28 CEST 2008 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -22,7 +22,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        89
+Release:        91
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -61,7 +61,6 @@ Patch13:        p_xorg_acpi.diff
 Patch14:        p_xkills_wrong_client.diff
 Patch16:        p_xnest-ignore-getimage-errors.diff
 Patch18:        p_ia64-console.diff
-Patch19:        disable-aiglx.diff
 Patch22:        disable-root-xorg_conf.diff
 Patch23:        disable-fbblt-opt.diff
 Patch25:        glx-align.patch
@@ -201,7 +200,6 @@ mv mfbmodule.c hw/xfree86/xf1bpp
 pushd hw/xfree86/os-support
 %patch18
 popd
-%patch19
 %patch22
 %patch23
 %patch25 -p1
@@ -561,6 +559,12 @@ exit 0
 %endif
 
 %changelog
+* Sun Apr 20 2008 sndirsch@suse.de
+- fbdevhw.diff
+  * screen blanking not supported by vesafb of Linux kernel
+  (bnc #146462)
+* Tue Apr 15 2008 sndirsch@suse.de
+- no longer disable AIGLX by default
 * Thu Apr 10 2008 sndirsch@suse.de
 - XAANoOffscreenPixmaps.diff
   * disable Offscreen Pixmaps by default (bnc #376068)