[arch-commits] Commit in xf86-video-neomagic/repos (10 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Dec 28 18:53:54 UTC 2012
Date: Friday, December 28, 2012 @ 13:53:54
Author: andyrtr
Revision: 173943
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-neomagic/repos/extra-i686/PKGBUILD
(from rev 173942, xf86-video-neomagic/trunk/PKGBUILD)
xf86-video-neomagic/repos/extra-i686/git-fixes.patch
(from rev 173942, xf86-video-neomagic/trunk/git-fixes.patch)
xf86-video-neomagic/repos/extra-i686/shadowfb.patch
(from rev 173942, xf86-video-neomagic/trunk/shadowfb.patch)
xf86-video-neomagic/repos/extra-x86_64/PKGBUILD
(from rev 173942, xf86-video-neomagic/trunk/PKGBUILD)
xf86-video-neomagic/repos/extra-x86_64/git-fixes.patch
(from rev 173942, xf86-video-neomagic/trunk/git-fixes.patch)
xf86-video-neomagic/repos/extra-x86_64/shadowfb.patch
(from rev 173942, xf86-video-neomagic/trunk/shadowfb.patch)
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
------------------------------+
extra-i686/PKGBUILD | 72 ++++----
extra-i686/git-fixes.patch | 334 ++++++++++++++++++++---------------------
extra-i686/shadowfb.patch | 18 ++
extra-x86_64/PKGBUILD | 72 ++++----
extra-x86_64/git-fixes.patch | 334 ++++++++++++++++++++---------------------
extra-x86_64/shadowfb.patch | 18 ++
6 files changed, 446 insertions(+), 402 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-12-28 18:53:09 UTC (rev 173942)
+++ extra-i686/PKGBUILD 2012-12-28 18:53:54 UTC (rev 173943)
@@ -1,34 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot <jgc at 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-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' '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/PKGBUILD (from rev 173942, xf86-video-neomagic/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-28 18:53:54 UTC (rev 173943)
@@ -0,0 +1,38 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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=13' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ git-fixes.patch
+ shadowfb.patch)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
+ '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
+}
+
+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-i686/git-fixes.patch
===================================================================
--- extra-i686/git-fixes.patch 2012-12-28 18:53:09 UTC (rev 173942)
+++ extra-i686/git-fixes.patch 2012-12-28 18:53:54 UTC (rev 173943)
@@ -1,167 +0,0 @@
-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=xorg&component=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 NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
- #if 0
-@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = {
- NEO_SetMode,
- NEO_SetViewport,
- NEO_GetViewport,
-- NEO_Sync,
- #ifdef HAVE_XAA_H
-+ NEO_Sync,
- NEO_FillRect,
- NEO_BlitRect,
- #if 0
-@@ -219,17 +218,14 @@ NEO_FillRect (
- }
- }
-
--
- static void
- NEO_Sync(
- ScrnInfoPtr pScrn
- ){
- NEOPtr pNEO = NEOPTR(pScrn);
--#ifdef HAVE_XAA_H
- if(pNEO->AccelInfoRec) {
- (*pNEO->AccelInfoRec->Sync)(pScrn);
- }
--#endif
- }
-
- static void
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index d7369e2..a17b925 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "xf86RAC.h"
- #endif
-
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
-
-@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi colormap manipulation need this */
- #include "micmap.h"
-
-@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
- "Acceleration %s Initialized\n",ret ? "" : "not");
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
-diff --git a/src/neo_i2c.c b/src/neo_i2c.c
-index 82d1f2a..5bbb3fb 100644
---- a/src/neo_i2c.c
-+++ b/src/neo_i2c.c
-@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "compiler.h"
-
- #include "xf86Pci.h"
--#include "xf86PciInfo.h"
-
- #include "vgaHW.h"
-
-diff --git a/src/neo_shadow.c b/src/neo_shadow.c
-index 2df7657..04efe4f 100644
---- a/src/neo_shadow.c
-+++ b/src/neo_shadow.c
-@@ -10,7 +10,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86PciInfo.h"
- #include "xf86Pci.h"
- #include "shadowfb.h"
- #include "servermd.h"
Copied: xf86-video-neomagic/repos/extra-i686/git-fixes.patch (from rev 173942, xf86-video-neomagic/trunk/git-fixes.patch)
===================================================================
--- extra-i686/git-fixes.patch (rev 0)
+++ extra-i686/git-fixes.patch 2012-12-28 18:53:54 UTC (rev 173943)
@@ -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=xorg&component=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 NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+ #if 0
+@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = {
+ NEO_SetMode,
+ NEO_SetViewport,
+ NEO_GetViewport,
+- NEO_Sync,
+ #ifdef HAVE_XAA_H
++ NEO_Sync,
+ NEO_FillRect,
+ NEO_BlitRect,
+ #if 0
+@@ -219,17 +218,14 @@ NEO_FillRect (
+ }
+ }
+
+-
+ static void
+ NEO_Sync(
+ ScrnInfoPtr pScrn
+ ){
+ NEOPtr pNEO = NEOPTR(pScrn);
+-#ifdef HAVE_XAA_H
+ if(pNEO->AccelInfoRec) {
+ (*pNEO->AccelInfoRec->Sync)(pScrn);
+ }
+-#endif
+ }
+
+ static void
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index d7369e2..a17b925 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "xf86RAC.h"
+ #endif
+
+-/* Drivers for PCI hardware need this */
+-#include "xf86PciInfo.h"
+-
+ /* Drivers that need to access the PCI config space directly need this */
+ #include "xf86Pci.h"
+
+@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+
+@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
+ "Acceleration %s Initialized\n",ret ? "" : "not");
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
+diff --git a/src/neo_i2c.c b/src/neo_i2c.c
+index 82d1f2a..5bbb3fb 100644
+--- a/src/neo_i2c.c
++++ b/src/neo_i2c.c
+@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "compiler.h"
+
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+
+ #include "vgaHW.h"
+
+diff --git a/src/neo_shadow.c b/src/neo_shadow.c
+index 2df7657..04efe4f 100644
+--- a/src/neo_shadow.c
++++ b/src/neo_shadow.c
+@@ -10,7 +10,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "shadowfb.h"
+ #include "servermd.h"
Copied: xf86-video-neomagic/repos/extra-i686/shadowfb.patch (from rev 173942, xf86-video-neomagic/trunk/shadowfb.patch)
===================================================================
--- extra-i686/shadowfb.patch (rev 0)
+++ extra-i686/shadowfb.patch 2012-12-28 18:53:54 UTC (rev 173943)
@@ -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.c 2012-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) {
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-12-28 18:53:09 UTC (rev 173942)
+++ extra-x86_64/PKGBUILD 2012-12-28 18:53:54 UTC (rev 173943)
@@ -1,34 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot <jgc at 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-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' '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-x86_64/PKGBUILD (from rev 173942, xf86-video-neomagic/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-12-28 18:53:54 UTC (rev 173943)
@@ -0,0 +1,38 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.7
+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=13' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ git-fixes.patch
+ shadowfb.patch)
+sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76'
+ '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
+}
+
+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/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch 2012-12-28 18:53:09 UTC (rev 173942)
+++ extra-x86_64/git-fixes.patch 2012-12-28 18:53:54 UTC (rev 173943)
@@ -1,167 +0,0 @@
-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=xorg&component=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 NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
- #if 0
-@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = {
- NEO_SetMode,
- NEO_SetViewport,
- NEO_GetViewport,
-- NEO_Sync,
- #ifdef HAVE_XAA_H
-+ NEO_Sync,
- NEO_FillRect,
- NEO_BlitRect,
- #if 0
-@@ -219,17 +218,14 @@ NEO_FillRect (
- }
- }
-
--
- static void
- NEO_Sync(
- ScrnInfoPtr pScrn
- ){
- NEOPtr pNEO = NEOPTR(pScrn);
--#ifdef HAVE_XAA_H
- if(pNEO->AccelInfoRec) {
- (*pNEO->AccelInfoRec->Sync)(pScrn);
- }
--#endif
- }
-
- static void
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index d7369e2..a17b925 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "xf86RAC.h"
- #endif
-
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
-
-@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi colormap manipulation need this */
- #include "micmap.h"
-
-@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
- "Acceleration %s Initialized\n",ret ? "" : "not");
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
-diff --git a/src/neo_i2c.c b/src/neo_i2c.c
-index 82d1f2a..5bbb3fb 100644
---- a/src/neo_i2c.c
-+++ b/src/neo_i2c.c
-@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "compiler.h"
-
- #include "xf86Pci.h"
--#include "xf86PciInfo.h"
-
- #include "vgaHW.h"
-
-diff --git a/src/neo_shadow.c b/src/neo_shadow.c
-index 2df7657..04efe4f 100644
---- a/src/neo_shadow.c
-+++ b/src/neo_shadow.c
-@@ -10,7 +10,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86PciInfo.h"
- #include "xf86Pci.h"
- #include "shadowfb.h"
- #include "servermd.h"
Copied: xf86-video-neomagic/repos/extra-x86_64/git-fixes.patch (from rev 173942, xf86-video-neomagic/trunk/git-fixes.patch)
===================================================================
--- extra-x86_64/git-fixes.patch (rev 0)
+++ extra-x86_64/git-fixes.patch 2012-12-28 18:53:54 UTC (rev 173943)
@@ -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=xorg&component=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 NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+ #if 0
+@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = {
+ NEO_SetMode,
+ NEO_SetViewport,
+ NEO_GetViewport,
+- NEO_Sync,
+ #ifdef HAVE_XAA_H
++ NEO_Sync,
+ NEO_FillRect,
+ NEO_BlitRect,
+ #if 0
+@@ -219,17 +218,14 @@ NEO_FillRect (
+ }
+ }
+
+-
+ static void
+ NEO_Sync(
+ ScrnInfoPtr pScrn
+ ){
+ NEOPtr pNEO = NEOPTR(pScrn);
+-#ifdef HAVE_XAA_H
+ if(pNEO->AccelInfoRec) {
+ (*pNEO->AccelInfoRec->Sync)(pScrn);
+ }
+-#endif
+ }
+
+ static void
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index d7369e2..a17b925 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "xf86RAC.h"
+ #endif
+
+-/* Drivers for PCI hardware need this */
+-#include "xf86PciInfo.h"
+-
+ /* Drivers that need to access the PCI config space directly need this */
+ #include "xf86Pci.h"
+
+@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+
+@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
+ "Acceleration %s Initialized\n",ret ? "" : "not");
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
+diff --git a/src/neo_i2c.c b/src/neo_i2c.c
+index 82d1f2a..5bbb3fb 100644
+--- a/src/neo_i2c.c
++++ b/src/neo_i2c.c
+@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include "compiler.h"
+
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+
+ #include "vgaHW.h"
+
+diff --git a/src/neo_shadow.c b/src/neo_shadow.c
+index 2df7657..04efe4f 100644
+--- a/src/neo_shadow.c
++++ b/src/neo_shadow.c
+@@ -10,7 +10,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "shadowfb.h"
+ #include "servermd.h"
Copied: xf86-video-neomagic/repos/extra-x86_64/shadowfb.patch (from rev 173942, xf86-video-neomagic/trunk/shadowfb.patch)
===================================================================
--- extra-x86_64/shadowfb.patch (rev 0)
+++ extra-x86_64/shadowfb.patch 2012-12-28 18:53:54 UTC (rev 173943)
@@ -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.c 2012-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) {
More information about the arch-commits
mailing list