[arch-commits] Commit in xf86-video-savage/repos (6 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Wed Sep 25 17:11:53 UTC 2013
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 <jgc at archlinux.org>
-
-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 <jgc at archlinux.org>
+
+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=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44')
+
+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 <airlied at gmail.com>
-Date: Wed, 18 Jul 2012 08:52:38 +0000
-Subject: savage: move compat-api.h down to proper place.
-
-This screws up when DRI isn't enabled.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
----
-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 <airlied at gmail.com>
-Date: Sat, 22 Dec 2012 10:00:00 +0000
-Subject: savage: fix default accel arch when built with no XAA
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
----
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 026bf5c..5b49e60 100644
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_DEFAULT;
- char *strptr;
- if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
-+#ifdef HAVE_XAA_H
- if(!xf86NameCmp(strptr,"XAA")) {
- from = X_CONFIG;
- psav->useEXA = FALSE;
-@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_CONFIG;
- psav->useEXA = TRUE;
- }
-+#else
-+ psav->useEXA = TRUE;
-+#endif
- }
- xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
- psav->useEXA ? "EXA" : "XAA");
---
-cgit v0.9.0.2-2-gbebe
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-09-25 17:11:33 UTC (rev 195145)
+++ extra-x86_64/PKGBUILD 2013-09-25 17:11:53 UTC (rev 195146)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-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-x86_64/PKGBUILD (from rev 195145, xf86-video-savage/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-09-25 17:11:53 UTC (rev 195146)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+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=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44')
+
+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-x86_64/git_fixes.diff
===================================================================
--- extra-x86_64/git_fixes.diff 2013-09-25 17:11:33 UTC (rev 195145)
+++ extra-x86_64/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 <airlied at gmail.com>
-Date: Wed, 18 Jul 2012 08:52:38 +0000
-Subject: savage: move compat-api.h down to proper place.
-
-This screws up when DRI isn't enabled.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
----
-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 <airlied at gmail.com>
-Date: Sat, 22 Dec 2012 10:00:00 +0000
-Subject: savage: fix default accel arch when built with no XAA
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
----
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 026bf5c..5b49e60 100644
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_DEFAULT;
- char *strptr;
- if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
-+#ifdef HAVE_XAA_H
- if(!xf86NameCmp(strptr,"XAA")) {
- from = X_CONFIG;
- psav->useEXA = FALSE;
-@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_CONFIG;
- psav->useEXA = TRUE;
- }
-+#else
-+ psav->useEXA = TRUE;
-+#endif
- }
- xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
- psav->useEXA ? "EXA" : "XAA");
---
-cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list