rpms/xorg-x11-drv-vesa/F-9 vesa-1.9-32bpp-dammit.patch, NONE, 1.1 xorg-x11-drv-vesa.spec, 1.32, 1.33

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11810

Modified Files:
	xorg-x11-drv-vesa.spec 
Added Files:
	vesa-1.9-32bpp-dammit.patch 
Log Message:
* Tue Apr 29 2008 Adam Jackson <ajax at redhat.com> 1.3.0-15.20080404
- vesa-1.9-32bpp-dammit.patch: Prefer 24+32 instead of 24+24. (#427383)


vesa-1.9-32bpp-dammit.patch:

--- NEW FILE vesa-1.9-32bpp-dammit.patch ---
diff -up xf86-video-vesa-20080404/src/vesa.c.jx xf86-video-vesa-20080404/src/vesa.c
--- xf86-video-vesa-20080404/src/vesa.c.jx	2008-04-29 13:31:52.000000000 -0400
+++ xf86-video-vesa-20080404/src/vesa.c	2008-04-29 13:47:25.000000000 -0400
@@ -628,14 +628,14 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
 				    V_MODETYPE_VBE);
 
     /* Preferred order for default depth selection. */
-    if (depths & V_DEPTH_16)
+    if (depths & V_DEPTH_24)
+	defaultDepth = 24;
+    else if (depths & V_DEPTH_16)
 	defaultDepth = 16;
     else if (depths & V_DEPTH_15)
 	defaultDepth = 15;
     else if (depths & V_DEPTH_8)
 	defaultDepth = 8;
-    else if (depths & V_DEPTH_24)
-	defaultDepth = 24;
     else if (depths & V_DEPTH_4)
 	defaultDepth = 4;
     else if (depths & V_DEPTH_1)
@@ -648,9 +648,11 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
     if (!flags24)
 	flags24 = Support24bppFb;
 
-    /* Prefer 24bpp for fb since it potentially allows larger modes. */
+    /* Prefer 32bpp because 1999 called and wants its packed pixels back */
+    if (flags24 & Support32bppFb)
+	flags24 |= SupportConvert24to32 | PreferConvert24to32;
     if (flags24 & Support24bppFb)
-	flags24 |= SupportConvert32to24 | PreferConvert32to24;
+	flags24 |= SupportConvert32to24;
 
     if (!xf86SetDepthBpp(pScrn, defaultDepth, 0, 0, flags24)) {
         vbeFree(pVesa->pVbe);


Index: xorg-x11-drv-vesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9/xorg-x11-drv-vesa.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-vesa.spec	4 Apr 2008 18:33:46 -0000	1.32
+++ xorg-x11-drv-vesa.spec	29 Apr 2008 18:00:11 -0000	1.33
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.3.0
-Release:   14.%{gitdate}%{?dist}
+Release:   15.%{gitdate}%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{gitdate}.tar.bz2
 License: MIT
@@ -19,6 +19,7 @@
 Patch1:     vesa-1.9-mode-heuristics.patch
 Patch2:	    vesa-1.3.0-range-hack.patch
 Patch3:     vesa-1.9-no-legacy-fb.patch
+Patch4:	    vesa-1.9-32bpp-dammit.patch
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15
 BuildRequires: autoconf automake libtool
@@ -34,6 +35,7 @@
 %patch1 -p1 -b .mode-heuristics
 %patch2 -p1 -b .range-hack
 %patch3 -p1 -b .legacy
+%patch4 -p1 -b .32
 
 %build
 autoreconf -v --install || exit 1
@@ -58,6 +60,9 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Tue Apr 29 2008 Adam Jackson <ajax at redhat.com> 1.3.0-15.20080404
+- vesa-1.9-32bpp-dammit.patch: Prefer 24+32 instead of 24+24. (#427383)
+
 * Fri Apr 04 2008 Adam Jackson <ajax at redhat.com> 1.3.0-14.20080404
 - Today's git snapshot for FTBFS and other.  (#440720)