diff options
author | root <root@rshg054.dnsready.net> | 2013-03-19 00:04:27 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-03-19 00:04:27 -0700 |
commit | b54c21859be3590a319ceade1f58d0b89ac5ef32 (patch) | |
tree | 1f4a8c6408144ac159505c48e66641671e87ff54 /extra/xf86-video-apm | |
parent | e81bd948a32f8b411197818651f517ddf431ab0a (diff) |
Tue Mar 19 00:04:27 PDT 2013
Diffstat (limited to 'extra/xf86-video-apm')
-rw-r--r-- | extra/xf86-video-apm/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/xf86-video-apm/git-fix.diff | 23 |
2 files changed, 32 insertions, 6 deletions
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD index a6982cb01..b1a17aebf 100644 --- a/extra/xf86-video-apm/PKGBUILD +++ b/extra/xf86-video-apm/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 168564 2012-10-13 11:44:07Z andyrtr $ +# $Id: PKGBUILD 180190 2013-03-18 16:09:00Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@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 } diff --git a/extra/xf86-video-apm/git-fix.diff b/extra/xf86-video-apm/git-fix.diff new file mode 100644 index 000000000..e48d2c42d --- /dev/null +++ b/extra/xf86-video-apm/git-fix.diff @@ -0,0 +1,23 @@ +From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:03:29 +0000 +Subject: Remove #include "mibstore.h" + +Signed-off-by: Adam Jackson <ajax@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 |