From 4ba7acab73a869905a648d34946b33ba963e2298 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 7 Mar 2013 18:17:16 +0000
Subject: main/xf86-video-vesa: rebuild against xorg-server-1.14

---
 main/xf86-video-vesa/0002-Remove-mibstore.h.patch | 35 +++++++++++++++++++++++
 main/xf86-video-vesa/APKBUILD                     | 27 +++++++++++++----
 2 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 main/xf86-video-vesa/0002-Remove-mibstore.h.patch

(limited to 'main/xf86-video-vesa')

diff --git a/main/xf86-video-vesa/0002-Remove-mibstore.h.patch b/main/xf86-video-vesa/0002-Remove-mibstore.h.patch
new file mode 100644
index 00000000000..df8a2334211
--- /dev/null
+++ b/main/xf86-video-vesa/0002-Remove-mibstore.h.patch
@@ -0,0 +1,35 @@
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 08:55:03 -0400
+Subject: [PATCH 2/2] Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/vesa.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+-- 
+1.8.0.2
+
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
index a5a8f183af9..aac853ca6b6 100644
--- a/main/xf86-video-vesa/APKBUILD
+++ b/main/xf86-video-vesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
 pkgver=2.3.2
-pkgrel=1
+pkgrel=3
 pkgdesc="X.org vesa video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,19 +11,36 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	0002-Remove-mibstore.h.patch"
+
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure --prefix=/usr || return 1
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="3eddd393fba79550e012d717499d58ad  xf86-video-vesa-2.3.2.tar.bz2"
+md5sums="3eddd393fba79550e012d717499d58ad  xf86-video-vesa-2.3.2.tar.bz2
+f0641dbc1afa0ac59c8665ccdffb21f6  0002-Remove-mibstore.h.patch"
+sha256sums="144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3  xf86-video-vesa-2.3.2.tar.bz2
+b74675347d2b96962776fb3a62e20408cb9c2373be910c250d1a5e66d469360c  0002-Remove-mibstore.h.patch"
+sha512sums="5da0da391fe5d3a5a88e36dcf0b75435b6c1b7389425da253633a293f3eeb0dc91760d0e66b3e98e227dabfa888dbf085fcc5fd973381da4df01ed81c8db288e  xf86-video-vesa-2.3.2.tar.bz2
+bf163ce3ce5ff1d979221587d09a7affd3131ce3f9dd1b8d814e4572cb2e6fe8a010d88f3b28f7fcf60ed2cf6adfeb3edd3406197f70f956f8d2fa1e07956dca  0002-Remove-mibstore.h.patch"
-- 
cgit v1.2.3