[arch-commits] Commit in xf86-video-fbdev/trunk (PKGBUILD gcc8.diff)

[Andreas Radke]

    Date: Friday, May 11, 2018 @ 19:24:25
  Author: andyrtr
Revision: 323971

upgpkg: xf86-video-fbdev 0.4.4+13+g9af7f81-1

xorg-server update 1.20.0 rebuild; add build fixes

Added:
  xf86-video-fbdev/trunk/gcc8.diff
Modified:
  xf86-video-fbdev/trunk/PKGBUILD

-----------+
 PKGBUILD  |   27 +++++++++++++++------------
 gcc8.diff |   11 +++++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-11 19:14:45 UTC (rev 323970)
+++ PKGBUILD	2018-05-11 19:24:25 UTC (rev 323971)
@@ -2,7 +2,7 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-fbdev
-pkgver=0.4.4+12+ge0bce0d
+pkgver=0.4.4+13+g9af7f81
 pkgrel=1
 pkgdesc="X.org framebuffer video driver"
 arch=(x86_64)
@@ -9,14 +9,15 @@
 license=('custom')
 url="https://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' git)
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' git)
+conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25')
 groups=('xorg-drivers')
-_commit=e0bce0d017c5e1597aa8269551355e1ddeb3c8fb  # master
-source=("git+https://anongit.freedesktop.org/git/xorg/driver/xf86-video-fbdev#commit=$_commit")
-sha256sums=('SKIP')
+_commit=9af7f81534aa03fe01d88786805b00729ac321e9  # master
+source=("git+https://anongit.freedesktop.org/git/xorg/driver/xf86-video-fbdev#commit=$_commit"
+        gcc8.diff)
+sha256sums=('SKIP'
+            '050db537aae39b6deb1b2531b0064d62e2725f92b6c5c8ee6ade32e73cd3d5e8')
 
-
 pkgver() {
   cd $pkgname
   git describe --tags | sed 's/^xf86-video-fbdev-//;s/-/+/g'
@@ -24,14 +25,11 @@
 
 prepare() {
   cd $pkgname
+  patch -Np0 -i ../gcc8.diff
+  
   NOCONFIGURE=1 ./autogen.sh
 }
 
-check() {
-  cd $pkgname
-  make check
-}
-
 build() {
   cd $pkgname
 
@@ -46,6 +44,11 @@
   make
 }
 
+check() {
+  cd $pkgname
+  make check
+}
+
 package() {
   cd $pkgname
   make DESTDIR="${pkgdir}" install

Added: gcc8.diff
===================================================================
--- gcc8.diff	                        (rev 0)
+++ gcc8.diff	2018-05-11 19:24:25 UTC (rev 323971)
@@ -0,0 +1,11 @@
+--- src/fbdev.c	2018-05-11 21:15:36.650039778 +0200
++++ src/fbdev.c.new	2018-05-11 21:17:27.063021717 +0200
+@@ -1008,7 +1008,7 @@
+ 	fPtr->CloseScreen = pScreen->CloseScreen;
+ 	pScreen->CloseScreen = FBDevCloseScreen;
+ 
+-#if XV
++#ifdef XV
+ 	{
+ 	    XF86VideoAdaptorPtr *ptr;
+