From c20a5723ca788335cd109f772a19f798599dad75 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 3 Feb 2014 15:47:43 +0000
Subject: main/xf86-video-geode: rebuild against xorg-server-1.15

---
 main/xf86-video-geode/APKBUILD                  | 14 +++++++++-----
 main/xf86-video-geode/geode-2.11.14-ftbfs.patch | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 main/xf86-video-geode/geode-2.11.14-ftbfs.patch

(limited to 'main')

diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD
index 04ad5f5b51..119615c055 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.15
-pkgrel=0
+pkgrel=1
 pkgdesc="AMD Geode GX and LX video driver"
 url="http://xorg.freedesktop.org/"
 arch="x86"
@@ -11,7 +11,8 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xf86dgaproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	geode-2.11.14-ftbfs.patch"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -39,6 +40,9 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-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"
+md5sums="7dafd19e274c771539b6d4d459423ccf  xf86-video-geode-2.11.15.tar.bz2
+ae19a5f99be68fc13d5cd0be7f0f7344  geode-2.11.14-ftbfs.patch"
+sha256sums="00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0  xf86-video-geode-2.11.15.tar.bz2
+c444ab1615808fe8016668f41555bf2c1e3c9d326ea48056433ad67de5b1880a  geode-2.11.14-ftbfs.patch"
+sha512sums="a6e69a57a02122501e0a6677d95d1bc95e0cce509f2b9ae2ce6e422d67b5dc1e9fae6be01cb745eaec0f51ba73447db943119748959c72879274d266adaa87e7  xf86-video-geode-2.11.15.tar.bz2
+8f8b1f7dd78df6947c7e0c1912f5d04bc070d52a35150e413d27ac58f408839f185abc981466f3e7e74a67a690a8501d6097b92105d81c136897f559769b2235  geode-2.11.14-ftbfs.patch"
diff --git a/main/xf86-video-geode/geode-2.11.14-ftbfs.patch b/main/xf86-video-geode/geode-2.11.14-ftbfs.patch
new file mode 100644
index 0000000000..f1749d6e04
--- /dev/null
+++ b/main/xf86-video-geode/geode-2.11.14-ftbfs.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-geode-2.11.14/src/geode_dcon.c.jx xf86-video-geode-2.11.14/src/geode_dcon.c
+--- xf86-video-geode-2.11.14/src/geode_dcon.c.jx	2012-11-24 05:01:15.000000000 -0500
++++ xf86-video-geode-2.11.14/src/geode_dcon.c	2013-10-25 16:19:35.950234174 -0400
+@@ -29,6 +29,7 @@
+ 
+ /* Includes that are used by all drivers */
+ #include <xf86.h>
++#include <xf86Modes.h>
+ #include <xf86_OSproc.h>
+ #include <compiler.h>
+ 
+
-- 
cgit v1.2.3