diff options
| author | Juergen Daubert <jue@jue.li> | 2015-05-08 17:43:03 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2015-05-08 17:43:03 +0200 |
| commit | 642e259a6639bba5e1b3889a78c298ea30e6e81f (patch) | |
| tree | d0f383aa20d7d8c81c20d823db9190a0285d2a01 /xorg-xf86-video-neomagic | |
| parent | ed0eeaf507b7d990b0ea0a993265ef16f5e6f5cc (diff) | |
| download | xorg-642e259a6639bba5e1b3889a78c298ea30e6e81f.tar.gz xorg-642e259a6639bba5e1b3889a78c298ea30e6e81f.tar.xz | |
xorg-xf86-video-neomagic: update to 1.2.9
Diffstat (limited to 'xorg-xf86-video-neomagic')
| -rw-r--r-- | xorg-xf86-video-neomagic/.md5sum | 3 | ||||
| -rw-r--r-- | xorg-xf86-video-neomagic/Pkgfile | 11 | ||||
| -rw-r--r-- | xorg-xf86-video-neomagic/vidmem-checks.patch | 40 |
3 files changed, 6 insertions, 48 deletions
diff --git a/xorg-xf86-video-neomagic/.md5sum b/xorg-xf86-video-neomagic/.md5sum index 03f2ec13..496c63b4 100644 --- a/xorg-xf86-video-neomagic/.md5sum +++ b/xorg-xf86-video-neomagic/.md5sum @@ -1,2 +1 @@ -9626d96b3e6fc53913b68a4fba87babb vidmem-checks.patch -cf95912edda11ac70b994c044e9308c5 xf86-video-neomagic-1.2.8.tar.bz2 +4b5b52e9da0a954cd3d6068a33975bc1 xf86-video-neomagic-1.2.9.tar.bz2 diff --git a/xorg-xf86-video-neomagic/Pkgfile b/xorg-xf86-video-neomagic/Pkgfile index 1af4aeca..3705f33c 100644 --- a/xorg-xf86-video-neomagic/Pkgfile +++ b/xorg-xf86-video-neomagic/Pkgfile @@ -4,15 +4,14 @@ # Depends on: xorg-server name=xorg-xf86-video-neomagic -version=1.2.8 -release=2 -source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2 \ - vidmem-checks.patch) +version=1.2.9 +release=1 +source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2) build() { cd xf86-video-neomagic-$version - patch -p1 -i $SRC/vidmem-checks.patch - ./configure --prefix=/usr --mandir=/usr/man + + ./configure --prefix=/usr --mandir=/usr/man make make DESTDIR=$PKG install diff --git a/xorg-xf86-video-neomagic/vidmem-checks.patch b/xorg-xf86-video-neomagic/vidmem-checks.patch deleted file mode 100644 index 064c0cc1..00000000 --- a/xorg-xf86-video-neomagic/vidmem-checks.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - |