diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-05-20 04:58:06 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-05-20 05:02:26 +0200 |
| commit | 0f469c172e41345e2097df4239b96ee627402397 (patch) | |
| tree | 9f1be1a969f373677d831c5ac03057ce2331e096 | |
| parent | 3db907f000ee17ce8bb55c200c59f7cc8e8eceb8 (diff) | |
| download | guix-0f469c172e41345e2097df4239b96ee627402397.tar guix-0f469c172e41345e2097df4239b96ee627402397.tar.gz | |
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.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-voodoo-pcitag.patch | 34 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 9 |
3 files changed, 36 insertions, 8 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 694bbfd367..c2f2ce2d40 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch new file mode 100644 index 0000000000..5cadef3928 --- /dev/null +++ b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch @@ -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 + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5d8b3498e6..68f72bea98 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3488,14 +3488,7 @@ X server.") (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))) |