From c792f9e0c1dafb730cc526d2d2157e550aad9dc1 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Mar 21 2014 16:48:16 +0000
Subject: import xorg-x11-drv-fbdev-0.4.3-15.el7.src.rpm


---

diff --git a/SOURCES/0001-Default-to-32bpp-if-the-console-is-8bpp-and-we-weren.patch b/SOURCES/0001-Default-to-32bpp-if-the-console-is-8bpp-and-we-weren.patch
new file mode 100644
index 0000000..8ea264a
--- /dev/null
+++ b/SOURCES/0001-Default-to-32bpp-if-the-console-is-8bpp-and-we-weren.patch
@@ -0,0 +1,63 @@
+From dd1cf1028c3f0de77d075c4a169011518baab0f4 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 21 Mar 2014 12:20:01 -0400
+Subject: [PATCH] Default to 32bpp if the console is 8bpp (and we weren't told
+ otherwise)
+
+You can still override this on the command line or in the config file.
+Without this we'll come up at 8bpp on matroxfb (and probably others),
+which among other things breaks the default desktop since gnome-shell
+wants GLX and GLX doesn't support pseudocolor anymore.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/fbdev.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/src/fbdev.c b/src/fbdev.c
+index f5a7378..a73565f 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -38,6 +38,9 @@
+ #include <pciaccess.h>
+ #endif
+ 
++/* for xf86{Depth,FbBpp}. i am a terrible person, and i am sorry. */
++#include "xf86Priv.h"
++
+ static Bool debug = 0;
+ 
+ #define TRACE_ENTER(str) \
+@@ -427,6 +430,29 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
+ 	if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))
+ 		return FALSE;
+ 	default_depth = fbdevHWGetDepth(pScrn,&fbbpp);
++
++	if (default_depth == 8) do {
++	    /* trust the command line */
++	    if (xf86FbBpp > 0 || xf86Depth > 0)
++		break;
++
++	    /* trust the config file's Screen stanza */
++	    if (pScrn->confScreen->defaultfbbpp > 0 ||
++		pScrn->confScreen->defaultdepth > 0)
++		break;
++
++	    /* trust our Device stanza in the config file */
++	    if (xf86FindOption(fPtr->pEnt->device->options, "DefaultDepth") ||
++		xf86FindOption(fPtr->pEnt->device->options, "DefaultFbBpp"))
++		break;
++
++	    /* otherwise, lol no */
++	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++		       "Console is 8bpp, defaulting to 32bpp\n");
++	    default_depth = 24;
++	    fbbpp = 32;
++	} while (0);
++
+ 	if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,
+ 			     Support24bppFb | Support32bppFb | SupportConvert32to24 | SupportConvert24to32))
+ 		return FALSE;
+-- 
+1.8.5.3
+
diff --git a/SPECS/xorg-x11-drv-fbdev.spec b/SPECS/xorg-x11-drv-fbdev.spec
index 71f55dd..d071966 100644
--- a/SPECS/xorg-x11-drv-fbdev.spec
+++ b/SPECS/xorg-x11-drv-fbdev.spec
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
 Version:   0.4.3
-Release:   12%{?dist}
+Release:   15%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@ ExcludeArch: s390 s390x
 
 Patch0: 0001-Remove-mibstore.h.patch
 Patch2: BGNoneRoot.patch
+Patch3: 0001-Default-to-32bpp-if-the-console-is-8bpp-and-we-weren.patch
 
 BuildRequires: xorg-x11-server-devel >= 1.10.99.902
 BuildRequires: autoconf automake libtool
@@ -30,6 +31,7 @@ X.Org X11 fbdev video driver.
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -vif
@@ -54,6 +56,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Fri Mar 21 2014 Adam Jackson <ajax@redhat.com> 0.4.3-15
+- Default to 32bpp when the console is only 8bpp (#1055533)
+
+* Wed Jan 15 2014 Adam Jackson <ajax@redhat.com> - 0.4.3-14
+- 1.15 ABI rebuild
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.4.3-13
+- Mass rebuild 2013-12-27
+
 * Wed Nov 06 2013 Adam Jackson <ajax@redhat.com> - 0.4.3-12
 - 1.15RC1 ABI rebuild