From 59475c73370c37becae97edfb8eb2fe4d56ef87f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 23 Jul 2012 00:01:51 +0000
Subject: Mon Jul 23 00:01:51 UTC 2012

---
 extra/xf86-video-chips/PKGBUILD | 15 +++++------
 extra/xf86-video-chips/iopl.h   | 60 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 extra/xf86-video-chips/iopl.h

(limited to 'extra/xf86-video-chips')

diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD
index aea1d769a..90b34de81 100644
--- a/extra/xf86-video-chips/PKGBUILD
+++ b/extra/xf86-video-chips/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153327 2012-03-12 20:53:18Z andyrtr $
+# $Id: PKGBUILD 163841 2012-07-21 10:59:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-chips
-pkgver=1.2.4
-pkgrel=4
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,14 +14,13 @@ makedepends=('xorg-server-devel>=1.11.99.902')
 conflicts=('xorg-server<1.11.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        chips-1.2.4-git.patch)
-sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4'
-          'b13ff000e3f6f06c1a7fd55e9e0ad6078f1b4e5b')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
+sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
+            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/chips-1.2.4-git.patch
+  cp ${srcdir}/iopl.h util/
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-chips/iopl.h b/extra/xf86-video-chips/iopl.h
new file mode 100644
index 000000000..e08207c7f
--- /dev/null
+++ b/extra/xf86-video-chips/iopl.h
@@ -0,0 +1,60 @@
+#ifdef __NetBSD__
+#  include <sys/types.h>
+#  include <machine/pio.h>
+#  include <machine/sysarch.h>
+#else
+#  if defined(__linux__)
+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
+ * #    include <sys/io.h>
+ */
+int iopl(int level);
+#  endif
+#  if defined(SVR4) && defined(i386)
+#    include <sys/types.h>
+#    ifdef NCR
+       /* broken NCR <sys/sysi86.h> */
+#      define __STDC
+#      include <sys/sysi86.h>
+#      undef __STDC
+#    else
+#      include <sys/sysi86.h>
+#    endif
+#    ifdef SVR4
+#      if !defined(sun)
+#        include <sys/seg.h>
+#      endif
+#    endif
+#    include <sys/v86.h>
+#    if defined(sun)
+#      include <sys/psw.h>
+#    endif
+#  endif
+#  include "AsmMacros.h"
+#endif /* NetBSD */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef __NetBSD__
+#  define SET_IOPL() i386_iopl(3)
+#  define RESET_IOPL() i386_iopl(0)
+#else
+#  if defined(SVR4) && defined(i386)
+#    ifndef SI86IOPL
+#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+#    else
+#      define SET_IOPL() sysi86(SI86IOPL,3)
+#      define RESET_IOPL() sysi86(SI86IOPL,0)
+#    endif
+#  else
+#    ifdef linux
+#      define SET_IOPL() iopl(3)
+#      define RESET_IOPL() iopl(0)
+#    else
+#      define SET_IOPL() (void)0
+#      define RESET_IOPL() (void)0
+#    endif
+#  endif
+#endif
-- 
cgit v1.2.3-54-g00ecf