summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-03-07 09:18:30 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-03-07 18:23:43 +0000
commit8a5e12e99d5dd3859edb66580ea245c13963c42c (patch)
tree52c6ebaa499f7704bc12db891860c481d0c3ef70 /main
parente47412ee1c8398f361d30e6204b3c0d624bf0245 (diff)
downloadaports-8a5e12e99d5dd3859edb66580ea245c13963c42c.tar.bz2
aports-8a5e12e99d5dd3859edb66580ea245c13963c42c.tar.xz
main/xf86-video-apm: rebuild against xorg-server-1.14
Diffstat (limited to 'main')
-rw-r--r--main/xf86-video-apm/APKBUILD10
-rw-r--r--main/xf86-video-apm/mibstore.patch23
2 files changed, 31 insertions, 2 deletions
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD
index 1c899f4f0..b62539dda 100644
--- a/main/xf86-video-apm/APKBUILD
+++ b/main/xf86-video-apm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-apm
pkgver=1.2.5
-pkgrel=1
+pkgrel=3
pkgdesc="Alliance ProMotion video driver"
url="http://xorg.freedesktop.org/"
arch="all"
@@ -12,6 +12,7 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
videoproto renderproto"
source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+ mibstore.patch
"
prepare() {
@@ -37,4 +38,9 @@ package() {
rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="bce02d48c66932d082786167af22835a xf86-video-apm-1.2.5.tar.bz2"
+md5sums="bce02d48c66932d082786167af22835a xf86-video-apm-1.2.5.tar.bz2
+8be9e7447c739b7cf9a80ea8ce9da852 mibstore.patch"
+sha256sums="953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f xf86-video-apm-1.2.5.tar.bz2
+be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b mibstore.patch"
+sha512sums="652307d5e21fcd0df890b941821f409cc0c9846133cf7e522799710d28ebf0d8ff2d8ead3235d8207169f416a6561bc14b4fedb1baaddb1bddf03007372af622 xf86-video-apm-1.2.5.tar.bz2
+f27a8f9f3206de54ce9f05596d78829832e7576b5d515d22b0052e39c70fef63e85f016c2c1dfad45aa6d09cb59582d101854552fc44970275f1b38688924d52 mibstore.patch"
diff --git a/main/xf86-video-apm/mibstore.patch b/main/xf86-video-apm/mibstore.patch
new file mode 100644
index 000000000..e48d2c42d
--- /dev/null
+++ b/main/xf86-video-apm/mibstore.patch
@@ -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