aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-01-31 11:26:18 +0200
committerEfraim Flashner <efraim@flashner.co.il>2023-01-31 11:26:18 +0200
commit2e09ab0d35606e78f91e6e94f45c118f891463f2 (patch)
tree02e6360e9c1848bff82a3382ccd91d849347f2d1 /gnu/packages
parenta3b57e57e68a1f4848bf8bacd797c5d989f56de2 (diff)
downloadguix-2e09ab0d35606e78f91e6e94f45c118f891463f2.tar
guix-2e09ab0d35606e78f91e6e94f45c118f891463f2.tar.gz
gnu: xf86-video-voodoo: Update to 1.2.6.
* gnu/packages/xorg.scm (xf86-video-voodoo): Update to 1.2.6. [source]: Remove patch. * gnu/packages/patches/xf86-video-voodoo-pcitag.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/patches/xf86-video-voodoo-pcitag.patch34
-rw-r--r--gnu/packages/xorg.scm10
2 files changed, 4 insertions, 40 deletions
diff --git a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch
deleted file mode 100644
index 5cadef3928..0000000000
--- a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 64fca5800d..17b5a75f9e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
-;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
@@ -3504,19 +3504,17 @@ server driver works.")
(define-public xf86-video-voodoo
(package
(name "xf86-video-voodoo")
- (version "1.2.5")
+ (version "1.2.6")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/driver/xf86-video-voodoo-"
version
- ".tar.bz2"))
+ ".tar.xz"))
(sha256
(base32
- "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"))
- (patches
- (search-patches "xf86-video-voodoo-pcitag.patch"))))
+ "00pn5826aazsdipf7ny03s1lypzid31fmswl8y2hrgf07bq76ab2"))))
(build-system gnu-build-system)
(inputs (list xorgproto xorg-server))
(native-inputs (list pkg-config))