From 7db0cffa928906995136ca58c0b542c295fc0c26 Mon Sep 17 00:00:00 2001
From: prspkt <prspkt@protonmail.com>
Date: Sun, 22 Jul 2018 07:48:23 +0300
Subject: main/xf86-video-savage: rebuild against xorg-video-abi 24.0

Use https
---
 ...-check-for-max-HV-Value-to-ValidMode-hook.patch | 45 ++++++++++++++++++++++
 main/xf86-video-savage/APKBUILD                    | 11 +++---
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch

(limited to 'main/xf86-video-savage')

diff --git a/main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch b/main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch
new file mode 100644
index 0000000000..de93d6dc76
--- /dev/null
+++ b/main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch
@@ -0,0 +1,45 @@
+From 0ece556daa8a88771b669d8104396abd9166d2d0 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Mon, 25 Jun 2018 15:55:06 +0200
+Subject: [PATCH] Add check for max[HV]Value to ValidMode hook
+
+xorg-server 1.20 removed this check, so implement this in the driver
+itself.
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/savage_driver.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+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,
+-- 
+2.18.0
+
diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD
index dc5a3e0666..8389ff667d 100644
--- a/main/xf86-video-savage/APKBUILD
+++ b/main/xf86-video-savage/APKBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-savage
 pkgver=2.3.9
-pkgrel=2
+pkgrel=3
 pkgdesc="S3 Savage video driver"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
 makedepends="xorg-server-dev libxi-dev util-macros libdrm-dev mesa-dev
 	xorgproto"
-source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch
 	"
-
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
@@ -35,4 +35,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-sha512sums="35fe52651fe5799bbbc6e7b3608a655102547e8f8f2189288d3f5b477f819bfc56a9a8eef39813ca455e56076e4f7c36304480c3ccddbac6c794672828cf705a  xf86-video-savage-2.3.9.tar.bz2"
+sha512sums="35fe52651fe5799bbbc6e7b3608a655102547e8f8f2189288d3f5b477f819bfc56a9a8eef39813ca455e56076e4f7c36304480c3ccddbac6c794672828cf705a  xf86-video-savage-2.3.9.tar.bz2
+485112d65bf36be55eca607daf3f05f637b29826d3fb915f92158c3564f3033f40a6078be8626bd9ea7cef1cb6900fed054496d0f803a048fada905fb179235a  0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch"
-- 
cgit v1.2.3