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

[Laurent Carlier]

    Date: Friday, July 18, 2014 @ 15:18:28
  Author: lcarlier
Revision: 217417

archrelease: copy trunk to staging-i686

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-18 13:18:18 UTC (rev 217416)
+++ PKGBUILD	2014-07-18 13:18:28 UTC (rev 217417)
@@ -1,43 +0,0 @@
-# $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/PKGBUILD (from rev 217416, xf86-video-geode/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-07-18 13:18:28 UTC (rev 217417)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-geode
+pkgver=2.11.16
+pkgrel=1
+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)
+sha256sums=('38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7')
+
+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}/"
+}

Deleted: geode-2.11.14-ftbfs.patch
===================================================================
--- geode-2.11.14-ftbfs.patch	2014-07-18 13:18:18 UTC (rev 217416)
+++ geode-2.11.14-ftbfs.patch	2014-07-18 13:18:28 UTC (rev 217417)
@@ -1,12 +0,0 @@
-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>
- 
-