[arch-commits] Commit in xf86-video-geode/trunk (PKGBUILD geode-2.11.14-ftbfs.patch)

[Andreas Radke]

    Date: Saturday, December 28, 2013 @ 14:48:44
  Author: andyrtr
Revision: 202830

upgpkg: xf86-video-geode 2.11.15-2

rebuild for new Xorg-server 1.15

Added:
  xf86-video-geode/trunk/geode-2.11.14-ftbfs.patch
Modified:
  xf86-video-geode/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   18 +++++++++++-------
 geode-2.11.14-ftbfs.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-28 13:44:46 UTC (rev 202829)
+++ PKGBUILD	2013-12-28 13:48:44 UTC (rev 202830)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-geode
 pkgver=2.11.15
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org AMD/Geode LX & NX video driver"
 # there is no 64bit geode
 arch=(i686)
@@ -11,23 +11,27 @@
 license=('custom')
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 options=('!libtool')
 conflicts=('xf86-video-amd')
 replaces=('xf86-video-amd')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        geode-2.11.14-ftbfs.patch)
+sha256sums=('00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0'
+            'c444ab1615808fe8016668f41555bf2c1e3c9d326ea48056433ad67de5b1880a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+  # fix build with Xorg 1.15 - taken from FC
+  patch -Np1 -i ${srcdir}/geode-2.11.14-ftbfs.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"

Added: geode-2.11.14-ftbfs.patch
===================================================================
--- geode-2.11.14-ftbfs.patch	                        (rev 0)
+++ geode-2.11.14-ftbfs.patch	2013-12-28 13:48:44 UTC (rev 202830)
@@ -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>
+ 
+