Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=e91cef85ff63844752c438adaefb0d77f6fdf4c0

commit e91cef85ff63844752c438adaefb0d77f6fdf4c0
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Thu Aug 19 09:58:44 2010 +0200

xf86-video-nv-2.1.18-2-ppc
*disable kms for ppc
*133f7c4d51b3c7d7e1e7af80056947d3a7ec2097 break ppc support
*pci_device_has_kernel_driver() from libpciaccess break ppc.

diff --git a/source/x11/xf86-video-nv/FrugalBuild 
b/source/x11/xf86-video-nv/FrugalBuild
index 889b39a..16efa35 100644
--- a/source/x11/xf86-video-nv/FrugalBuild
+++ b/source/x11/xf86-video-nv/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=xf86-video-nv
pkgver=2.1.18
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org driver for NVidia cards"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-drivers')
@@ -11,6 +11,8 @@ archs=('i686' 'x86_64' 'ppc')
depends=('xorg-server>=1.8.1')
makedepends=('randrproto>1.3.0' 'renderproto' 'videoproto>=2.2.2' 
'xf86dgaproto' 'util-macros')
Finclude xorg
-sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2')
+source=($source ppc_disablekms.diff)
+sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2' \
+          'd9e374998d6ad3e4900285fa1a509874a40bdba6')

# optimization OK
diff --git a/source/x11/xf86-video-nv/ppc_disablekms.diff 
b/source/x11/xf86-video-nv/ppc_disablekms.diff
new file mode 100644
index 0000000..de1fa3d
--- /dev/null
+++ b/source/x11/xf86-video-nv/ppc_disablekms.diff
@@ -0,0 +1,17 @@
+--- xf86-video-nv-2.1.18/src/nv_driver.c.old   2010-08-18 17:55:42.000000000 
+0200
++++ xf86-video-nv-2.1.18/src/nv_driver.c       2010-08-19 09:40:31.000000000 
+0200
+@@ -912,14 +912,6 @@
+                       NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | 
dev->device_id;
+     const char *name = xf86TokenToString(NVKnownChipsets, id);
+
+-    if (pci_device_has_kernel_driver(dev)) {
+-        xf86DrvMsg(0, X_ERROR,
+-                   NV_NAME ": The PCI device 0x%x (%s) at 
%2...@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
+-                   id, name, dev->bus, dev->domain, dev->dev, dev->func);
+-        xf86DrvMsg(0, X_ERROR,
+-                   NV_NAME ": This driver cannot operate until it has been 
unloaded.\n");
+-        return FALSE;
+-    }
+
+     if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&
+        !NVIsSupported(id) && !NVIsG80(id)) {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to