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

---
 main/xf86-video-i740/APKBUILD       | 26 +++++++++++++++++++++-----
 main/xf86-video-i740/mibstore.patch | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 main/xf86-video-i740/mibstore.patch

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

diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD
index 24e98cde8a..bfa9958a32 100644
--- a/main/xf86-video-i740/APKBUILD
+++ b/main/xf86-video-i740/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i740
 pkgver=1.3.4
-pkgrel=1
+pkgrel=3
 pkgdesc="Intel i740 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,19 +11,35 @@ 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
+	mibstore.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="11c0aa1036ba8c203a03d1f00bbec195  xf86-video-i740-1.3.4.tar.bz2"
+md5sums="11c0aa1036ba8c203a03d1f00bbec195  xf86-video-i740-1.3.4.tar.bz2
+3a2b499ce4d6dc54f2ce0c306ab1ebb0  mibstore.patch"
+sha256sums="1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78  xf86-video-i740-1.3.4.tar.bz2
+2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca  mibstore.patch"
+sha512sums="0440bdb891af02fabf10b92c0c7a0013140aeee82c80d2daf42291fff8fda96824889dd2d36338d032db7ac5b8e0691bf86d64c7cef3f51fbdb7b344ffff997d  xf86-video-i740-1.3.4.tar.bz2
+e2f179d7e86e7a90cd34bd0bd60061cedf493c2cdf23354a8550b952e15bfef987c61db86ab5c03e57a438cad2bbc02fb0089c86990a81c3928089319197b57c  mibstore.patch"
diff --git a/main/xf86-video-i740/mibstore.patch b/main/xf86-video-i740/mibstore.patch
new file mode 100644
index 0000000000..a33dc7e3db
--- /dev/null
+++ b/main/xf86-video-i740/mibstore.patch
@@ -0,0 +1,32 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:21:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
-- 
cgit v1.2.3