diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/xf86-video-savage-xorg-compat.patch | 33 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 7 |
2 files changed, 3 insertions, 37 deletions
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)) |