[arch-commits] Commit in xf86-video-geode/repos (3 files)

[Laurent Carlier]

    Date: Friday, July 18, 2014 @ 12:31:47
  Author: lcarlier
Revision: 217024

archrelease: copy trunk to staging-i686

Added:
  xf86-video-geode/repos/staging-i686/
  xf86-video-geode/repos/staging-i686/PKGBUILD
    (from rev 217023, xf86-video-geode/trunk/PKGBUILD)
  xf86-video-geode/repos/staging-i686/geode-2.11.14-ftbfs.patch
    (from rev 217023, xf86-video-geode/trunk/geode-2.11.14-ftbfs.patch)

---------------------------+
 PKGBUILD                  |   43 +++++++++++++++++++++++++++++++++++++++++++
 geode-2.11.14-ftbfs.patch |   12 ++++++++++++
 2 files changed, 55 insertions(+)

Copied: xf86-video-geode/repos/staging-i686/PKGBUILD (from rev 217023, xf86-video-geode/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-07-18 10:31:47 UTC (rev 217024)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-geode
+pkgver=2.11.15
+pkgrel=3
+pkgdesc="X.org AMD/Geode LX & NX video driver"
+# there is no 64bit geode
+arch=(i686)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+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')
+options=('!libtool')
+conflicts=('xf86-video-amd')
+replaces=('xf86-video-amd')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        geode-2.11.14-ftbfs.patch)
+sha256sums=('00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0'
+            'c444ab1615808fe8016668f41555bf2c1e3c9d326ea48056433ad67de5b1880a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix build with Xorg 1.15 - taken from FC
+  patch -Np1 -i ${srcdir}/geode-2.11.14-ftbfs.patch
+}
+
+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-geode/repos/staging-i686/geode-2.11.14-ftbfs.patch (from rev 217023, xf86-video-geode/trunk/geode-2.11.14-ftbfs.patch)
===================================================================
--- staging-i686/geode-2.11.14-ftbfs.patch	                        (rev 0)
+++ staging-i686/geode-2.11.14-ftbfs.patch	2014-07-18 10:31:47 UTC (rev 217024)
@@ -0,0 +1,12 @@
+diff -up xf86-video-geode-2.11.14/src/geode_dcon.c.jx xf86-video-geode-2.11.14/src/geode_dcon.c
+--- xf86-video-geode-2.11.14/src/geode_dcon.c.jx	2012-11-24 05:01:15.000000000 -0500
++++ xf86-video-geode-2.11.14/src/geode_dcon.c	2013-10-25 16:19:35.950234174 -0400
+@@ -29,6 +29,7 @@
+ 
+ /* Includes that are used by all drivers */
+ #include <xf86.h>
++#include <xf86Modes.h>
+ #include <xf86_OSproc.h>
+ #include <compiler.h>
+ 
+