[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: xf86-video-mach64: Prepare for xorg-server 1.17 update.
From: |
Mark H. Weaver |
Subject: |
02/04: gnu: xf86-video-mach64: Prepare for xorg-server 1.17 update. |
Date: |
Wed, 18 Feb 2015 08:42:13 +0000 |
mhw pushed a commit to branch wip-xorg-server-1.17
in repository guix.
commit 8ddaa66350cfa329eb0661b319f48499be2967e2
Author: Mark H Weaver <address@hidden>
Date: Wed Feb 18 02:30:13 2015 -0500
gnu: xf86-video-mach64: Prepare for xorg-server 1.17 update.
* gnu/packages/patches/xf86-video-mach64-libpciaccess.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-mach64): Add patch.
---
gnu-system.am | 1 +
.../patches/xf86-video-mach64-libpciaccess.patch | 28 ++++++++++++++++++++
gnu/packages/xorg.scm | 3 +-
3 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index e229913..d99dcfd 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -513,6 +513,7 @@ dist_patch_DATA =
\
gnu/packages/patches/xf86-video-intel-compat-api.patch \
gnu/packages/patches/xf86-video-intel-glibc-2.20.patch \
gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \
+ gnu/packages/patches/xf86-video-mach64-libpciaccess.patch \
gnu/packages/patches/xf86-video-mga-glibc-2.20.patch \
gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \
gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
diff --git a/gnu/packages/patches/xf86-video-mach64-libpciaccess.patch
b/gnu/packages/patches/xf86-video-mach64-libpciaccess.patch
new file mode 100644
index 0000000..40c8986
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-mach64-libpciaccess.patch
@@ -0,0 +1,28 @@
+From 810572536e153ac9e4615a35e2ab99dc266806da Mon Sep 17 00:00:00 2001
+From: Dave Airlie <address@hidden>
+Date: Sat, 15 Nov 2014 11:29:54 +1000
+Subject: mach64: fix build probably not required with pci access anyways
+
+
+diff --git a/src/atipreinit.c b/src/atipreinit.c
+index e3048d2..dbcd9fd 100644
+--- a/src/atipreinit.c
++++ b/src/atipreinit.c
+@@ -1079,12 +1079,14 @@ ATIPreInit
+ }
+ }
+
++#ifndef XSERVER_LIBPCIACCESS
+ if (!xf86LinearVidMem())
+ {
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+ "A linear aperture is not available.\n");
+ goto bail;
+ }
++#endif
+
+ /*
+ * Set colour weights.
+--
+cgit v0.10.2
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 3a56ad7..07de603 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2637,7 +2637,8 @@ devices, thus making direct access unnecessary.")
(sha256
(base32
"0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp"))
- (patches (list (search-patch "xf86-video-mach64-glibc-2.20.patch")))))
+ (patches (list (search-patch "xf86-video-mach64-glibc-2.20.patch")
+ (search-patch
"xf86-video-mach64-libpciaccess.patch")))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto)