[arch-commits] Commit in xf86-video-apm/trunk (PKGBUILD git-fix.diff)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sat Mar 9 11:30:09 UTC 2013
Date: Saturday, March 9, 2013 @ 12:30:07
Author: andyrtr
Revision: 179694
upgpkg: xf86-video-apm 1.2.5-3
rebuild for new X-ABI-VIDEODRV_VERSION=14; add a git fix
Added:
xf86-video-apm/trunk/git-fix.diff
Modified:
xf86-video-apm/trunk/PKGBUILD
--------------+
PKGBUILD | 13 ++++++++-----
git-fix.diff | 23 +++++++++++++++++++++++
2 files changed, 31 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-09 11:16:48 UTC (rev 179693)
+++ PKGBUILD 2013-03-09 11:30:07 UTC (rev 179694)
@@ -1,22 +1,25 @@
# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-apm
pkgver=1.2.5
-pkgrel=2
+pkgrel=3
pkgdesc="X.org Alliance ProMotion 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-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
+ 'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/git-fix.diff
./configure --prefix=/usr
make
}
Added: git-fix.diff
===================================================================
--- git-fix.diff (rev 0)
+++ git-fix.diff 2013-03-09 11:30:07 UTC (rev 179694)
@@ -0,0 +1,23 @@
+From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 10 Jan 2013 03:03:29 +0000
+Subject: Remove #include "mibstore.h"
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list