diff --git a/.gitignore b/.gitignore index 4bf343e..72f44ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-video-fbdev-0.4.3.tar.bz2 +SOURCES/xf86-video-fbdev-0.5.0.tar.bz2 diff --git a/.xorg-x11-drv-fbdev.metadata b/.xorg-x11-drv-fbdev.metadata index 5fdd144..e470a78 100644 --- a/.xorg-x11-drv-fbdev.metadata +++ b/.xorg-x11-drv-fbdev.metadata @@ -1 +1 @@ -1c0c4ab498010baf1e55b9fb5c7bb23c8d2353d1 SOURCES/xf86-video-fbdev-0.4.3.tar.bz2 +8d79ec615cb54436ff96dc94b74775db6dc47aff SOURCES/xf86-video-fbdev-0.5.0.tar.bz2 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 deleted file mode 100644 index 8ea264a..0000000 --- a/SOURCES/0001-Default-to-32bpp-if-the-console-is-8bpp-and-we-weren.patch +++ /dev/null @@ -1,63 +0,0 @@ -From dd1cf1028c3f0de77d075c4a169011518baab0f4 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -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 ---- - 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 - #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/SOURCES/0001-Remove-mibstore.h.patch b/SOURCES/0001-Remove-mibstore.h.patch deleted file mode 100644 index ea7d00b..0000000 --- a/SOURCES/0001-Remove-mibstore.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 08:54:37 -0400 -Subject: [PATCH] Remove mibstore.h - -Signed-off-by: Adam Jackson ---- - src/fbdev.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/fbdev.c b/src/fbdev.c -index cd7ebc5..f5a7378 100644 ---- a/src/fbdev.c -+++ b/src/fbdev.c -@@ -14,7 +14,6 @@ - #include "xf86_OSproc.h" - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "colormapst.h" - #include "xf86cmap.h" -@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) - } - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ --- -1.8.0.2 - diff --git a/SPECS/xorg-x11-drv-fbdev.spec b/SPECS/xorg-x11-drv-fbdev.spec index 386de1d..28cf609 100644 --- a/SPECS/xorg-x11-drv-fbdev.spec +++ b/SPECS/xorg-x11-drv-fbdev.spec @@ -6,19 +6,17 @@ Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev -Version: 0.4.3 -Release: 25%{?dist} +Version: 0.5.0 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support -Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 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 @@ -31,9 +29,7 @@ X.Org X11 fbdev video driver. %prep %setup -q -n %{tarball}-%{version} -%patch0 -p1 %patch2 -p1 -%patch3 -p1 %build autoreconf -vif @@ -57,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/fbdev.4* %changelog +* Wed May 30 2018 Adam Jackson - 0.5.0-1 +- fbdev 0.5.0 + +* Wed May 30 2018 Adam Jackson - 0.4.3-25.1 +- Rebuild for xserver 1.20 + * Thu Sep 29 2016 Hans de Goede - 0.4.3-25 - Rebuild against xserver-1.19