xorg-xf86-video-neomagic: added build fix for new xorg-server, removed unreferenced patch

4 files changed, 45 insertions, 23 deletions

diff --git a/xorg-xf86-video-neomagic/.md5sum b/xorg-xf86-video-neomagic/.md5sum
index 56dd1669..03f2ec13 100644
--- a/xorg-xf86-video-neomagic/.md5sum
+++ b/xorg-xf86-video-neomagic/.md5sum
@@ -1 +1,2 @@
+9626d96b3e6fc53913b68a4fba87babb  vidmem-checks.patch
 cf95912edda11ac70b994c044e9308c5  xf86-video-neomagic-1.2.8.tar.bz2
diff --git a/xorg-xf86-video-neomagic/Pkgfile b/xorg-xf86-video-neomagic/Pkgfile
index 0e02c53f..1af4aeca 100644
--- a/xorg-xf86-video-neomagic/Pkgfile
+++ b/xorg-xf86-video-neomagic/Pkgfile
@@ -5,11 +5,13 @@
 
 name=xorg-xf86-video-neomagic
 version=1.2.8
-release=1
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2)
+release=2
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2 \
+	vidmem-checks.patch)
 
 build() {
 	cd xf86-video-neomagic-$version
+	patch -p1 -i $SRC/vidmem-checks.patch
 	./configure --prefix=/usr --mandir=/usr/man
 
 	make
diff --git a/xorg-xf86-video-neomagic/mibstore.patch b/xorg-xf86-video-neomagic/mibstore.patch
deleted file mode 100644
index 7958eb48..00000000
--- a/xorg-xf86-video-neomagic/mibstore.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN 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	2013-03-09 15:20:14.305048833 +0100
-+++ xf86-video-neomagic-1.2.7/src/neo_driver.c	2013-03-09 15:20:51.305314188 +0100
-@@ -72,9 +72,6 @@ CONNECTION WITH THE USE OR PERFORMANCE O
- /* 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 +1618,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
-                    "Acceleration %s Initialized\n",ret ? "" : "not");
-     } 
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
diff --git a/xorg-xf86-video-neomagic/vidmem-checks.patch b/xorg-xf86-video-neomagic/vidmem-checks.patch
new file mode 100644
index 00000000..064c0cc1
--- /dev/null
+++ b/xorg-xf86-video-neomagic/vidmem-checks.patch
@@ -0,0 +1,40 @@
+From 6661bdd4551e4e63e983685464a277845aed3012 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@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@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
+