[arch-commits] Commit in xf86-video-i128/repos (4 files)

2012-10-06 Thread andyrtr
Date: Saturday, October 6, 2012 @ 03:57:38
  Author: andyrtr
Revision: 168130

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-i128/repos/staging-i686/
  xf86-video-i128/repos/staging-i686/PKGBUILD
(from rev 168129, xf86-video-i128/trunk/PKGBUILD)
  xf86-video-i128/repos/staging-x86_64/
  xf86-video-i128/repos/staging-x86_64/PKGBUILD
(from rev 168129, xf86-video-i128/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   30 ++
 staging-x86_64/PKGBUILD |   30 ++
 2 files changed, 60 insertions(+)

Copied: xf86-video-i128/repos/staging-i686/PKGBUILD (from rev 168129, 
xf86-video-i128/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-06 07:57:38 UTC (rev 168130)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.6
+pkgrel=2
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${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-i128/repos/staging-x86_64/PKGBUILD (from rev 168129, 
xf86-video-i128/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-06 07:57:38 UTC (rev 168130)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.6
+pkgrel=2
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13' 
'X-ABI-VIDEODRV_VERSION=14')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-i128/repos (4 files)

2012-07-17 Thread andyrtr
Date: Tuesday, July 17, 2012 @ 12:23:32
  Author: andyrtr
Revision: 163645

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-i128/repos/extra-i686/PKGBUILD
(from rev 163644, xf86-video-i128/trunk/PKGBUILD)
  xf86-video-i128/repos/extra-x86_64/PKGBUILD
(from rev 163644, xf86-video-i128/trunk/PKGBUILD)
Deleted:
  xf86-video-i128/repos/extra-i686/PKGBUILD
  xf86-video-i128/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   60 
 extra-x86_64/PKGBUILD |   60 
 2 files changed, 60 insertions(+), 60 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-07-17 16:22:54 UTC (rev 163644)
+++ extra-i686/PKGBUILD 2012-07-17 16:23:32 UTC (rev 163645)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer:Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-i128
-pkgver=1.3.5
-pkgrel=1
-pkgdesc=X.org Number 9 I128 video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.12.0')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${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-i128/repos/extra-i686/PKGBUILD (from rev 163644, 
xf86-video-i128/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-17 16:23:32 UTC (rev 163645)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.6
+pkgrel=1
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.12.0')
+conflicts=('xorg-server1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-07-17 16:22:54 UTC (rev 163644)
+++ extra-x86_64/PKGBUILD   2012-07-17 16:23:32 UTC (rev 163645)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer:Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-i128
-pkgver=1.3.5
-pkgrel=1
-pkgdesc=X.org Number 9 I128 video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.12.0')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${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-i128/repos/extra-x86_64/PKGBUILD (from rev 163644, 
xf86-video-i128/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-07-17 16:23:32 UTC (rev 163645)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.6
+pkgrel=1
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.12.0')
+conflicts=('xorg-server1.12.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d 

[arch-commits] Commit in xf86-video-i128/repos (4 files)

2012-03-12 Thread andyrtr
Date: Monday, March 12, 2012 @ 16:53:30
  Author: andyrtr
Revision: 153337

db-move: moved xf86-video-i128 from [testing] to [extra] (i686)

Added:
  xf86-video-i128/repos/extra-i686/PKGBUILD
(from rev 153285, xf86-video-i128/repos/testing-i686/PKGBUILD)
  xf86-video-i128/repos/extra-i686/i128-1.3.4-git.patch
(from rev 153285, xf86-video-i128/repos/testing-i686/i128-1.3.4-git.patch)
Deleted:
  xf86-video-i128/repos/extra-i686/PKGBUILD
  xf86-video-i128/repos/testing-i686/

--+
 PKGBUILD |   59 +---
 i128-1.3.4-git.patch |  173 +
 2 files changed, 206 insertions(+), 26 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-12 20:53:29 UTC (rev 153336)
+++ extra-i686/PKGBUILD 2012-03-12 20:53:30 UTC (rev 153337)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer:Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-i128
-pkgver=1.3.4
-pkgrel=4
-pkgdesc=X.org Number 9 I128 video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.10.99.902')
-conflicts=('xorg-server1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-i128/repos/extra-i686/PKGBUILD (from rev 153285, 
xf86-video-i128/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-12 20:53:30 UTC (rev 153337)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.4
+pkgrel=5
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+i128-1.3.4-git.patch)
+sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775'
+  'c282f9de94ef7225f03034c9c07f40f46bd44bdc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${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-i128/repos/extra-i686/i128-1.3.4-git.patch (from rev 153285, 
xf86-video-i128/repos/testing-i686/i128-1.3.4-git.patch)
===
--- extra-i686/i128-1.3.4-git.patch (rev 0)
+++ extra-i686/i128-1.3.4-git.patch 2012-03-12 20:53:30 UTC (rev 153337)
@@ -0,0 +1,173 @@
+diff --git a/man/i128.man b/man/i128.man
+index 920d2ab..a8e2e54 100644
+--- a/man/i128.man
 b/man/i128.man
+@@ -1,4 +1,3 @@
+-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 
2001/01/27 18:20:48 dawes Exp $ 
+ .\ shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH I128 __drivermansuffix__ __vendorversion__
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 903a3a8..92f9d58 100644
+--- a/src/i128_driver.c
 b/src/i128_driver.c
+@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
+   numDevSections, drv, usedChips);
+ 
+ /* Free it since we don't need that list after this */
+-xfree(devSections);
++free(devSections);
+ 
+ if (numUsed = 0)
+   return FALSE;
+ 
+ if (flags  PROBE_DETECT) {
+-  xfree(usedChips);
++  free(usedChips);
+   return FALSE;
+ }
+ 
+@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
+   foundScreen = TRUE;
+ }
+ 
+-xfree(usedChips);
++free(usedChips);
+ 
+ return foundScreen;
+ }
+@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ int i;
+ ClockRangePtr clockRanges;
+ MessageType from;
+-IOADDRESS iobase;
++unsigned long iobase;
+ char *ramdac = NULL;
+ CARD32 tmpl, tmph, tmp;
+ unsigned char n, m, p, mdc, df;
+@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ xf86CollectOptions(pScrn, NULL);
+ 
+ /* Process the options */
+-if (!(pI128-Options = xalloc(sizeof(I128Options
++if (!(pI128-Options = malloc(sizeof(I128Options
+   return FALSE;
+ memcpy(pI128-Options, I128Options, 

[arch-commits] Commit in xf86-video-i128/repos (4 files)

2012-03-12 Thread andyrtr
Date: Monday, March 12, 2012 @ 16:53:31
  Author: andyrtr
Revision: 153338

db-move: moved xf86-video-i128 from [testing] to [extra] (x86_64)

Added:
  xf86-video-i128/repos/extra-x86_64/PKGBUILD
(from rev 153285, xf86-video-i128/repos/testing-x86_64/PKGBUILD)
  xf86-video-i128/repos/extra-x86_64/i128-1.3.4-git.patch
(from rev 153285, xf86-video-i128/repos/testing-x86_64/i128-1.3.4-git.patch)
Deleted:
  xf86-video-i128/repos/extra-x86_64/PKGBUILD
  xf86-video-i128/repos/testing-x86_64/

--+
 PKGBUILD |   59 +---
 i128-1.3.4-git.patch |  173 +
 2 files changed, 206 insertions(+), 26 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-03-12 20:53:30 UTC (rev 153337)
+++ extra-x86_64/PKGBUILD   2012-03-12 20:53:31 UTC (rev 153338)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer:Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-i128
-pkgver=1.3.4
-pkgrel=4
-pkgdesc=X.org Number 9 I128 video driver
-arch=(i686 x86_64)
-url=http://xorg.freedesktop.org/;
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel=1.10.99.902')
-conflicts=('xorg-server1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-i128/repos/extra-x86_64/PKGBUILD (from rev 153285, 
xf86-video-i128/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-03-12 20:53:31 UTC (rev 153338)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.4
+pkgrel=5
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+i128-1.3.4-git.patch)
+sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775'
+  'c282f9de94ef7225f03034c9c07f40f46bd44bdc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${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-i128/repos/extra-x86_64/i128-1.3.4-git.patch (from rev 
153285, xf86-video-i128/repos/testing-x86_64/i128-1.3.4-git.patch)
===
--- extra-x86_64/i128-1.3.4-git.patch   (rev 0)
+++ extra-x86_64/i128-1.3.4-git.patch   2012-03-12 20:53:31 UTC (rev 153338)
@@ -0,0 +1,173 @@
+diff --git a/man/i128.man b/man/i128.man
+index 920d2ab..a8e2e54 100644
+--- a/man/i128.man
 b/man/i128.man
+@@ -1,4 +1,3 @@
+-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 
2001/01/27 18:20:48 dawes Exp $ 
+ .\ shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH I128 __drivermansuffix__ __vendorversion__
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 903a3a8..92f9d58 100644
+--- a/src/i128_driver.c
 b/src/i128_driver.c
+@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
+   numDevSections, drv, usedChips);
+ 
+ /* Free it since we don't need that list after this */
+-xfree(devSections);
++free(devSections);
+ 
+ if (numUsed = 0)
+   return FALSE;
+ 
+ if (flags  PROBE_DETECT) {
+-  xfree(usedChips);
++  free(usedChips);
+   return FALSE;
+ }
+ 
+@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
+   foundScreen = TRUE;
+ }
+ 
+-xfree(usedChips);
++free(usedChips);
+ 
+ return foundScreen;
+ }
+@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ int i;
+ ClockRangePtr clockRanges;
+ MessageType from;
+-IOADDRESS iobase;
++unsigned long iobase;
+ char *ramdac = NULL;
+ CARD32 tmpl, tmph, tmp;
+ unsigned char n, m, p, mdc, df;
+@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ xf86CollectOptions(pScrn, NULL);
+ 
+ /* Process the options */
+-if (!(pI128-Options = xalloc(sizeof(I128Options
++if (!(pI128-Options = malloc(sizeof(I128Options
+   return FALSE;

[arch-commits] Commit in xf86-video-i128/repos (4 files)

2012-02-12 Thread andyrtr
Date: Sunday, February 12, 2012 @ 04:45:02
  Author: andyrtr
Revision: 150040

db-move: moved xf86-video-i128 from [staging] to [testing] (i686)

Added:
  xf86-video-i128/repos/testing-i686/
  xf86-video-i128/repos/testing-i686/PKGBUILD
(from rev 149988, xf86-video-i128/repos/staging-i686/PKGBUILD)
  xf86-video-i128/repos/testing-i686/i128-1.3.4-git.patch
(from rev 149988, xf86-video-i128/repos/staging-i686/i128-1.3.4-git.patch)
Deleted:
  xf86-video-i128/repos/staging-i686/

--+
 PKGBUILD |   33 +
 i128-1.3.4-git.patch |  173 +
 2 files changed, 206 insertions(+)

Copied: xf86-video-i128/repos/testing-i686/PKGBUILD (from rev 149988, 
xf86-video-i128/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-02-12 09:45:02 UTC (rev 150040)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.4
+pkgrel=5
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+i128-1.3.4-git.patch)
+sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775'
+  'c282f9de94ef7225f03034c9c07f40f46bd44bdc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${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-i128/repos/testing-i686/i128-1.3.4-git.patch (from rev 
149988, xf86-video-i128/repos/staging-i686/i128-1.3.4-git.patch)
===
--- testing-i686/i128-1.3.4-git.patch   (rev 0)
+++ testing-i686/i128-1.3.4-git.patch   2012-02-12 09:45:02 UTC (rev 150040)
@@ -0,0 +1,173 @@
+diff --git a/man/i128.man b/man/i128.man
+index 920d2ab..a8e2e54 100644
+--- a/man/i128.man
 b/man/i128.man
+@@ -1,4 +1,3 @@
+-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 
2001/01/27 18:20:48 dawes Exp $ 
+ .\ shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH I128 __drivermansuffix__ __vendorversion__
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 903a3a8..92f9d58 100644
+--- a/src/i128_driver.c
 b/src/i128_driver.c
+@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
+   numDevSections, drv, usedChips);
+ 
+ /* Free it since we don't need that list after this */
+-xfree(devSections);
++free(devSections);
+ 
+ if (numUsed = 0)
+   return FALSE;
+ 
+ if (flags  PROBE_DETECT) {
+-  xfree(usedChips);
++  free(usedChips);
+   return FALSE;
+ }
+ 
+@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
+   foundScreen = TRUE;
+ }
+ 
+-xfree(usedChips);
++free(usedChips);
+ 
+ return foundScreen;
+ }
+@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ int i;
+ ClockRangePtr clockRanges;
+ MessageType from;
+-IOADDRESS iobase;
++unsigned long iobase;
+ char *ramdac = NULL;
+ CARD32 tmpl, tmph, tmp;
+ unsigned char n, m, p, mdc, df;
+@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ xf86CollectOptions(pScrn, NULL);
+ 
+ /* Process the options */
+-if (!(pI128-Options = xalloc(sizeof(I128Options
++if (!(pI128-Options = malloc(sizeof(I128Options
+   return FALSE;
+ memcpy(pI128-Options, I128Options, sizeof(I128Options));
+ xf86ProcessOptions(pScrn-scrnIndex, pScrn-options, pI128-Options);
+@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ xf86DrvMsg(pScrn-scrnIndex, from, Subsystem Vendor: \%x\\n,
+   PCI_SUB_VENDOR_ID(pI128-PciInfo));
+ 
+-iobase = (PCI_REGION_BASE(pI128-PciInfo, 5, REGION_IO)  0xFF00) + 
hwp-PIOOffset;
++iobase = (PCI_REGION_BASE(pI128-PciInfo, 5, REGION_IO)  0xFF00);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION)  12
++iobase += hwp-PIOOffset;
++#endif
+ pI128-RegRec.iobase = iobase;
+ 
+ pI128-io.rbase_g = inl(iobase) 0xFF00;
+@@ -1157,7 +1160,7 @@ I128FreeRec(ScrnInfoPtr pScrn)
+ {
+ if (pScrn-driverPrivate == NULL)
+   return;
+-xfree(pScrn-driverPrivate);
++free(pScrn-driverPrivate);
+ pScrn-driverPrivate = NULL;
+ }
+ 
+@@ -1704,12 +1707,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen)
+   XAADestroyInfoRec(pI128-XaaInfoRec);
+ if (pI128-ExaDriver) {
+ 

[arch-commits] Commit in xf86-video-i128/repos (4 files)

2012-02-12 Thread andyrtr
Date: Sunday, February 12, 2012 @ 04:45:03
  Author: andyrtr
Revision: 150041

db-move: moved xf86-video-i128 from [staging] to [testing] (x86_64)

Added:
  xf86-video-i128/repos/testing-x86_64/
  xf86-video-i128/repos/testing-x86_64/PKGBUILD
(from rev 149988, xf86-video-i128/repos/staging-x86_64/PKGBUILD)
  xf86-video-i128/repos/testing-x86_64/i128-1.3.4-git.patch
(from rev 149988, xf86-video-i128/repos/staging-x86_64/i128-1.3.4-git.patch)
Deleted:
  xf86-video-i128/repos/staging-x86_64/

--+
 PKGBUILD |   33 +
 i128-1.3.4-git.patch |  173 +
 2 files changed, 206 insertions(+)

Copied: xf86-video-i128/repos/testing-x86_64/PKGBUILD (from rev 149988, 
xf86-video-i128/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-02-12 09:45:03 UTC (rev 150041)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-i128
+pkgver=1.3.4
+pkgrel=5
+pkgdesc=X.org Number 9 I128 video driver
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+i128-1.3.4-git.patch)
+sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775'
+  'c282f9de94ef7225f03034c9c07f40f46bd44bdc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${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-i128/repos/testing-x86_64/i128-1.3.4-git.patch (from rev 
149988, xf86-video-i128/repos/staging-x86_64/i128-1.3.4-git.patch)
===
--- testing-x86_64/i128-1.3.4-git.patch (rev 0)
+++ testing-x86_64/i128-1.3.4-git.patch 2012-02-12 09:45:03 UTC (rev 150041)
@@ -0,0 +1,173 @@
+diff --git a/man/i128.man b/man/i128.man
+index 920d2ab..a8e2e54 100644
+--- a/man/i128.man
 b/man/i128.man
+@@ -1,4 +1,3 @@
+-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 
2001/01/27 18:20:48 dawes Exp $ 
+ .\ shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH I128 __drivermansuffix__ __vendorversion__
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 903a3a8..92f9d58 100644
+--- a/src/i128_driver.c
 b/src/i128_driver.c
+@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
+   numDevSections, drv, usedChips);
+ 
+ /* Free it since we don't need that list after this */
+-xfree(devSections);
++free(devSections);
+ 
+ if (numUsed = 0)
+   return FALSE;
+ 
+ if (flags  PROBE_DETECT) {
+-  xfree(usedChips);
++  free(usedChips);
+   return FALSE;
+ }
+ 
+@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
+   foundScreen = TRUE;
+ }
+ 
+-xfree(usedChips);
++free(usedChips);
+ 
+ return foundScreen;
+ }
+@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ int i;
+ ClockRangePtr clockRanges;
+ MessageType from;
+-IOADDRESS iobase;
++unsigned long iobase;
+ char *ramdac = NULL;
+ CARD32 tmpl, tmph, tmp;
+ unsigned char n, m, p, mdc, df;
+@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ xf86CollectOptions(pScrn, NULL);
+ 
+ /* Process the options */
+-if (!(pI128-Options = xalloc(sizeof(I128Options
++if (!(pI128-Options = malloc(sizeof(I128Options
+   return FALSE;
+ memcpy(pI128-Options, I128Options, sizeof(I128Options));
+ xf86ProcessOptions(pScrn-scrnIndex, pScrn-options, pI128-Options);
+@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
+ xf86DrvMsg(pScrn-scrnIndex, from, Subsystem Vendor: \%x\\n,
+   PCI_SUB_VENDOR_ID(pI128-PciInfo));
+ 
+-iobase = (PCI_REGION_BASE(pI128-PciInfo, 5, REGION_IO)  0xFF00) + 
hwp-PIOOffset;
++iobase = (PCI_REGION_BASE(pI128-PciInfo, 5, REGION_IO)  0xFF00);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION)  12
++iobase += hwp-PIOOffset;
++#endif
+ pI128-RegRec.iobase = iobase;
+ 
+ pI128-io.rbase_g = inl(iobase) 0xFF00;
+@@ -1157,7 +1160,7 @@ I128FreeRec(ScrnInfoPtr pScrn)
+ {
+ if (pScrn-driverPrivate == NULL)
+   return;
+-xfree(pScrn-driverPrivate);
++free(pScrn-driverPrivate);
+ pScrn-driverPrivate = NULL;
+ }
+ 
+@@ -1704,12 +1707,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen)
+   XAADestroyInfoRec(pI128-XaaInfoRec);
+ if