summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <[email protected]>2024-12-28 18:48:49 +0800
committer宋文武 <[email protected]>2025-01-31 16:39:26 +0800
commit92412b6ffe637e0423153e14f72324ae5b4141d3 (patch)
treed8808bd15640bca053f879b4ce0881461c9f09ed
parent78a7d14663e8628dc897465ba21c90a8deb01549 (diff)
gnu: xf86-video-savage: Update to 2.4.1.
* gnu/packages/xorg.scm (xf86-video-savage): Update to 2.4.1. * gnu/packages/patches/xf86-video-savage-xorg-compat.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I186c93badb813aa0fc4a3d558ff8a084c6c652af
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/xf86-video-savage-xorg-compat.patch33
-rw-r--r--gnu/packages/xorg.scm7
3 files changed, 3 insertions, 38 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 9ececcbc01..a62d681c58 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2400,7 +2400,6 @@ dist_patch_DATA = \
%D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\
%D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
%D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \
- %D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
%D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch \
%D%/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch \
diff --git a/gnu/packages/patches/xf86-video-savage-xorg-compat.patch b/gnu/packages/patches/xf86-video-savage-xorg-compat.patch
deleted file mode 100644
index 9524032676..0000000000
--- a/gnu/packages/patches/xf86-video-savage-xorg-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix build against xorg-server >= 1.20.
-
-Patch taken from upstream:
-https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=0ece556daa8a88771b669d8104396abd9166d2d0
-
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 58a294d..3cda923 100644
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -2034,8 +2034,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n",
- mclk / 1000.0);
-
-- pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */
-- pScrn->maxVValue = 2048; /* 11 bits of v_total */
- pScrn->virtualX = pScrn->display->virtualX;
- pScrn->virtualY = pScrn->display->virtualY;
-
-@@ -3637,6 +3635,14 @@ static ModeStatus SavageValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode,
- (pMode->VDisplay > psav->PanelY)))
- return MODE_PANEL;
-
-+ /* 11 bits of h_total 8-pixel units */
-+ if (pMode->HTotal > (2048 << 3))
-+ return MODE_BAD_HVALUE;
-+
-+ /* 11 bits of v_total */
-+ if (pMode->VTotal > 2048)
-+ return MODE_BAD_VVALUE;
-+
- if (psav->UseBIOS) {
- refresh = SavageGetRefresh(pMode);
- return (SavageMatchBiosMode(pScrn,pMode->HDisplay,
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 61d8b303c6..ce2e5024ad 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3234,18 +3234,17 @@ This driver is intended for ATI Rage 128 based cards.")
(define-public xf86-video-savage
(package
(name "xf86-video-savage")
- (version "2.3.9")
+ (version "2.4.1")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/driver/xf86-video-savage-"
version
- ".tar.bz2"))
- (patches (search-patches "xf86-video-savage-xorg-compat.patch"))
+ ".tar.xz"))
(sha256
(base32
- "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"))))
+ "1bqhgldb6yahpgav7g7cyc4kl5pm3mgkq8w2qncj36311hb92hb7"))))
(build-system gnu-build-system)
(inputs (list mesa xorgproto xorg-server))
(native-inputs (list pkg-config))