[arch-commits] Commit in xf86-video-s3/repos (6 files)

[Laurent Carlier]

    Date: Friday, July 18, 2014 @ 13:32:55
  Author: lcarlier
Revision: 217137

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-s3/repos/staging-i686/
  xf86-video-s3/repos/staging-i686/PKGBUILD
    (from rev 217135, xf86-video-s3/trunk/PKGBUILD)
  xf86-video-s3/repos/staging-i686/build-fix.diff
    (from rev 217135, xf86-video-s3/trunk/build-fix.diff)
  xf86-video-s3/repos/staging-x86_64/
  xf86-video-s3/repos/staging-x86_64/PKGBUILD
    (from rev 217135, xf86-video-s3/trunk/PKGBUILD)
  xf86-video-s3/repos/staging-x86_64/build-fix.diff
    (from rev 217135, xf86-video-s3/trunk/build-fix.diff)

-------------------------------+
 staging-i686/PKGBUILD         |   35 +++++++++++++++++++++++++++++++++++
 staging-i686/build-fix.diff   |   10 ++++++++++
 staging-x86_64/PKGBUILD       |   35 +++++++++++++++++++++++++++++++++++
 staging-x86_64/build-fix.diff |   10 ++++++++++
 4 files changed, 90 insertions(+)

Copied: xf86-video-s3/repos/staging-i686/PKGBUILD (from rev 217135, xf86-video-s3/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-07-18 11:32:55 UTC (rev 217137)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-s3
+pkgver=0.6.5
+pkgrel=5
+pkgdesc="X.org S3 video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
+            'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/build-fix.diff
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-s3/repos/staging-i686/build-fix.diff (from rev 217135, xf86-video-s3/trunk/build-fix.diff)
===================================================================
--- staging-i686/build-fix.diff	                        (rev 0)
+++ staging-i686/build-fix.diff	2014-07-18 11:32:55 UTC (rev 217137)
@@ -0,0 +1,10 @@
+--- xf86-video-s3-0.6.5/src/s3_driver.c	2012-07-17 06:50:05.000000000 +0200
++++ xf86-video-s3-0.6.5/src/s3_driver.c.new	2013-03-09 17:01:39.639220318 +0100
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"

Copied: xf86-video-s3/repos/staging-x86_64/PKGBUILD (from rev 217135, xf86-video-s3/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-07-18 11:32:55 UTC (rev 217137)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-s3
+pkgver=0.6.5
+pkgrel=5
+pkgdesc="X.org S3 video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
+            'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/build-fix.diff
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-s3/repos/staging-x86_64/build-fix.diff (from rev 217135, xf86-video-s3/trunk/build-fix.diff)
===================================================================
--- staging-x86_64/build-fix.diff	                        (rev 0)
+++ staging-x86_64/build-fix.diff	2014-07-18 11:32:55 UTC (rev 217137)
@@ -0,0 +1,10 @@
+--- xf86-video-s3-0.6.5/src/s3_driver.c	2012-07-17 06:50:05.000000000 +0200
++++ xf86-video-s3-0.6.5/src/s3_driver.c.new	2013-03-09 17:01:39.639220318 +0100
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"