[arch-commits] Commit in xf86-video-neomagic/repos (6 files)
Andreas Radke
andyrtr at archlinux.org
Fri May 8 19:05:21 UTC 2015
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 <jgc at 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-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' '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 <jgc at 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-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' '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.cristau at 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 <ajax at 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 <ajax at 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 <airlied at gmail.com>
-Date: Sun, 21 Sep 2014 09:51:37 +1000
-Subject: neomagic: fix build against master X server.
-
-Signed-off-by: Dave Airlie <airlied at 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,
- 0x200000L);
-+#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)
- return FALSE;
- return TRUE;
---
-cgit v0.10.2
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-05-08 19:05:10 UTC (rev 238725)
+++ extra-x86_64/PKGBUILD 2015-05-08 19:05:21 UTC (rev 238726)
@@ -1,38 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot <jgc at 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-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' '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-x86_64/PKGBUILD (from rev 238725, xf86-video-neomagic/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-05-08 19:05:21 UTC (rev 238726)
@@ -0,0 +1,31 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at 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-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' '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.cristau at 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-x86_64/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch 2015-05-08 19:05:10 UTC (rev 238725)
+++ extra-x86_64/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 <ajax at 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 <ajax at 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 <airlied at gmail.com>
-Date: Sun, 21 Sep 2014 09:51:37 +1000
-Subject: neomagic: fix build against master X server.
-
-Signed-off-by: Dave Airlie <airlied at 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,
- 0x200000L);
-+#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)
- return FALSE;
- return TRUE;
---
-cgit v0.10.2
-
More information about the arch-commits
mailing list