Commit 37e3432e authored by Natanael Copa's avatar Natanael Copa
Browse files

main/xf86-video-savage: upgrade to 2.3.8

parent e4358175
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-savage
pkgver=2.3.7
pkgrel=3
pkgver=2.3.8
pkgrel=0
pkgdesc="S3 Savage video driver"
url="http://xorg.freedesktop.org/"
arch="all"
......@@ -13,14 +13,12 @@ makedepends="xorg-server-dev libxi-dev fontsproto randrproto
"
source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
git-fixes.patch
"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......@@ -45,9 +43,6 @@ package() {
rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
md5sums="e813271ab43cc6a95ac0ab252b90a885 xf86-video-savage-2.3.7.tar.bz2
30b4d374a09c31eba99355771e9386c1 git-fixes.patch"
sha256sums="041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44 xf86-video-savage-2.3.7.tar.bz2
06c113851952d21fac93f448337a446634ed644400009d0646421a6425c75d45 git-fixes.patch"
sha512sums="0db5a7f3387ebd2287e757dc1aaf8fab4f23be633456779da1ba90f58411362d3a8dcd3366c0aa7d7eb47ea943d771aed29b8b926a0c66af0effac346a55e3c6 xf86-video-savage-2.3.7.tar.bz2
d4699d58f9c1b6cdb4a25f0562819e4fa17c4b0b1bfa56bec9cb32a20a23b4f3db7eee58fa7967b8bb8b344610af15d8affe28dd6dcc691462fcf96b949d95b7 git-fixes.patch"
md5sums="b29672072aacd5ea0d569235e9e25ae1 xf86-video-savage-2.3.8.tar.bz2"
sha256sums="fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63 xf86-video-savage-2.3.8.tar.bz2"
sha512sums="c0a8eb58bde2d3f28dbf4f1e2a6e6e8eb019d3e61cf40bab56a586d614cf3d2a09c0ac43962ae25becfa9489f0ba36a4dd1010b6f181ffe77d10fe0bb10f3127 xf86-video-savage-2.3.8.tar.bz2"
From 2e9217bb88b76cebfcd2b65b76c8733f80da77ea Mon Sep 17 00:00:00 2001
From: Jeremy White <jwhite@codeweavers.com>
Date: Thu, 21 Mar 2013 10:59:13 -0500
Subject: Include xf86Modes.h to use functions from
hw/xfree86/modes/xf86Modes.c.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
diff --git a/src/savage_driver.h b/src/savage_driver.h
index ec4b1ea..de042af 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -54,6 +54,7 @@
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
+#include "xf86Modes.h"
#include "xf86Pci.h"
#include "xf86_OSproc.h"
#include "xf86Cursor.h"
--
cgit v0.10.2
From 16a672d1ba183601d513c4cdca32b47e926a6d1e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 21 May 2014 14:11:46 -0400
Subject: Use own thunk function instead of vgaHW*Weak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/savage_driver.c b/src/savage_driver.c
index bca2c60..e82794f 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
return ((unsigned int) (tmp & 0x08));
}
+static void
+SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
static Bool
SavageDDC1(ScrnInfoPtr pScrn)
{
@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
InI2CREG(byte,psav->I2CPort);
OutI2CREG(byte | 0x12,psav->I2CPort);
- pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
+ pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
+ SavageDDC1Read);
if (!pMon)
return FALSE;
--
cgit v0.10.2
From d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 29 Jul 2014 09:15:26 -0400
Subject: dri: Stop (uselessly) initializing the ValidateTree hooks
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/savage_dri.c b/src/savage_dri.c
index bdb78e4..0842821 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
- pDRIInfo->wrap.ValidateTree = NULL;
- pDRIInfo->wrap.PostValidateTree = NULL;
-
pDRIInfo->createDummyCtx = TRUE;
pDRIInfo->createDummyCtxPriv = FALSE;
--
cgit v0.10.2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment