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

[Andreas Radke]

    Date: Saturday, December 28, 2013 @ 14:22:57
  Author: andyrtr
Revision: 202815

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

Added:
  xf86-video-apm/repos/staging-i686/
  xf86-video-apm/repos/staging-i686/PKGBUILD
    (from rev 202814, xf86-video-apm/trunk/PKGBUILD)
  xf86-video-apm/repos/staging-i686/git-fix.diff
    (from rev 202814, xf86-video-apm/trunk/git-fix.diff)
  xf86-video-apm/repos/staging-x86_64/
  xf86-video-apm/repos/staging-x86_64/PKGBUILD
    (from rev 202814, xf86-video-apm/trunk/PKGBUILD)
  xf86-video-apm/repos/staging-x86_64/git-fix.diff
    (from rev 202814, xf86-video-apm/trunk/git-fix.diff)

-----------------------------+
 staging-i686/PKGBUILD       |   31 +++++++++++++++++++++++++++++++
 staging-i686/git-fix.diff   |   23 +++++++++++++++++++++++
 staging-x86_64/PKGBUILD     |   31 +++++++++++++++++++++++++++++++
 staging-x86_64/git-fix.diff |   23 +++++++++++++++++++++++
 4 files changed, 108 insertions(+)

Copied: xf86-video-apm/repos/staging-i686/PKGBUILD (from rev 202814, xf86-video-apm/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-12-28 13:22:57 UTC (rev 202815)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.5
+pkgrel=4
+pkgdesc="X.org Alliance ProMotion video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
+            'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fix.diff
+  ./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-apm/repos/staging-i686/git-fix.diff (from rev 202814, xf86-video-apm/trunk/git-fix.diff)
===================================================================
--- staging-i686/git-fix.diff	                        (rev 0)
+++ staging-i686/git-fix.diff	2013-12-28 13:22:57 UTC (rev 202815)
@@ -0,0 +1,23 @@
+From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 10 Jan 2013 03:03:29 +0000
+Subject: Remove #include "mibstore.h"
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-apm/repos/staging-x86_64/PKGBUILD (from rev 202814, xf86-video-apm/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-12-28 13:22:57 UTC (rev 202815)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.5
+pkgrel=4
+pkgdesc="X.org Alliance ProMotion video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
+            'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fix.diff
+  ./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-apm/repos/staging-x86_64/git-fix.diff (from rev 202814, xf86-video-apm/trunk/git-fix.diff)
===================================================================
--- staging-x86_64/git-fix.diff	                        (rev 0)
+++ staging-x86_64/git-fix.diff	2013-12-28 13:22:57 UTC (rev 202815)
@@ -0,0 +1,23 @@
+From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Thu, 10 Jan 2013 03:03:29 +0000
+Subject: Remove #include "mibstore.h"
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe