[arch-commits] Commit in xf86-video-ark/trunk (PKGBUILD build-fix.diff)

[Laurent Carlier]

Date: Tuesday, November 22, 2016 @ 05:54:49
  Author: lcarlier
Revision: 281799

upgpkg: xf86-video-ark 0.7.5-8

xorg-server-1.19 rebuild

Modified:
  xf86-video-ark/trunk/PKGBUILD
  xf86-video-ark/trunk/build-fix.diff

+
 PKGBUILD   |   12 ++--
 build-fix.diff |   31 +--
 2 files changed, 35 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-22 05:45:01 UTC (rev 281798)
+++ PKGBUILD2016-11-22 05:54:49 UTC (rev 281799)
@@ -4,18 +4,18 @@
 
 pkgname=xf86-video-ark
 pkgver=0.7.5
-pkgrel=7
+pkgrel=8
 pkgdesc="X.org ark video driver"
 arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/;
+url="https://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20' 'resourceproto' 
'scrnsaverproto')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
-groups=('xorg-drivers' 'xorg')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
build-fix.diff)
 sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e'
-'257c3db46ef85863cc2d1b2ba250ef6b1a08df75171f2f3cef83cabd8b22399b')
+'ab694ebc0820d75b7cbf58920ce8b10291f245a5f1ae82542cfa63e5765660dc')
 
 prepare() {
   cd ${pkgname}-${pkgver}

Modified: build-fix.diff
===
--- build-fix.diff  2016-11-22 05:45:01 UTC (rev 281798)
+++ build-fix.diff  2016-11-22 05:54:49 UTC (rev 281799)
@@ -1,5 +1,20 @@
 xf86-video-ark-0.7.5/src/ark_driver.c  2012-07-17 06:51:36.0 
+0200
-+++ xf86-video-ark-0.7.5/src/ark_driver.c.new  2013-03-09 12:34:04.33627 
+0100
+From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon 
+Date: Tue, 17 Sep 2013 15:55:37 -0400
+Subject: Remove usage of mibstore.h (removed from server)
+
+The module had a compile error for this missing header file.
+
+Changes similar to vmware commit
+23d87c92b7211cc5249eefe4ab3a2c7f370e279e
+
+Reviewed-by: Alex Deucher 
+Signed-off-by: Gaetan Nadon 
+
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index b7c287c..65cfe84 100644
+--- a/src/ark_driver.c
 b/src/ark_driver.c
 @@ -39,7 +39,6 @@
  #include "compiler.h"
  #include "mipointer.h"
@@ -8,3 +23,15 @@
  #include "fb.h"
  #include "ark.h"
  
+@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL)
+ 
+   fbPictureInit (pScreen, 0, 0);
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+ 
+   if (!pARK->NoAccel) {
+-- 
+cgit v0.10.2
+
+

[arch-commits] Commit in xf86-video-ark/trunk (PKGBUILD build-fix.diff)

[Andreas Radke]

Date: Saturday, March 9, 2013 @ 12:40:40
  Author: andyrtr
Revision: 179696

upgpkg: xf86-video-ark 0.7.5-3

rebuild for new X-ABI-VIDEODRV_VERSION=14; add a build fix

Added:
  xf86-video-ark/trunk/build-fix.diff
Modified:
  xf86-video-ark/trunk/PKGBUILD

+
 PKGBUILD   |   13 -
 build-fix.diff |   10 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 11:30:26 UTC (rev 179695)
+++ PKGBUILD2013-03-09 11:40:40 UTC (rev 179696)
@@ -1,23 +1,26 @@
 # $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xf86-video-ark
 pkgver=0.7.5
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org ark video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 
'scrnsaverproto')
-conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
build-fix.diff)
+sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e'
+'257c3db46ef85863cc2d1b2ba250ef6b1a08df75171f2f3cef83cabd8b22399b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }

Added: build-fix.diff
===
--- build-fix.diff  (rev 0)
+++ build-fix.diff  2013-03-09 11:40:40 UTC (rev 179696)
@@ -0,0 +1,10 @@
+--- xf86-video-ark-0.7.5/src/ark_driver.c  2012-07-17 06:51:36.0 
+0200
 xf86-video-ark-0.7.5/src/ark_driver.c.new  2013-03-09 12:34:04.33627 
+0100
+@@ -39,7 +39,6 @@
+ #include compiler.h
+ #include mipointer.h
+ #include micmap.h
+-#include mibstore.h
+ #include fb.h
+ #include ark.h
+