From d1c5e6789c1d4e25bffbaed9ace6b2d03a853951 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 7 Mar 2013 09:41:57 +0000
Subject: main/xf86-video-geode: rebuild against xorg-server-1.14

---
 main/xf86-video-geode/APKBUILD       | 11 ++++++---
 main/xf86-video-geode/mibstore.patch | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 main/xf86-video-geode/mibstore.patch

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

diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD
index ccff5779c6..1243689be1 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=0
+pkgrel=2
 pkgdesc="AMD Geode GX and LX video driver"
 url="http://xorg.freedesktop.org/"
 arch="x86"
@@ -11,7 +11,7 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xf86dgaproto"
 
-patches=""
+patches="mibstore.patch"
 source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	$patches"
 
@@ -36,4 +36,9 @@ 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"
+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"
diff --git a/main/xf86-video-geode/mibstore.patch b/main/xf86-video-geode/mibstore.patch
new file mode 100644
index 0000000000..b34ba9c76a
--- /dev/null
+++ b/main/xf86-video-geode/mibstore.patch
@@ -0,0 +1,46 @@
+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