[arch-commits] Commit in xf86-video-neomagic/repos (6 files)

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

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

Added:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
(from rev 238725, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
(from rev 238725, xf86-video-neomagic/trunk/PKGBUILD)
Deleted:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
  xf86-video-neomagic/repos/extra-i686/git-fixes.patch
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
  xf86-video-neomagic/repos/extra-x86_64/git-fixes.patch

--+
 /PKGBUILD|   62 +
 extra-i686/PKGBUILD  |   38 ---
 extra-i686/git-fixes.patch   |   99 -
 extra-x86_64/PKGBUILD|   38 ---
 extra-x86_64/git-fixes.patch |   99 -
 5 files changed, 62 insertions(+), 274 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-05-08 19:05:10 UTC (rev 238725)
+++ extra-i686/PKGBUILD 2015-05-08 19:05:21 UTC (rev 238726)
@@ -1,38 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.8
-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' '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')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../git-fixes.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 238725, 
xf86-video-neomagic/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-08 19:05:21 UTC (rev 238726)
@@ -0,0 +1,31 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.9
+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' '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{,.sig})
+sha256sums=('72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2'
+'SKIP')
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C') # Julien Cristau 
julien.cris...@ens-lyon.org
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+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: extra-i686/git-fixes.patch
===
--- extra-i686/git-fixes.patch  2015-05-08 19:05:10 UTC (rev 238725)
+++ extra-i686/git-fixes.patch  2015-05-08 19:05:21 UTC (rev 238726)
@@ -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);
-+}

[arch-commits] Commit in xf86-video-neomagic/repos (6 files)

2015-02-06 Thread Laurent Carlier 
Date: Friday, February 6, 2015 @ 09:02:58
  Author: lcarlier
Revision: 230898

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

Added:
  xf86-video-neomagic/repos/staging-i686/
  xf86-video-neomagic/repos/staging-i686/PKGBUILD
(from rev 230897, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/staging-i686/git-fixes.patch
(from rev 230897, xf86-video-neomagic/trunk/git-fixes.patch)
  xf86-video-neomagic/repos/staging-x86_64/
  xf86-video-neomagic/repos/staging-x86_64/PKGBUILD
(from rev 230897, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/staging-x86_64/git-fixes.patch
(from rev 230897, xf86-video-neomagic/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   38 ++
 staging-i686/git-fixes.patch   |   99 +++
 staging-x86_64/PKGBUILD|   38 ++
 staging-x86_64/git-fixes.patch |   99 +++
 4 files changed, 274 insertions(+)

Copied: xf86-video-neomagic/repos/staging-i686/PKGBUILD (from rev 230897, 
xf86-video-neomagic/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-02-06 08:02:58 UTC (rev 230898)
@@ -0,0 +1,38 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.8
+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' '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')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ../git-fixes.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-neomagic/repos/staging-i686/git-fixes.patch (from rev 
230897, xf86-video-neomagic/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2015-02-06 08:02:58 UTC (rev 230898)
@@ -0,0 +1,99 @@
+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,
+

[arch-commits] Commit in xf86-video-neomagic/repos (6 files)

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

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

Added:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
(from rev 169531, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/extra-i686/git-fixes.patch
(from rev 169531, xf86-video-neomagic/trunk/git-fixes.patch)
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
(from rev 169531, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/extra-x86_64/git-fixes.patch
(from rev 169531, xf86-video-neomagic/trunk/git-fixes.patch)
Deleted:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD

--+
 extra-i686/PKGBUILD  |   64 ---
 extra-i686/git-fixes.patch   |  167 +
 extra-x86_64/PKGBUILD|   64 ---
 extra-x86_64/git-fixes.patch |  167 +
 4 files changed, 402 insertions(+), 60 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-23 10:08:30 UTC (rev 169531)
+++ extra-i686/PKGBUILD 2012-10-23 10:08:56 UTC (rev 169532)
@@ -1,30 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.7
-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=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)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
-
-build() {
-  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}/
-}

Copied: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 169531, 
xf86-video-neomagic/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-23 10:08:56 UTC (rev 169532)
@@ -0,0 +1,34 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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' '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
+git-fixes.patch)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
+'38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.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}/
+}

Copied: xf86-video-neomagic/repos/extra-i686/git-fixes.patch (from rev 169531, 
xf86-video-neomagic/trunk/git-fixes.patch)
===
--- extra-i686/git-fixes.patch  (rev 0)
+++ extra-i686/git-fixes.patch  2012-10-23 10:08:56 UTC (rev 169532)
@@ -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
+

[arch-commits] Commit in xf86-video-neomagic/repos (6 files)

2012-10-13 Thread andyrtr 
Date: Saturday, October 13, 2012 @ 07:45:15
  Author: andyrtr
Revision: 168579

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

Added:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
(from rev 168549, xf86-video-neomagic/repos/testing-i686/PKGBUILD)
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
(from rev 168549, xf86-video-neomagic/repos/testing-x86_64/PKGBUILD)
Deleted:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
  xf86-video-neomagic/repos/testing-i686/
  xf86-video-neomagic/repos/testing-x86_64/

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-13 11:45:11 UTC (rev 168578)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:15 UTC (rev 168579)
@@ -1,30 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.7
-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.12.0' 'xf86dgaproto')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
-
-build() {
-  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}/
-}

Copied: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 168549, 
xf86-video-neomagic/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-13 11:45:15 UTC (rev 168579)
@@ -0,0 +1,30 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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=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)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
+
+build() {
+  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}/
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-13 11:45:11 UTC (rev 168578)
+++ extra-x86_64/PKGBUILD   2012-10-13 11:45:15 UTC (rev 168579)
@@ -1,30 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.7
-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.12.0' 'xf86dgaproto')
-conflicts=('xorg-server1.12.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
-
-build() {
-  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}/
-}

Copied: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD (from rev 168549, 
xf86-video-neomagic/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-13 11:45:15 UTC (rev 168579)
@@ -0,0 +1,30 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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=13' 'xf86dgaproto' 
'resourceproto' 'scrnsaverproto')

[arch-commits] Commit in xf86-video-neomagic/repos (6 files)

2012-10-06 Thread andyrtr 
Date: Saturday, October 6, 2012 @ 16:07:42
  Author: andyrtr
Revision: 168231

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

Added:
  xf86-video-neomagic/repos/testing-i686/
  xf86-video-neomagic/repos/testing-i686/PKGBUILD
(from rev 168199, xf86-video-neomagic/repos/staging-i686/PKGBUILD)
  xf86-video-neomagic/repos/testing-x86_64/
  xf86-video-neomagic/repos/testing-x86_64/PKGBUILD
(from rev 168199, xf86-video-neomagic/repos/staging-x86_64/PKGBUILD)
Deleted:
  xf86-video-neomagic/repos/staging-i686/
  xf86-video-neomagic/repos/staging-x86_64/

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

Copied: xf86-video-neomagic/repos/testing-i686/PKGBUILD (from rev 168199, 
xf86-video-neomagic/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-06 20:07:42 UTC (rev 168231)
@@ -0,0 +1,30 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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=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)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
+
+build() {
+  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}/
+}

Copied: xf86-video-neomagic/repos/testing-x86_64/PKGBUILD (from rev 168199, 
xf86-video-neomagic/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-06 20:07:42 UTC (rev 168231)
@@ -0,0 +1,30 @@
+# $Id$
+#Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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=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)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
+
+build() {
+  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/repos (6 files)

2012-03-24 Thread Jan de Groot 
Date: Saturday, March 24, 2012 @ 06:25:08
  Author: jgc
Revision: 154213

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

Added:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
(from rev 154212, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
(from rev 154212, xf86-video-neomagic/trunk/PKGBUILD)
Deleted:
  xf86-video-neomagic/repos/extra-i686/PKGBUILD
  xf86-video-neomagic/repos/extra-i686/git-fixes.diff
  xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
  xf86-video-neomagic/repos/extra-x86_64/git-fixes.diff

-+
 extra-i686/PKGBUILD |   63 ++--
 extra-i686/git-fixes.diff   |  616 --
 extra-x86_64/PKGBUILD   |   63 ++--
 extra-x86_64/git-fixes.diff |  616 --
 4 files changed, 60 insertions(+), 1298 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 154212:154213 to see the changes.

[arch-commits] Commit in xf86-video-neomagic/repos (6 files)

2012-03-19 Thread andyrtr 
Date: Monday, March 19, 2012 @ 15:44:28
  Author: andyrtr
Revision: 153830

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

Added:
  xf86-video-neomagic/repos/testing-i686/
  xf86-video-neomagic/repos/testing-i686/PKGBUILD
(from rev 153829, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/testing-i686/git-fixes.diff
(from rev 153829, xf86-video-neomagic/trunk/git-fixes.diff)
  xf86-video-neomagic/repos/testing-x86_64/
  xf86-video-neomagic/repos/testing-x86_64/PKGBUILD
(from rev 153829, xf86-video-neomagic/trunk/PKGBUILD)
  xf86-video-neomagic/repos/testing-x86_64/git-fixes.diff
(from rev 153829, xf86-video-neomagic/trunk/git-fixes.diff)

---+
 testing-i686/PKGBUILD |   33 ++
 testing-i686/git-fixes.diff   |  616 
 testing-x86_64/PKGBUILD   |   33 ++
 testing-x86_64/git-fixes.diff |  616 
 4 files changed, 1298 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 153829:153830 to see the changes.