xserver-xorg-video-neomagic: Changes to 'ubuntu'
debian/changelog | 7 ++++++
debian/control | 5 ++--
debian/patches/fix-ftbfs-1.17.diff | 38 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 3 +-
4 files changed, 50 insertions(+), 3 deletions(-)
New commits:
commit 1fda50a5cf894399b8217da7a9c2f1fa461e1ac5
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 12 11:21:59 2015 +0100
Rebuild against 1.17.
fix-ftbfs-1.17.diff
diff --git a/debian/changelog b/debian/changelog
index 0ffed78..9ca7673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-neomagic (1:1.2.8-1ubuntu1) vivid; urgency=medium
+
+ * Rebuild against 1.17.
+ - fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 12 Mar 2015 11:21:26 +0100
+
xserver-xorg-video-neomagic (1:1.2.8-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index eb115e4..95634d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
Source: xserver-xorg-video-neomagic
Section: x11
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
+XSBC-Orig-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-video-dev,
x11proto-xf86dga-dev,
x11proto-core-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 0000000..da1ac14
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,38 @@
+commit 6661bdd4551e4e63e983685464a277845aed3012
+Author: Dave Airlie <airlied@gmail.com>
+Date: Sun Sep 21 09:51:37 2014 +1000
+
+ 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;
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..eccfa20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-# placeholder
+fix-ftbfs-1.17.diff
+
Reply to: