From e04016a5ede191674700b9c15eb116163705c155 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 30 May 2018 12:37:43 -0400 Subject: [PATCH] fbdev 0.5.0 --- .gitignore | 1 + 0001-Remove-mibstore.h.patch | 33 --------------------------------- fbdev-0.3.0-32fbbpp.patch | 11 ----------- sources | 2 +- xorg-x11-drv-fbdev.spec | 11 ++++++----- 5 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 0001-Remove-mibstore.h.patch delete mode 100644 fbdev-0.3.0-32fbbpp.patch diff --git a/.gitignore b/.gitignore index 4e5e490..50b8e67 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xf86-video-fbdev-0.4.1.tar.bz2 /xf86-video-fbdev-0.4.2.tar.bz2 /xf86-video-fbdev-0.4.3.tar.bz2 +/xf86-video-fbdev-0.5.0.tar.bz2 diff --git a/0001-Remove-mibstore.h.patch b/0001-Remove-mibstore.h.patch deleted file mode 100644 index ea7d00b..0000000 --- a/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/fbdev-0.3.0-32fbbpp.patch b/fbdev-0.3.0-32fbbpp.patch deleted file mode 100644 index 18649cd..0000000 --- a/fbdev-0.3.0-32fbbpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xf86-video-fbdev-0.3.0/src/fbdev.c.fbbpp 2006-08-28 20:32:56.000000000 -0400 -+++ xf86-video-fbdev-0.3.0/src/fbdev.c 2006-08-28 21:32:52.000000000 -0400 -@@ -421,7 +421,7 @@ - return FALSE; - default_depth = fbdevHWGetDepth(pScrn,&fbbpp); - if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp, -- Support24bppFb | Support32bppFb | SupportConvert32to24 | PreferConvert32to24)) -+ Support24bppFb | Support32bppFb | SupportConvert32to24 | PreferConvert24to32)) - return FALSE; - xf86PrintDepthBpp(pScrn); - diff --git a/sources b/sources index 945eb5a..d378c74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d99f1dfb3f0fea077b6b61caa3dc85a xf86-video-fbdev-0.4.3.tar.bz2 +SHA512 (xf86-video-fbdev-0.5.0.tar.bz2) = c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448 diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec index 64c3214..1db18af 100644 --- a/xorg-x11-drv-fbdev.spec +++ b/xorg-x11-drv-fbdev.spec @@ -6,17 +6,16 @@ Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev -Version: 0.4.3 -Release: 30%{?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 BuildRequires: xorg-x11-server-devel >= 1.10.99.902 @@ -30,7 +29,6 @@ X.Org X11 fbdev video driver. %prep %setup -q -n %{tarball}-%{version} -%patch0 -p1 %patch2 -p1 %build @@ -52,6 +50,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- %{_mandir}/man4/fbdev.4* %changelog +* Wed May 30 2018 Adam Jackson - 0.5.0-1 +- fbdev 0.5.0 + * Mon Apr 02 2018 Adam Jackson - 0.4.3-30 - Rebuild for xserver 1.20