me
/
guix
Archived
1
0
Fork 0

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.
Efraim Flashner 2023-01-31 11:26:18 +02:00
parent a3b57e57e6
commit 2e09ab0d35
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
3 changed files with 4 additions and 41 deletions

View File

@ -2011,7 +2011,6 @@ dist_patch_DATA = \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.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-settings-defaults.patch \
%D%/packages/patches/xgboost-use-system-dmlc-core.patch \

View File

@ -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

View File

@ -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))