[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Saturday, October 6, 2012 @ 16:08:09
Author: andyrtr
Revision: 168238
db-move: moved xf86-video-savage from [staging] to [testing] (i686, x86_64)
Added:
xf86-video-savage/repos/testing-i686/
xf86-video-savage/repos/testing-i686/PKGBUILD
(from rev 168199, xf86-video-savage/repos/staging-i686/PKGBUILD)
xf86-video-savage/repos/testing-x86_64/
xf86-video-savage/repos/testing-x86_64/PKGBUILD
(from rev 168199, xf86-video-savage/repos/staging-x86_64/PKGBUILD)
Deleted:
xf86-video-savage/repos/staging-i686/
xf86-video-savage/repos/staging-x86_64/
-+
testing-i686/PKGBUILD | 33 +
testing-x86_64/PKGBUILD | 33 +
2 files changed, 66 insertions(+)
Copied: xf86-video-savage/repos/testing-i686/PKGBUILD (from rev 168199,
xf86-video-savage/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-10-06 20:08:09 UTC (rev 168238)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.6
+pkgrel=2
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13'
'X-ABI-VIDEODRV_VERSION>=14')
+optdepends=('savage-dri: DRI1 support from community repo')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/${pkgname}*
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-savage/repos/testing-x86_64/PKGBUILD (from rev 168199,
xf86-video-savage/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-06 20:08:09 UTC (rev 168238)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.6
+pkgrel=2
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13'
'X-ABI-VIDEODRV_VERSION>=14')
+optdepends=('savage-dri: DRI1 support from community repo')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/${pkgname}*
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Saturday, October 13, 2012 @ 07:45:43
Author: andyrtr
Revision: 168586
db-move: moved xf86-video-savage from [testing] to [extra] (i686, x86_64)
Added:
xf86-video-savage/repos/extra-i686/PKGBUILD
(from rev 168549, xf86-video-savage/repos/testing-i686/PKGBUILD)
xf86-video-savage/repos/extra-x86_64/PKGBUILD
(from rev 168549, xf86-video-savage/repos/testing-x86_64/PKGBUILD)
Deleted:
xf86-video-savage/repos/extra-i686/PKGBUILD
xf86-video-savage/repos/extra-x86_64/PKGBUILD
xf86-video-savage/repos/testing-i686/
xf86-video-savage/repos/testing-x86_64/
---+
extra-i686/PKGBUILD | 66
extra-x86_64/PKGBUILD | 66
2 files changed, 66 insertions(+), 66 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-13 11:45:39 UTC (rev 168585)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:43 UTC (rev 168586)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=1
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
-optdepends=('savage-dri: DRI1 support from community repo')
-conflicts=('xorg-server<1.12.0')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- #cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${srcdir}/${pkgname}*
- make DESTDIR="${pkgdir}" install
-
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-savage/repos/extra-i686/PKGBUILD (from rev 168549,
xf86-video-savage/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:43 UTC (rev 168586)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.6
+pkgrel=2
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13'
'X-ABI-VIDEODRV_VERSION>=14')
+optdepends=('savage-dri: DRI1 support from community repo')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/${pkgname}*
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-10-13 11:45:39 UTC (rev 168585)
+++ extra-x86_64/PKGBUILD 2012-10-13 11:45:43 UTC (rev 168586)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=1
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
-optdepends=('savage-dri: DRI1 support from community repo')
-conflicts=('xorg-server<1.12.0')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- #cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${srcdir}/${pkgname}*
- make DESTDIR="${pkgdir}" install
-
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-savage/repos/extra-x86_64/PKGBUILD (from rev 168549,
xf86-video-savage/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-13 11:45:43 UTC (rev 168586)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.6
+pkgrel=2
+pkgdesc="X.org savag
[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Sunday, March 31, 2013 @ 10:09:15
Author: andyrtr
Revision: 181070
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-savage/repos/extra-i686/PKGBUILD
(from rev 181069, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/extra-i686/git_fixes.diff
(from rev 181069, xf86-video-savage/trunk/git_fixes.diff)
xf86-video-savage/repos/extra-x86_64/PKGBUILD
(from rev 181069, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/extra-x86_64/git_fixes.diff
(from rev 181069, xf86-video-savage/trunk/git_fixes.diff)
Deleted:
xf86-video-savage/repos/extra-i686/PKGBUILD
xf86-video-savage/repos/extra-x86_64/PKGBUILD
-+
/PKGBUILD | 72 ++
extra-i686/PKGBUILD | 33 ---
extra-i686/git_fixes.diff | 64 +
extra-x86_64/PKGBUILD | 33 ---
extra-x86_64/git_fixes.diff | 64 +
5 files changed, 200 insertions(+), 66 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-03-31 08:08:57 UTC (rev 181069)
+++ extra-i686/PKGBUILD 2013-03-31 08:09:15 UTC (rev 181070)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=3
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto'
'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14'
'X-ABI-VIDEODRV_VERSION>=15')
-optdepends=('savage-dri: DRI1 support from community repo')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- #cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${srcdir}/${pkgname}*
- make DESTDIR="${pkgdir}" install
-
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-savage/repos/extra-i686/PKGBUILD (from rev 181069,
xf86-video-savage/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-03-31 08:09:15 UTC (rev 181070)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.6
+pkgrel=4
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14'
'X-ABI-VIDEODRV_VERSION>=15')
+optdepends=('savage-dri: DRI1 support from community repo')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git_fixes.diff)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
+'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/git_fixes.diff
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/${pkgname}*
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-savage/repos/extra-i686/git_fixes.diff (from rev 181069,
xf86-video-savage/trunk/git_fixes.diff)
===
--- extra-i686/git_fixes.diff (rev 0)
+++ extra-i686/git_fixes.diff 2013-03-31 08:09:15 UTC (rev 181070)
@@ -0,0 +1,64 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie
+Date: Wed, 18 Jul 2012 08:52:38 +
+Subject: savage: move compat-api.h down to proper place.
+
+This screws up when DRI isn't enabled.
+
+Signed-off-by: Dave Airlie
+---
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index b604292..ec4b1ea 100644
+--- a/src/savage_driver.h
b/src/savage_driver.h
+@@ -85,8 +85,6 @@
+ #include "GL/glxint.h"
+ #include "xf86drm.h"
+
+-#include "compat-api.h"
+-
+ /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
+ * to 32 clients. */
+ #define SAVAGE_NUM_BUFFERS 32
+@@ -153,6 +151,8 @@ typedef struct _server{
+
+ #endif
+
++#include "compat-api.h"
++
+ typedef enum {
+ MT_NONE,
+ MT_CRT,
+--
+cgit v0.9.0.2-2-gbebe
+From ca9718a887ecbc59
[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Friday, May 8, 2015 @ 21:08:40
Author: andyrtr
Revision: 238730
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-savage/repos/extra-i686/PKGBUILD
(from rev 238729, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/extra-x86_64/PKGBUILD
(from rev 238729, xf86-video-savage/trunk/PKGBUILD)
Deleted:
xf86-video-savage/repos/extra-i686/PKGBUILD
xf86-video-savage/repos/extra-i686/git-fixes.patch
xf86-video-savage/repos/extra-x86_64/PKGBUILD
xf86-video-savage/repos/extra-x86_64/git-fixes.patch
--+
/PKGBUILD| 64 ++
extra-i686/PKGBUILD | 37 -
extra-i686/git-fixes.patch | 85 -
extra-x86_64/PKGBUILD| 37 -
extra-x86_64/git-fixes.patch | 85 -
5 files changed, 64 insertions(+), 244 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-05-08 19:08:30 UTC (rev 238729)
+++ extra-i686/PKGBUILD 2015-05-08 19:08:40 UTC (rev 238730)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-savage
-pkgver=2.3.7
-pkgrel=4
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19'
'X-ABI-VIDEODRV_VERSION>=20')
-optdepends=('savage-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.patch)
-sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba854a44'
-'06c113851952d21fac93f448337a446634ed64449d0646421a6425c75d45')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ../git-fixes.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-savage/repos/extra-i686/PKGBUILD (from rev 238729,
xf86-video-savage/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-08 19:08:40 UTC (rev 238730)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.8
+pkgrel=1
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19'
'X-ABI-VIDEODRV_VERSION>=20')
+optdepends=('savage-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63'
+'SKIP')
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C') # Julien Cristau
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/git-fixes.patch
===
--- extra-i686/git-fixes.patch 2015-05-08 19:08:30 UTC (rev 238729)
+++ extra-i686/git-fixes.patch 2015-05-08 19:08:40 UTC (rev 238730)
@@ -1,85 +0,0 @@
-From 2e9217bb88b76cebfcd2b65b76c8733f80da77ea Mon Sep 17 00:00:00 2001
-From: Jeremy White
-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
-Reviewed-by: Robert Morell
-
-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
-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
-
-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(
[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Thursday, February 5, 2015 @ 22:59:55
Author: lcarlier
Revision: 230871
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-savage/repos/staging-i686/
xf86-video-savage/repos/staging-i686/PKGBUILD
(from rev 230870, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/staging-i686/git-fixes.patch
(from rev 230870, xf86-video-savage/trunk/git-fixes.patch)
xf86-video-savage/repos/staging-x86_64/
xf86-video-savage/repos/staging-x86_64/PKGBUILD
(from rev 230870, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/staging-x86_64/git-fixes.patch
(from rev 230870, xf86-video-savage/trunk/git-fixes.patch)
+
staging-i686/PKGBUILD | 37
staging-i686/git-fixes.patch | 85 +++
staging-x86_64/PKGBUILD| 37
staging-x86_64/git-fixes.patch | 85 +++
4 files changed, 244 insertions(+)
Copied: xf86-video-savage/repos/staging-i686/PKGBUILD (from rev 230870,
xf86-video-savage/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-02-05 21:59:55 UTC (rev 230871)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.7
+pkgrel=4
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19'
'X-ABI-VIDEODRV_VERSION>=20')
+optdepends=('savage-dri: DRI1 support from community repo')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git-fixes.patch)
+sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba854a44'
+'06c113851952d21fac93f448337a446634ed64449d0646421a6425c75d45')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-savage/repos/staging-i686/git-fixes.patch (from rev 230870,
xf86-video-savage/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2015-02-05 21:59:55 UTC (rev 230871)
@@ -0,0 +1,85 @@
+From 2e9217bb88b76cebfcd2b65b76c8733f80da77ea Mon Sep 17 00:00:00 2001
+From: Jeremy White
+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
+Reviewed-by: Robert Morell
+
+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
+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
+
+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
+Date: Tue, 29 Jul 2014 09:15:26 -0400
+Subject: dri: Stop (uselessly) initializing the ValidateTree hooks
+
+Signed-off-by: Adam Jackson
+
+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->cor
[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Wednesday, September 25, 2013 @ 19:11:53
Author: andyrtr
Revision: 195146
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-savage/repos/extra-i686/PKGBUILD
(from rev 195145, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/extra-x86_64/PKGBUILD
(from rev 195145, xf86-video-savage/trunk/PKGBUILD)
Deleted:
xf86-video-savage/repos/extra-i686/PKGBUILD
xf86-video-savage/repos/extra-i686/git_fixes.diff
xf86-video-savage/repos/extra-x86_64/PKGBUILD
xf86-video-savage/repos/extra-x86_64/git_fixes.diff
-+
/PKGBUILD | 64 ++
extra-i686/PKGBUILD | 36 ---
extra-i686/git_fixes.diff | 64 --
extra-x86_64/PKGBUILD | 36 ---
extra-x86_64/git_fixes.diff | 64 --
5 files changed, 64 insertions(+), 200 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-09-25 17:11:33 UTC (rev 195145)
+++ extra-i686/PKGBUILD 2013-09-25 17:11:53 UTC (rev 195146)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=4
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto'
'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14'
'X-ABI-VIDEODRV_VERSION>=15')
-optdepends=('savage-dri: DRI1 support from community repo')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git_fixes.diff)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
-'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/git_fixes.diff
- ./configure --prefix=/usr
- make
-}
-
-package() {
- #cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${srcdir}/${pkgname}*
- make DESTDIR="${pkgdir}" install
-
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-savage/repos/extra-i686/PKGBUILD (from rev 195145,
xf86-video-savage/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-09-25 17:11:53 UTC (rev 195146)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.7
+pkgrel=1
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14'
'X-ABI-VIDEODRV_VERSION>=15')
+optdepends=('savage-dri: DRI1 support from community repo')
+options=(!libtool)
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba854a44')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/git_fixes.diff
===
--- extra-i686/git_fixes.diff 2013-09-25 17:11:33 UTC (rev 195145)
+++ extra-i686/git_fixes.diff 2013-09-25 17:11:53 UTC (rev 195146)
@@ -1,64 +0,0 @@
-From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie
-Date: Wed, 18 Jul 2012 08:52:38 +
-Subject: savage: move compat-api.h down to proper place.
-
-This screws up when DRI isn't enabled.
-
-Signed-off-by: Dave Airlie
-diff --git a/src/savage_driver.h b/src/savage_driver.h
-index b604292..ec4b1ea 100644
a/src/savage_driver.h
-+++ b/src/savage_driver.h
-@@ -85,8 +85,6 @@
- #include "GL/glxint.h"
- #include "xf86drm.h"
-
--#include "compat-api.h"
--
- /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
- * to 32 clients. */
- #define SAVAGE_NUM_BUFFERS 32
-@@ -153,6 +151,8 @@ typedef struct _server{
-
- #endif
-
-+#include "compat-api.h"
-+
- typedef enum {
- MT_NONE,
- MT_CRT,
---
-cgit v0.9.0.2-2-gbebe
-From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
-From: Dave Airlie
-Date: Sat, 22 Dec 2012 10:00:00 +
-Subject: savage: fix default accel arch when built with no XAA
-
-Signed-off-by: Dave Airlie
-diff --git a/src/sa
[arch-commits] Commit in xf86-video-savage/repos (6 files)
Date: Monday, November 21, 2016 @ 14:05:25
Author: lcarlier
Revision: 281742
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-savage/repos/staging-i686/
xf86-video-savage/repos/staging-i686/PKGBUILD
(from rev 281741, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/staging-i686/git-fixes.patch
(from rev 281741, xf86-video-savage/trunk/git-fixes.patch)
xf86-video-savage/repos/staging-x86_64/
xf86-video-savage/repos/staging-x86_64/PKGBUILD
(from rev 281741, xf86-video-savage/trunk/PKGBUILD)
xf86-video-savage/repos/staging-x86_64/git-fixes.patch
(from rev 281741, xf86-video-savage/trunk/git-fixes.patch)
+
staging-i686/PKGBUILD | 39 +
staging-i686/git-fixes.patch | 72 +++
staging-x86_64/PKGBUILD| 39 +
staging-x86_64/git-fixes.patch | 72 +++
4 files changed, 222 insertions(+)
Copied: xf86-video-savage/repos/staging-i686/PKGBUILD (from rev 281741,
xf86-video-savage/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-11-21 14:05:25 UTC (rev 281742)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=xf86-video-savage
+pkgver=2.3.8
+pkgrel=3
+pkgdesc="X.org savage video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/";
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23'
'X-ABI-VIDEODRV_VERSION>=24')
+optdepends=('savage-dri: DRI1 support from community repo')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+git-fixes.patch)
+sha256sums=('fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63'
+'SKIP'
+'72942e9b26cd6c9da745185778b89487a180871759f5d16f824ec1c307b31eb7')
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C') # Julien Cristau
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-savage/repos/staging-i686/git-fixes.patch (from rev 281741,
xf86-video-savage/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2016-11-21 14:05:25 UTC (rev 281742)
@@ -0,0 +1,72 @@
+From de61497415e58a21fa247faf6db180ca47fb5df0 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch
+Date: Wed, 27 Apr 2016 16:02:13 +0200
+Subject: [PATCH 1/2] Disable tiling on SuperSavage by default
+
+Xserver cannot be started with Tiling enabled on SuperSavage.
+https://bugzilla.opensuse.org/show_bug.cgi?id=805380
+
+Signed-off-by: Stefan Dirsch
+Acked-by: Hans de Goede
+---
+ src/savage_driver.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index d278345..58a294d 100644
+--- a/src/savage_driver.c
b/src/savage_driver.c
+@@ -1668,7 +1668,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+ #endif
+
+ /* we can use Option "DisableTile TRUE" to disable tile mode */
+-psav->bDisableTile = FALSE;
++if (psav->Chipset == S3_SUPERSAVAGE)
++/* apparently broken with these GPUs, see
https://bugzilla.opensuse.org/show_bug.cgi?id=805380 */
++ psav->bDisableTile = TRUE;
++else
++ psav->bDisableTile = FALSE;
+ if (xf86GetOptValBool(psav->Options,
OPTION_DISABLE_TILE,&psav->bDisableTile)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+"Option: %s Tile Mode and Program it
\n",(psav->bDisableTile?"Disable":"Enable"));
+--
+2.10.2
+
+
+From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001
+From: Adam Jackson
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: [PATCH 2/2] Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson
+---
+ src/compat-api.h | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 98ba435..44daea4 100644
+--- a/src/compat-api.h
b/src/compat-api.h
+@@ -78,11 +78,19 @@
+
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARG
