[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2016-11-21 Thread Laurent Carlier 
Date: Monday, November 21, 2016 @ 18:32:20
  Author: lcarlier
Revision: 281777

upgpkg: xf86-video-neomagic 1.2.9-3

xorg-server-1.19 rebuild

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-21 18:02:42 UTC (rev 281776)
+++ PKGBUILD2016-11-21 18:32:20 UTC (rev 281777)
@@ -3,15 +3,15 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.9
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/;
+url="https://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
-groups=('xorg-drivers' 'xorg')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2'
 'SKIP')

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2015-11-11 Thread Andreas Radke 
Date: Wednesday, November 11, 2015 @ 10:26:16
  Author: andyrtr
Revision: 250701

upgpkg: xf86-video-neomagic 1.2.9-2

Xorg 1.18 rebuild

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-11 09:25:08 UTC (rev 250700)
+++ PKGBUILD2015-11-11 09:26:16 UTC (rev 250701)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 
'X-ABI-VIDEODRV_VERSION>=20')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2'

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD git-fixes.patch)

2015-05-08 Thread Andreas Radke 
Date: Friday, May 8, 2015 @ 21:05:10
  Author: andyrtr
Revision: 238725

upgpkg: xf86-video-neomagic 1.2.9-1

upstream update 1.2.9

Modified:
  xf86-video-neomagic/trunk/PKGBUILD
Deleted:
  xf86-video-neomagic/trunk/git-fixes.patch

-+
 PKGBUILD|   19 +++---
 git-fixes.patch |   99 --
 2 files changed, 6 insertions(+), 112 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 19:00:35 UTC (rev 238724)
+++ PKGBUILD2015-05-08 19:05:10 UTC (rev 238725)
@@ -2,8 +2,8 @@
 #Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xf86-video-neomagic
-pkgver=1.2.8
-pkgrel=4
+pkgver=1.2.9
+pkgrel=1
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -12,19 +12,13 @@
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
 conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'X-ABI-VIDEODRV_VERSION=20')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
-sha256sums=('50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874'
-'f63912b98a8a4bad30125fd95900651141f9367f7897c88548a83abe70633511')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha256sums=('72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2'
+'SKIP')
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C') # Julien Cristau 
julien.cris...@ens-lyon.org
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../git-fixes.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
-
   ./configure --prefix=/usr
   make
 }
@@ -31,7 +25,6 @@
 
 package() {
   cd ${pkgname}-${pkgver}
-
   make DESTDIR=${pkgdir} install
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/

Deleted: git-fixes.patch
===
--- git-fixes.patch 2015-05-08 19:00:35 UTC (rev 238724)
+++ git-fixes.patch 2015-05-08 19:05:10 UTC (rev 238725)
@@ -1,99 +0,0 @@
-From 74a9a343f6e156d24539b81f1224b7410acf0e38 Mon Sep 17 00:00:00 2001
-From: Adam Jackson a...@redhat.com
-Date: Wed, 21 May 2014 14:07:53 -0400
-Subject: Use own thunk functions instead of vgaHW*Weak
-
-I plan to remove the Weak functions from a future server
-
-Signed-off-by: Adam Jackson a...@redhat.com
-
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index 7e60f3e..1b0da34 100644
 a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -1439,6 +1439,12 @@ NEOShadowInit(ScreenPtr pScreen)
-   return TRUE;
- }
- 
-+static Bool
-+NEOSaveScreen(ScreenPtr pScreen, int mode)
-+{
-+return vgaHWSaveScreen(pScreen, mode);
-+}
-+
- /* Mandatory */
- static Bool
- NEOScreenInit(SCREEN_INIT_ARGS_DECL)
-@@ -1712,7 +1718,7 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
- 
- NEOInitVideo(pScreen);
- 
--pScreen-SaveScreen = vgaHWSaveScreenWeak();
-+pScreen-SaveScreen = NEOSaveScreen;
- 
- /* Setup DPMS mode */
- if (nPtr-NeoChipset != NM2070)
-@@ -3049,6 +3055,12 @@ neo_ddc1Read(ScrnInfoPtr pScrn)
- return (tmp);
- }
- 
-+static void
-+neo_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
-+{
-+vgaHWddc1SetSpeed(pScrn, speed);
-+}
-+
- static xf86MonPtr
- neo_ddc1(ScrnInfoPtr pScrn)
- {
-@@ -3063,7 +3075,7 @@ neo_ddc1(ScrnInfoPtr pScrn)
- VGAwCR(0x21,0x00);
- VGAwCR(0x1D,0x01);  /* some Voodoo */ 
- VGAwGR(0xA1,0x2F);
--ret =  
xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),neo_ddc1Read);
-+ret =  
xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),neo_ddc1SetSpeed,neo_ddc1Read);
- /* undo initialization */
- VGAwCR(0x21,reg1);
- VGAwCR(0x1D,reg2);
--- 
-cgit v0.10.2
-From 6661bdd4551e4e63e983685464a277845aed3012 Mon Sep 17 00:00:00 2001
-From: Dave Airlie airl...@gmail.com
-Date: Sun, 21 Sep 2014 09:51:37 +1000
-Subject: neomagic: fix build against master X server.
-
-Signed-off-by: Dave Airlie airl...@redhat.com
-
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index 1b0da34..da01962 100644
 a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
- }
- #endif
- } else
-+#ifdef VIDMEM_MMIO
- nPtr-NeoMMIOBase =
- xf86MapVidMem(pScrn-scrnIndex,
-   VIDMEM_MMIO, nPtr-NeoMMIOAddr,
-   0x20L);
-+#endif
- if (nPtr-NeoMMIOBase == NULL)
- return FALSE;
- }
-@@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
- }
- #endif
- else
-+#ifdef VIDMEM_FRAMEBUFFER
- nPtr-NeoFbBase =
- xf86MapVidMem(pScrn-scrnIndex, VIDMEM_FRAMEBUFFER,
-   (unsigned long)nPtr-NeoLinearAddr,
-   nPtr-NeoFbMapSize);
-+#endif
- if (nPtr-NeoFbBase == NULL)
-

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2014-07-18 Thread Laurent Carlier 
Date: Friday, July 18, 2014 @ 13:11:08
  Author: lcarlier
Revision: 217039

upgpkg: xf86-video-neomagic 1.2.8-3

xorg-server 1.16 rebuild

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-18 11:07:58 UTC (rev 217038)
+++ PKGBUILD2014-07-18 11:11:08 UTC (rev 217039)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
-conflicts=('xorg-server1.15.0' 'X-ABI-VIDEODRV_VERSION15' 
'X-ABI-VIDEODRV_VERSION=16')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION18' 
'X-ABI-VIDEODRV_VERSION=19')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874')

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2013-12-28 Thread Andreas Radke 
Date: Saturday, December 28, 2013 @ 15:19:29
  Author: andyrtr
Revision: 202847

upgpkg: xf86-video-neomagic 1.2.8-2

rebuild for new Xorg-server 1.15

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-28 14:18:00 UTC (rev 202846)
+++ PKGBUILD2013-12-28 14:19:29 UTC (rev 202847)
@@ -3,20 +3,20 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 
'scrnsaverproto')
-conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server1.15.0' 'X-ABI-VIDEODRV_VERSION15' 
'X-ABI-VIDEODRV_VERSION=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr
   make
@@ -23,7 +23,7 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR=${pkgdir} install
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2013-08-17 Thread Laurent Carlier 
Date: Saturday, August 17, 2013 @ 16:06:00
  Author: lcarlier
Revision: 193166

upgpkg: xf86-video-neomagic 1.2.8-1

Upstream update 1.2.8

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-17 10:49:42 UTC (rev 193165)
+++ PKGBUILD2013-08-17 14:06:00 UTC (rev 193166)
@@ -2,8 +2,8 @@
 #Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xf86-video-neomagic
-pkgver=1.2.7
-pkgrel=5
+pkgver=1.2.8
+pkgrel=1
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -13,25 +13,19 @@
 conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git-fixes.patch
-shadowfb.patch)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
-'38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e'
-'cf7e49f51869efdb22ee8d6e85bf0f557e22f08072e6d90a4dba3e39feabbf36')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git-fixes.patch
-  # workaround to get it work again https://bugs.archlinux.org/task/32604
-  patch -Np1 -i ${srcdir}/shadowfb.patch
-  autoreconf
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
   make DESTDIR=${pkgdir} install
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2013-03-09 Thread Andreas Radke 
Date: Saturday, March 9, 2013 @ 16:26:45
  Author: andyrtr
Revision: 179726

upgpkg: xf86-video-neomagic 1.2.7-5

rebuild for new X-ABI-VIDEODRV_VERSION=14

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 13:29:20 UTC (rev 179725)
+++ PKGBUILD2013-03-09 15:26:45 UTC (rev 179726)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org neomagic 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD shadowfb.patch)

2012-12-28 Thread andyrtr 
Date: Friday, December 28, 2012 @ 13:53:09
  Author: andyrtr
Revision: 173942

upgpkg: xf86-video-neomagic 1.2.7-4

add patch to get the driver working - FS#32604

Added:
  xf86-video-neomagic/trunk/shadowfb.patch
Modified:
  xf86-video-neomagic/trunk/PKGBUILD

+
 PKGBUILD   |   10 +++---
 shadowfb.patch |   18 ++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-28 13:12:00 UTC (rev 173941)
+++ PKGBUILD2012-12-28 18:53:09 UTC (rev 173942)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -14,13 +14,17 @@
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git-fixes.patch)
+git-fixes.patch
+shadowfb.patch)
 sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
-'38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e')
+'38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e'
+'cf7e49f51869efdb22ee8d6e85bf0f557e22f08072e6d90a4dba3e39feabbf36')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fixes.patch
+  # workaround to get it work again https://bugs.archlinux.org/task/32604
+  patch -Np1 -i ${srcdir}/shadowfb.patch
   autoreconf
   ./configure --prefix=/usr
   make

Added: shadowfb.patch
===
--- shadowfb.patch  (rev 0)
+++ shadowfb.patch  2012-12-28 18:53:09 UTC (rev 173942)
@@ -0,0 +1,18 @@
+diff -ur xf86-video-neomagic-1.2.7.orig/src/neo_driver.c 
xf86-video-neomagic-1.2.7/src/neo_driver.c
+--- xf86-video-neomagic-1.2.7.orig/src/neo_driver.c2012-12-26 
22:14:47.876393607 -0800
 xf86-video-neomagic-1.2.7/src/neo_driver.c 2012-12-26 22:17:10.011933399 
-0800
+@@ -1084,9 +1084,13 @@
+   xf86DrvMsg(pScrn-scrnIndex,X_CONFIG,
+  Show chache for debugging\n);
+ 
++/*
++ * Seems modules shadow and/or shadowfb causes black screen and dead
++ * keyboard with xorg 1.13. Just disable it for now.
++ */
+ if (!xf86LoadSubModule(pScrn, xaa)) {
+   xf86DrvMsg(pScrn-scrnIndex, X_INFO, Falling back to shadow\n);
+-  nPtr-shadowFB = 1;
++  nPtr-shadowFB = 0;
+ }
+ 
+ if (nPtr-shadowFB) {

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD git-fixes.patch)

2012-10-23 Thread Jan de Groot 
Date: Tuesday, October 23, 2012 @ 06:08:30
  Author: jgc
Revision: 169531

upgpkg: xf86-video-neomagic 1.2.7-3

Update to current git snapshot to fix issues with xorg-server 1.13

Added:
  xf86-video-neomagic/trunk/git-fixes.patch
Modified:
  xf86-video-neomagic/trunk/PKGBUILD

-+
 PKGBUILD|   12 ++-
 git-fixes.patch |  167 ++
 2 files changed, 175 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-23 07:37:59 UTC (rev 169530)
+++ PKGBUILD2012-10-23 10:08:30 UTC (rev 169531)
@@ -3,21 +3,25 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')
+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=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
+'38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  autoreconf
   ./configure --prefix=/usr
   make
 }

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2012-10-23 10:08:30 UTC (rev 169531)
@@ -0,0 +1,167 @@
+diff --git a/configure.ac b/configure.ac
+index 29cf772..a6eafa3 100644
+--- a/configure.ac
 b/configure.ac
+@@ -24,7 +24,7 @@
+ AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+ [1.2.7],
+-[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
++
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorgcomponent=Driver/Neomagic],
+ [xf86-video-neomagic])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+@@ -53,14 +53,6 @@ AC_ARG_WITH(xorg-module-dir,
+ [moduledir=$withval],
+ [moduledir=$libdir/xorg/modules])
+ 
+-
+-# Store the list of server defined optional extensions in REQUIRED_MODULES
+-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+-XORG_DRIVER_CHECK_EXT(XV, videoproto)
+-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+-XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+-
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901 xproto fontsproto 
$REQUIRED_MODULES])
+ 
+diff --git a/src/neo.h b/src/neo.h
+index 6aecc33..6812e7a 100644
+--- a/src/neo.h
 b/src/neo.h
+@@ -320,3 +320,14 @@ typedef struct {
+ #define PROBED_NM2097 0x83
+ #define PROBED_NM2160 0x44
+ #define PROBED_NM2200 0x45
++
++#define PCI_VENDOR_NEOMAGIC   0x10C8
++#define PCI_CHIP_NM2070   0x0001
++#define PCI_CHIP_NM2090   0x0002
++#define PCI_CHIP_NM2093   0x0003
++#define PCI_CHIP_NM2097   0x0083
++#define PCI_CHIP_NM2160   0x0004
++#define PCI_CHIP_NM2200   0x0005
++#define PCI_CHIP_NM2230   0x0025
++#define PCI_CHIP_NM2360   0x0006
++#define PCI_CHIP_NM2380   0x0016
+diff --git a/src/neo_2090.c b/src/neo_2090.c
+index 5049ab4..2f1efc8 100644
+--- a/src/neo_2090.c
 b/src/neo_2090.c
+@@ -42,7 +42,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include xf86.h
+ #include xf86_OSproc.h
+ #include compiler.h
+-#include xf86PciInfo.h
+ 
+ /* Drivers that use XAA need this */
+ #include xf86fbman.h
+diff --git a/src/neo_dga.c b/src/neo_dga.c
+index b6346c5..c5d60d5 100644
+--- a/src/neo_dga.c
 b/src/neo_dga.c
+@@ -29,7 +29,6 @@
+ #include xf86.h
+ #include xf86_OSproc.h
+ #include xf86Pci.h
+-#include xf86PciInfo.h
+ #include neo.h
+ #include neo_reg.h
+ #include dgaproc.h
+@@ -38,10 +37,10 @@
+ static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+   int *, int *, int *);
+ static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
+-static void NEO_Sync(ScrnInfoPtr);
+ static int  NEO_GetViewport(ScrnInfoPtr);
+ static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
+ #ifdef HAVE_XAA_H
++static void NEO_Sync(ScrnInfoPtr);
+ static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+ static void

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2012-10-06 Thread andyrtr 
Date: Saturday, October 6, 2012 @ 12:28:17
  Author: andyrtr
Revision: 168157

upgpkg: xf86-video-neomagic 1.2.7-2

rebuild for new Xorg-server; depend on the server ABI; fix makedeps

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-06 16:24:12 UTC (rev 168156)
+++ PKGBUILD2012-10-06 16:28:17 UTC (rev 168157)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel=1.12.0' 'xf86dgaproto')
-conflicts=('xorg-server1.12.0')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 
'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)

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

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

upgpkg: xf86-video-neomagic 1.2.7-1

upstream update 1.2.7

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-17 16:31:39 UTC (rev 163651)
+++ PKGBUILD2012-07-17 16:32:54 UTC (rev 163652)
@@ -2,7 +2,7 @@
 #Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xf86-video-neomagic
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=1
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b19ed2a33e8d9a3e2bfc1ae3e8ff49031b7d34dec786e4a5e060e68e48649888')
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD git-fixes.diff)

2012-03-24 Thread Jan de Groot 
Date: Saturday, March 24, 2012 @ 06:24:40
  Author: jgc
Revision: 154212

upgpkg: xf86-video-neomagic 1.2.6-1

Update to 1.2.6

Modified:
  xf86-video-neomagic/trunk/PKGBUILD
Deleted:
  xf86-video-neomagic/trunk/git-fixes.diff

+
 PKGBUILD   |   15 -
 git-fixes.diff |  616 ---
 2 files changed, 6 insertions(+), 625 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-24 10:24:07 UTC (rev 154211)
+++ PKGBUILD2012-03-24 10:24:40 UTC (rev 154212)
@@ -2,25 +2,22 @@
 #Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xf86-video-neomagic
-pkgver=1.2.5
-pkgrel=7
+pkgver=1.2.6
+pkgrel=1
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server1.11.99.903')
+makedepends=('xorg-server-devel=1.12.0' 'xf86dgaproto')
+conflicts=('xorg-server1.12.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git-fixes.diff)
-sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3'
-  '09a8b2d1b1bd1a2d8bfe7b03ba19947f4461e4b4')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('b19ed2a33e8d9a3e2bfc1ae3e8ff49031b7d34dec786e4a5e060e68e48649888')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git-fixes.diff
   ./configure --prefix=/usr
   make
 }

Deleted: git-fixes.diff
===
--- git-fixes.diff  2012-03-24 10:24:07 UTC (rev 154211)
+++ git-fixes.diff  2012-03-24 10:24:40 UTC (rev 154212)
@@ -1,616 +0,0 @@
-From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon mems...@videotron.ca
-Date: Tue, 20 Jul 2010 20:15:29 +
-Subject: config: upgrade to util-macros 1.8 for additional man page support
-
-Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
-The value of MAN_SUBST is the same for all X.Org packages.

-diff --git a/configure.ac b/configure.ac
-index 38cba3a..a80955b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by 
XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--  [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+  [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
- # Checks for programs.
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
 a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--  -e 's|__vendorversion__|$(XORGRELSTRING) $(XORGMANNAME)|' \
--  -e 's|__xorgversion__|$(XORGRELSTRING) $(XORGMANNAME)|' \
--  -e 's|__xservername__|Xorg|g' \
--  -e 's|__xconfigfile__|xorg.conf|g' \
--  -e 's|__projectroot__|$(prefix)|g' \
--  -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--  -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--  -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--  -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--  -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--  sed $(MAN_SUBSTS)  $  $@
-+  $(AM_V_GEN)$(SED) $(MAN_SUBSTS)  $  $@
---
-cgit v0.9.0.2-2-gbebe
-From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon mems...@videotron.ca
-Date: Tue, 20 Jul 2010 22:45:19 +
-Subject: config: update AC_PREREQ statement to 2.60
-
-Unrelated to the previous patches, the new value simply reflects
-the reality that the minimum level for autoconf to configure
-all x.org modules is 2.60 dated June 2006.
-
-ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
-
-Signed-off-by: Gaetan Nadon mems...@videotron.ca

-diff --git a/configure.ac b/configure.ac
-index a80955b..1c7ff1a 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
- 1.2.5,
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
---
-cgit v0.9.0.2-2-gbebe
-From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD git-fixes.diff)

2012-03-19 Thread andyrtr 
Date: Monday, March 19, 2012 @ 15:43:57
  Author: andyrtr
Revision: 153829

upgpkg: xf86-video-neomagic 1.2.5-7

update to latest git commits

Added:
  xf86-video-neomagic/trunk/git-fixes.diff
Modified:
  xf86-video-neomagic/trunk/PKGBUILD

+
 PKGBUILD   |9 
 git-fixes.diff |  616 +++
 2 files changed, 622 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-19 19:41:02 UTC (rev 153828)
+++ PKGBUILD2012-03-19 19:43:57 UTC (rev 153829)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=6
+pkgrel=7
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -13,11 +13,14 @@
 conflicts=('xorg-server1.11.99.903')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.diff)
+sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3'
+  '09a8b2d1b1bd1a2d8bfe7b03ba19947f4461e4b4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.diff
   ./configure --prefix=/usr
   make
 }

Added: git-fixes.diff
===
--- git-fixes.diff  (rev 0)
+++ git-fixes.diff  2012-03-19 19:43:57 UTC (rev 153829)
@@ -0,0 +1,616 @@
+From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon mems...@videotron.ca
+Date: Tue, 20 Jul 2010 20:15:29 +
+Subject: config: upgrade to util-macros 1.8 for additional man page support
+
+Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+The value of MAN_SUBST is the same for all X.Org packages.
+---
+diff --git a/configure.ac b/configure.ac
+index 38cba3a..a80955b 100644
+--- a/configure.ac
 b/configure.ac
+@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by 
XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-  [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++  [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+ # Checks for programs.
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 8f2454b..b3688ce 100644
+--- a/man/Makefile.am
 b/man/Makefile.am
+@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+-
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
+-
+-MAN_SUBSTS = \
+-  -e 's|__vendorversion__|$(XORGRELSTRING) $(XORGMANNAME)|' \
+-  -e 's|__xorgversion__|$(XORGRELSTRING) $(XORGMANNAME)|' \
+-  -e 's|__xservername__|Xorg|g' \
+-  -e 's|__xconfigfile__|xorg.conf|g' \
+-  -e 's|__projectroot__|$(prefix)|g' \
+-  -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-  -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-  -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-  -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-  -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
++
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
++
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-  sed $(MAN_SUBSTS)  $  $@
++  $(AM_V_GEN)$(SED) $(MAN_SUBSTS)  $  $@
+--
+cgit v0.9.0.2-2-gbebe
+From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon mems...@videotron.ca
+Date: Tue, 20 Jul 2010 22:45:19 +
+Subject: config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+---
+diff --git a/configure.ac b/configure.ac
+index a80955b..1c7ff1a 100644
+--- a/configure.ac
 b/configure.ac
+@@ -20,7 +20,7 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-neomagic],
+ 1.2.5,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+--
+cgit v0.9.0.2-2-gbebe
+From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon mems...@videotron.ca
+Date: Tue, 20 Jul 2010 23:41:31 +
+Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2012-02-11 Thread andyrtr 
Date: Saturday, February 11, 2012 @ 05:59:08
  Author: andyrtr
Revision: 149861

upgpkg: xf86-video-neomagic 1.2.5-6

Xorg 1.12 rebuild

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-11 10:57:51 UTC (rev 149860)
+++ PKGBUILD2012-02-11 10:59:08 UTC (rev 149861)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=5
+pkgrel=6
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel=1.11.0' 'xf86dgaproto')
-conflicts=('xorg-server1.11.0')
+makedepends=('xorg-server-devel=1.11.99.903' 'xf86dgaproto')
+conflicts=('xorg-server1.11.99.903')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
@@ -20,6 +20,10 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2011-08-29 Thread Jan de Groot 
Date: Monday, August 29, 2011 @ 04:16:59
  Author: jgc
Revision: 136419

upgpkg: xf86-video-neomagic 1.2.5-5

Rebuild for xserver 1.11

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-29 08:15:40 UTC (rev 136418)
+++ PKGBUILD2011-08-29 08:16:59 UTC (rev 136419)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=4
+pkgrel=5
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'xf86dgaproto')
-conflicts=('xorg-server1.10.0')
+makedepends=('xorg-server-devel=1.11.0' 'xf86dgaproto')
+conflicts=('xorg-server1.11.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2011-03-17 Thread andyrtr 
Date: Thursday, March 17, 2011 @ 13:59:49
  Author: andyrtr
Revision: 115337

upgpkg: xf86-video-neomagic 1.2.5-4
rebuilt against new Xorg-server

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-17 17:58:21 UTC (rev 115336)
+++ PKGBUILD2011-03-17 17:59:49 UTC (rev 115337)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'xf86dgaproto')
-conflicts=('xorg-server1.9.0')
+conflicts=('xorg-server1.10.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2011-03-14 Thread Jan de Groot 
Date: Monday, March 14, 2011 @ 04:31:26
  Author: jgc
Revision: 114484

upgpkg: xf86-video-neomagic 1.2.5-3
Change groups

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-14 08:24:52 UTC (rev 114483)
+++ PKGBUILD2011-03-14 08:31:26 UTC (rev 114484)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -11,7 +11,7 @@
 depends=('glibc')
 makedepends=('xorg-server-devel' 'xf86dgaproto')
 conflicts=('xorg-server1.9.0')
-groups=('xorg-video-drivers')
+groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2010-08-24 Thread Jan de Groot 
Date: Tuesday, August 24, 2010 @ 08:07:27
  Author: jgc
Revision: 88646

upgpkg: xf86-video-neomagic 1.2.5-2
Rebuild for xorg-server 1.9

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-24 10:39:21 UTC (rev 88645)
+++ PKGBUILD2010-08-24 12:07:27 UTC (rev 88646)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=1.8.0' 'xf86dgaproto')
-conflicts=('xorg-server1.8.0')
+makedepends=('xorg-server-devel' 'xf86dgaproto')
+conflicts=('xorg-server1.9.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD)

2010-04-04 Thread Jan de Groot 
Date: Sunday, April 4, 2010 @ 15:45:54
  Author: jgc
Revision: 75916

upgpkg: xf86-video-neomagic 1.2.4-4
Rebuild for xorg-server-1.8

Modified:
  xf86-video-neomagic/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-04 19:43:35 UTC (rev 75915)
+++ PKGBUILD2010-04-04 19:45:54 UTC (rev 75916)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=1.7.0' 'xf86dgaproto')
-conflicts=('xorg-server1.7.0')
+makedepends=('pkgconfig' 'xorg-server=1.8.0' 'xf86dgaproto')
+conflicts=('xorg-server1.8.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

[arch-commits] Commit in xf86-video-neomagic/trunk (PKGBUILD xf86UDelay-remove.patch)

2009-11-28 Thread Jan de Groot 
Date: Saturday, November 28, 2009 @ 08:00:38
  Author: jgc
Revision: 59858

upgpkg: xf86-video-neomagic 1.2.4-3
Fix call to xf86UDelay, fixes FS#17299

Added:
  xf86-video-neomagic/trunk/xf86UDelay-remove.patch
Modified:
  xf86-video-neomagic/trunk/PKGBUILD

-+
 PKGBUILD|5 -
 xf86UDelay-remove.patch |   42 ++
 2 files changed, 46 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-28 12:05:20 UTC (rev 59857)
+++ PKGBUILD2009-11-28 13:00:38 UTC (rev 59858)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc=X.org neomagic video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -14,12 +14,15 @@
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+xf86UDelay-remove.patch
 LICENSE)
 md5sums=('2d722ee9b9fe8da49109f280689c9c25'
+ '7c623f3b6deb4b0164690cc4d375712e'
  'e2db3e2e5c75dc8084660fb30a2e2203')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/xf86UDelay-remove.patch || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1

Added: xf86UDelay-remove.patch
===
--- xf86UDelay-remove.patch (rev 0)
+++ xf86UDelay-remove.patch 2009-11-28 13:00:38 UTC (rev 59858)
@@ -0,0 +1,42 @@
+From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Mon, 26 Oct 2009 19:43:50 +
+Subject: s/xf86UDelay/usleep/g
+
+cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index ddb6812..e4c60f2 100644
+--- a/src/neo_driver.c
 b/src/neo_driver.c
+@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include X11/extensions/xf86dgastr.h
+ #endif
+ 
++#include unistd.h
++
+ /* Mandatory functions */
+ static const OptionInfoRec *  NEOAvailableOptions(int chipid, int busid);
+ static void NEOIdentify(int flags);
+@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, 
NeoRegPtr restore,
+  * In some rare cases a lockup might occur if we don't delay
+  * here. (Reported by Miles Lane)
+  */
+-xf86UDelay(20);
++usleep(20);
+ /*
+  * Disable horizontal and vertical graphics and text expansions so
+  * that vgaHWRestore works properly.
+@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, 
NeoRegPtr restore,
+  * Sleep for 200ms to make sure that the two operations above have
+  * had time to take effect.
+  */
+-xf86UDelay(20);
++usleep(20);
+ /*
+  * This function handles restoring the generic VGA registers.  */
+ vgaHWRestore(pScrn, VgaReg,
+--
+cgit v0.8.3-6-g21f6