[xorg-x11-drv-vesa] sweep 24bpp under the rug

[Adam Jackson]

commit 1ca630e1e52533da07036492a7a557a26c49a92d
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 11 15:34:44 2010 -0400

    sweep 24bpp under the rug

 vesa-2.3.0-24bpp-sucks.patch |   17 +++++++++++++++++
 xorg-x11-drv-vesa.spec       |    8 +++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/vesa-2.3.0-24bpp-sucks.patch b/vesa-2.3.0-24bpp-sucks.patch
new file mode 100644
index 0000000..b22e5ce
--- /dev/null
+++ b/vesa-2.3.0-24bpp-sucks.patch
@@ -0,0 +1,17 @@
+diff -up xf86-video-vesa-2.3.0/src/vesa.c.jx xf86-video-vesa-2.3.0/src/vesa.c
+--- xf86-video-vesa-2.3.0/src/vesa.c.jx	2010-01-04 14:16:31.000000000 -0500
++++ xf86-video-vesa-2.3.0/src/vesa.c	2010-10-11 15:29:52.000000000 -0400
+@@ -651,10 +651,12 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
+ 				    V_MODETYPE_VBE);
+ 
+     /* Preferred order for default depth selection. */
+-    if (depths & V_DEPTH_24)
++    if ((depths & V_DEPTH_24) && (flags24 & Support32bppFb))
+ 	defaultDepth = 24;
+     else if (depths & V_DEPTH_16)
+ 	defaultDepth = 16;
++    else if (depths & V_DEPTH_24)
++	defaultDepth = 24;
+     else if (depths & V_DEPTH_15)
+ 	defaultDepth = 15;
+     else if (depths & V_DEPTH_8)
diff --git a/xorg-x11-drv-vesa.spec b/xorg-x11-drv-vesa.spec
index 021530f..514c49d 100644
--- a/xorg-x11-drv-vesa.spec
+++ b/xorg-x11-drv-vesa.spec
@@ -5,13 +5,15 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   2.3.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License: MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:	    vesa-2.3.0-24bpp-sucks.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15
@@ -24,6 +26,7 @@ X.Org X11 vesa video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .24
 
 %build
 #autoreconf -v --install || exit 1
@@ -48,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Mon Oct 11 2010 Adam Jackson <ajax at redhat.com> 2.3.0-2
+- vesa-2.3.0-24bpp-sucks.patch: Prefer 16bpp to 24bpp. (#533879)
+
 * Mon Jul 05 2010 Dave Airlie <airlied at redhat.com> 2.3.0-1
 - pull in latest vesa