Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=00a5ae67932b123b5598e063fe19f24574725c44
commit 00a5ae67932b123b5598e063fe19f24574725c44
Author: bouleetbil <bouleet...@frogdev.info>
Date: Wed Sep 2 22:01:40 2009 +0200
xf86-video-ark-0.7.1-2-i686
*rebuild with new xorg
diff --git a/source/x11/xf86-video-ark/FixRessources.diff
b/source/x11/xf86-video-ark/FixRessources.diff
new file mode 100644
index 0000000..1920070
--- /dev/null
+++ b/source/x11/xf86-video-ark/FixRessources.diff
@@ -0,0 +1,38 @@
+From e521e8240c1acc49a514db123cb67beb669dea81 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@redhat.com>
+Date: Tue, 28 Jul 2009 03:32:28 +0000
+Subject: ark: update for resources/RAC API removal
+
+---
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index db5303c..ee94a14 100644
+--- a/src/ark_driver.c
++++ b/src/ark_driver.c
+@@ -35,7 +35,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86Pci.h"
+ #include "xf86PciInfo.h"
+-#include "xf86Resources.h"
+ #include "xf86fbman.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+@@ -313,16 +312,7 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
+ }
+
+ pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+- if (pEnt->resources) {
+- xfree(pEnt);
+- ARKFreeRec(pScrn);
+- return FALSE;
+- }
+-
+ pARK->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+- xf86RegisterResources(pEnt->index, NULL, ResNone);
+- xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
+- xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+
+ if (pEnt->device->chipset && *pEnt->device->chipset) {
+ pScrn->chipset = pEnt->device->chipset;
+--
+cgit v0.8.2
+
diff --git a/source/x11/xf86-video-ark/FrugalBuild
b/source/x11/xf86-video-ark/FrugalBuild
index 3d78c1b..aba9a64 100644
--- a/source/x11/xf86-video-ark/FrugalBuild
+++ b/source/x11/xf86-video-ark/FrugalBuild
@@ -3,14 +3,16 @@
pkgname=xf86-video-ark
pkgver=0.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org driver for ark cards"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-drivers')
archs=('i686' 'x86_64')
-depends=('xorg-server>=1.6.1')
-makedepends=('xproto>=.0;15' 'randrproto>=1.3.0' 'renderproto')
+depends=('xorg-server>=1.6.3')
+makedepends=('xproto>=7.0.15' 'randrproto>=1.3.0' 'renderproto')
Finclude xorg
-sha1sums=('d2e929cddda2e5f2df87a1ef53db585bcedb0c59')
+source=($source FixRessources.diff)
+sha1sums=('d2e929cddda2e5f2df87a1ef53db585bcedb0c59' \
+ 'aab81e3770c5c50cd723546002de80a4efaf633d')
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
