[arch-commits] Commit in xf86-video-unichrome/trunk (3 files)

[Jan de Groot]

    Date: Sunday, May 9, 2010 @ 10:20:58
  Author: jgc
Revision: 79919

upgpkg: xf86-video-unichrome 0.2.7-3
Update to latest git snapshot, build against xorg-server 1.8

Added:
  xf86-video-unichrome/trunk/drm-include.patch
Modified:
  xf86-video-unichrome/trunk/PKGBUILD
Deleted:
  xf86-video-unichrome/trunk/fix-defines.patch

-------------------+
 PKGBUILD          |   20 +++++++++------
 drm-include.patch |   11 ++++++++
 fix-defines.patch |   68 ----------------------------------------------------
 3 files changed, 23 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-09 13:47:06 UTC (rev 79918)
+++ PKGBUILD	2010-05-09 14:20:58 UTC (rev 79919)
@@ -2,24 +2,28 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-unichrome
 pkgver=0.2.7
-pkgrel=2
-_gitversion=7f250dd7e4174411b4b8c1b645b3e0b62c0183d3
+pkgrel=3
+_gitversion=cd12cce88ff886031c23c743569fba97eccace4e
 pkgdesc="Unichrome video drivers for X.Org"
 arch=(i686 x86_64)
 url="http://unichrome.sf.net/"
 license=('custom')
-depends=('unichrome-dri>=7.6')
-makedepends=('pkgconfig' 'xorg-server>=1.7.1' 'xorg-util-macros' 'xf86driproto' 'glproto' 'mesa>=7.6' 'autoconf' 'automake' 'libtool')
+depends=('unichrome-dri>=7.8.1')
+makedepends=('pkgconfig' 'xorg-server>=1.8.0' 'xorg-util-macros' 'xf86driproto' 'glproto' 'mesa>=7.8.1' 'autoconf' 'automake' 'libtool')
 options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.7.0')
-source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2 LICENSE)
+conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.8.0')
+source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2
+        drm-include.patch
+        LICENSE)
+md5sums=('c64332e6c386ed9a580116e131f288f4'
+         '4a9bf2e3ef338c170a2f58988ebb97dc'
+         '6ea7d64c87c5c32201a1e38e3336e44a')
 
 build() {
   cd "${srcdir}/${pkgname}-${_gitversion}"
+  patch -Np0 -i "${srcdir}/drm-include.patch" || return 1
   ./autogen.sh --prefix=/usr --enable-dri || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }
-md5sums=('c5c77d7ceaac6f0fea7bd5189c53a0c7'
-         '6ea7d64c87c5c32201a1e38e3336e44a')

Added: drm-include.patch
===================================================================
--- drm-include.patch	                        (rev 0)
+++ drm-include.patch	2010-05-09 14:20:58 UTC (rev 79919)
@@ -0,0 +1,11 @@
+--- src/via_memory.h.orig	2010-05-09 16:17:00.143352805 +0200
++++ src/via_memory.h	2010-05-09 16:17:14.433351301 +0200
+@@ -30,7 +30,7 @@
+ 
+ /* don't include local via_drm.h when using modular */
+ #ifdef HAVE_CONFIG_H
+-#include "drm/via_drm.h"
++#include <via_drm.h>
+ #else
+ #include "via_drm.h"
+ #endif

Deleted: fix-defines.patch
===================================================================
--- fix-defines.patch	2010-05-09 13:47:06 UTC (rev 79918)
+++ fix-defines.patch	2010-05-09 14:20:58 UTC (rev 79919)
@@ -1,68 +0,0 @@
-From: Luc Verhaegen <libv at skynet.be>
-Date: Wed, 6 Dec 2006 23:16:01 +0000 (+0100)
-Subject: Fix build issues due to hard uint32_t and Bool #defines.
-X-Git-Url: http://gitweb.freedesktop.org/?p=users/libv/xf86-video-unichrome.git;a=commitdiff;h=13c214345787a3340f230e77b7770b7c2d115c85
-
-Fix build issues due to hard uint32_t and Bool #defines.
-
-Ported from xf86-video_via, which was by Matthias Hopf.
----
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
- 
- # Checks for header files.
- AC_HEADER_STDC
-+AC_CHECK_HEADERS([inttypes.h])
- 
- if test "$DRI" != no; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
---- a/src/via_dri.h
-+++ b/src/via_dri.h
-@@ -35,7 +35,7 @@
- #define VIA_DRIDDX_VERSION_MINOR  0
- #define VIA_DRIDDX_VERSION_PATCH  0
- 
--#ifndef XFree86Server
-+#if !defined(XFree86Server) && !defined(_XTYPEDEF_BOOL)
- typedef int Bool;
- #endif
- 
---- a/src/via_drmclient.h
-+++ b/src/via_drmclient.h
-@@ -27,7 +27,13 @@
- #include "drm.h"
- #include "xf86drm.h"
- 
--typedef CARD32 uint32_t;
-+#ifdef HAVE_INTTYPES_H
-+#    include <inttypes.h>
-+#else
-+#    ifndef uint32_t
-+#        define uint32_t CARD32
-+#    endif
-+#endif
- 
- #ifdef X_NEED_DRMLOCK
- #define drm_hw_lock_t drmLock
---- a/src/via_video.c
-+++ b/src/via_video.c
-@@ -367,7 +367,7 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMe
-     if (error) {
-         xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: DMA copy sheduling failed: %d.\n",
-                    __FUNCTION__, error);
--        xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08lX\n",
-+        xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08X\n",
-                    __func__, blit.mem_addr, blit.fb_addr);
-         if (new_buf)
-             xfree(new_buf);
-@@ -391,7 +391,7 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMe
-     if (error) {
-         xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: DMA copy sync failed: %d - %d\n",
-                    __FUNCTION__, error, -EAGAIN);
--        xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08lX\n",
-+        xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08X\n",
-                    __func__, blit.mem_addr, blit.fb_addr);
-         return FALSE;
-     }