From 5810adb2eb3b79de9a368693844c6c779373ca76 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 5 Nov 2013 08:43:38 +0000
Subject: main/xf86-video-geode: upgrade to 2.11.15

---
 main/xf86-video-geode/APKBUILD       | 25 ++++++++------------
 main/xf86-video-geode/mibstore.patch | 46 ------------------------------------
 2 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 main/xf86-video-geode/mibstore.patch

diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD
index f9314aea6b..04ad5f5b51 100644
--- a/main/xf86-video-geode/APKBUILD
+++ b/main/xf86-video-geode/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-geode
-pkgver=2.11.14
-pkgrel=2
+pkgver=2.11.15
+pkgrel=0
 pkgdesc="AMD Geode GX and LX video driver"
 url="http://xorg.freedesktop.org/"
 arch="x86"
@@ -11,16 +11,14 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xf86dgaproto"
 
-patches="mibstore.patch"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	$patches"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-	for i in $patches; do
-		msg $i
-		patch -p1 -i "$srcdir"/$i || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
 	done
 }
 
@@ -41,9 +39,6 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="c9a4e1c5438240e5bdce332f92df9163  xf86-video-geode-2.11.14.tar.bz2
-241b9d715ad8e22e8d556b5cf6d4dd07  mibstore.patch"
-sha256sums="4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc  xf86-video-geode-2.11.14.tar.bz2
-f5958126b5361b856607fb0c575086f18f148bfff97ae11ed83638fcecb0c69d  mibstore.patch"
-sha512sums="d974bb0b00d09c0c3454ccf5363838acc8c3baa62daf8664f1bf310177c23997924db9adcf57323c355f7add43a0560fb54f3ede97e4ed11082d0c793312559b  xf86-video-geode-2.11.14.tar.bz2
-b2757d5647c79e94f5c77604941fb059ffe570b84d04b1d76fd53b7200deade837d6c805196e1a306d7bc2ae512d868b7f87ccfbdce164b11c0fd68af2c071a0  mibstore.patch"
+md5sums="7dafd19e274c771539b6d4d459423ccf  xf86-video-geode-2.11.15.tar.bz2"
+sha256sums="00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0  xf86-video-geode-2.11.15.tar.bz2"
+sha512sums="a6e69a57a02122501e0a6677d95d1bc95e0cce509f2b9ae2ce6e422d67b5dc1e9fae6be01cb745eaec0f51ba73447db943119748959c72879274d266adaa87e7  xf86-video-geode-2.11.15.tar.bz2"
diff --git a/main/xf86-video-geode/mibstore.patch b/main/xf86-video-geode/mibstore.patch
deleted file mode 100644
index b34ba9c76a..0000000000
--- a/main/xf86-video-geode/mibstore.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 10 Jan 2013 03:16:26 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/geode_driver.c b/src/geode_driver.c
-index b27bfd5..9cd0af9 100644
---- a/src/geode_driver.c
-+++ b/src/geode_driver.c
-@@ -59,8 +59,6 @@
- /* Machine independent stuff */
- #include "mipointer.h"
- #include "micmap.h"
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "vbe.h"
- 
-diff --git a/src/gx_driver.c b/src/gx_driver.c
-index 5268f29..7f44e19 100644
---- a/src/gx_driver.c
-+++ b/src/gx_driver.c
-@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pGeode->NoAccel)
-         GXAccelInit(pScrn);
- 
--    miInitializeBackingStore(pScrn);
-     xf86SetBackingStore(pScrn);
- 
-     /* Set up the soft cursor */
-diff --git a/src/lx_driver.c b/src/lx_driver.c
-index 6d7f37f..146578e 100644
---- a/src/lx_driver.c
-+++ b/src/lx_driver.c
-@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pGeode->NoAccel)
-         pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE;
- 
--    miInitializeBackingStore(pScrn);
-     xf86SetBackingStore(pScrn);
- 
-     /* Set up the soft cursor */
---
-cgit v0.9.0.2-2-gbebe
-- 
cgit v1.2.3