mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: xf86-video-voodoo: Ship patch locally.
The ORIGIN patch has been modified in place, probably *wild guessing sounds* by a server-side cgit update. * gnu/packages/xorg.scm (xf86-video-voodoo)[source]: Use SEARCH-PATCHES. * gnu/packages/patches/xf86-video-voodoo-pcitag.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
parent
3db907f000
commit
0f469c172e
3 changed files with 36 additions and 8 deletions
|
@ -1368,6 +1368,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
|
||||
%D%/packages/patches/xf86-video-sis-xorg-compat.patch \
|
||||
%D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
|
||||
%D%/packages/patches/xf86-video-voodoo-pcitag.patch \
|
||||
%D%/packages/patches/xfce4-panel-plugins.patch \
|
||||
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
|
||||
%D%/packages/patches/xfce4-settings-defaults.patch \
|
||||
|
|
34
gnu/packages/patches/xf86-video-voodoo-pcitag.patch
Normal file
34
gnu/packages/patches/xf86-video-voodoo-pcitag.patch
Normal file
|
@ -0,0 +1,34 @@
|
|||
From: Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
Date: Mon, 20 May 2019 04:52:33 +0200
|
||||
Subject: [PATCH] gnu: xf86-video-voodoo: Don't use PCITAG.
|
||||
|
||||
Copied verbatim from upstream repository[0].
|
||||
|
||||
[0]: https://cgit.freedesktop.org/xorg/driver/-xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593
|
||||
|
||||
From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
|
||||
From: Dave Airlie <airlied@redhat.com>
|
||||
Date: Mon, 22 Sep 2014 10:56:02 +1000
|
||||
Subject: don't use PCITAG in struct anymore
|
||||
|
||||
---
|
||||
src/voodoo.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/voodoo.h b/src/voodoo.h
|
||||
index bfed497..c3eb64e 100644
|
||||
--- a/src/voodoo.h
|
||||
+++ b/src/voodoo.h
|
||||
@@ -23,7 +23,9 @@ typedef struct {
|
||||
|
||||
Bool Voodoo2; /* Set if Voodoo2 */
|
||||
pciVideoPtr PciInfo; /* PCI data */
|
||||
+#ifndef XSERVER_LIBPCIACCESS
|
||||
PCITAG PciTag;
|
||||
+#endif
|
||||
CARD32 PhysBase;
|
||||
|
||||
CARD32 Width; /* Current width */
|
||||
--
|
||||
cgit v1.0
|
||||
|
|
@ -3488,14 +3488,7 @@ (define-public xf86-video-voodoo
|
|||
(base32
|
||||
"1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"))
|
||||
(patches
|
||||
(list (origin
|
||||
(method url-fetch)
|
||||
(uri "https://cgit.freedesktop.org/xorg/driver/\
|
||||
xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593")
|
||||
(sha256
|
||||
(base32
|
||||
"0rndmxf5b8j3hjnhrwrnzsq5024fli134fj1mprhkcrvax2zq8db"))
|
||||
(file-name "xf86-video-voodoo-pcitag.patch"))))))
|
||||
(search-patches "xf86-video-voodoo-pcitag.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("xorgproto" ,xorgproto)
|
||||
("xorg-server" ,xorg-server)))
|
||||
|
|
Loading…
Reference in a new issue