xserver-xorg-video-neomagic: Changes to 'debian-unstable'
ChangeLog | 36 ++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 9 +++++
debian/compat | 2 -
debian/control | 3 -
debian/rules | 5 +++
debian/upstream/signing-key.asc | 64 ++++++++++++++++++++++++++++++++++++++++
debian/watch | 1
src/neo_driver.c | 22 +++++++++++--
9 files changed, 137 insertions(+), 7 deletions(-)
New commits:
commit b0bea2bccda14458ec776dedac79413bb743c3ae
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:03:18 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index bad3ab6..4bb4ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-neomagic (1:1.2.9-1) UNRELEASED; urgency=medium
+xserver-xorg-video-neomagic (1:1.2.9-1) unstable; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
* Bump debhelper compat level to 9.
- -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:55:14 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 12:03:14 +0200
xserver-xorg-video-neomagic (1:1.2.8-1) unstable; urgency=low
commit aa0023deb5e7b48b27c24f8519517257307b5687
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:00:22 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 6f62165..bad3ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-neomagic (1:1.2.9-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Remove Cyril from Uploaders.
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:55:14 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 1cda9a2..d092bb1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
quilt,
pkg-config,
diff --git a/debian/rules b/debian/rules
index 3d192dc..bf3cf96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=\$${exec_prefix}/lib
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 38b17def1b3cf9b7446807619949d856a8c319d9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:59:13 2015 +0200
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index c393869..6f62165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-neomagic (1:1.2.9-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:55:14 +0200
diff --git a/debian/control b/debian/control
index eb115e4..1cda9a2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-neomagic
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit 411fe187ee0039cd6a5bbcc9aeff4ed12b5ec6fe
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:58:55 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index b1c1660..c393869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-neomagic (1:1.2.9-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Let uscan verify tarball signatures.
-- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:55:14 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..9930dd6
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q
+K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC
+SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz
+WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l
+u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W
+LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab
+vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ
+hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4
+I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD
+qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W
+gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB
+tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC
+PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ
+EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0
+w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/
+gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7
+R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy
+aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77
+wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5
+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
+=+xMJ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index c36e815..c05a974 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-neomagic
version=3
+opts="pgpsigurlmangle=s/$/.sig/" \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-neomagic-(.*)\.tar\.gz
commit aa453ae72cbcab038416ea8e7ac79bf8aba81fe7
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:55:39 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index ada33ac..4f5c6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+commit f0a61bc00011b0497edc79cf6fa11ae88a227df9
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 11:48:52 2015 +0200
+
+ Bump to 1.2.9
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit b9399b8880e97af8b66d981ad3edd498e76d2e16
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 11:47:58 2015 +0200
+
+ Fix compiler warning with recent X servers
+
+ xf86GetOptValString was changed to return const char *.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+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>
+
+commit 74a9a343f6e156d24539b81f1224b7410acf0e38
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:07:53 2014 -0400
+
+ 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@redhat.com>
+
commit a559a07989265a84ee31530a2b002899b40389ae
Author: Matt Turner <mattst88@gmail.com>
Date: Fri Aug 16 11:12:14 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index 0ffed78..b1c1660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.9-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:55:14 +0200
+
xserver-xorg-video-neomagic (1:1.2.8-1) unstable; urgency=low
* New upstream release.
commit f0a61bc00011b0497edc79cf6fa11ae88a227df9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:48:52 2015 +0200
Bump to 1.2.9
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index dce0d93..c860d95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-neomagic],
- [1.2.8],
+ [1.2.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
[xf86-video-neomagic])
AC_CONFIG_SRCDIR([Makefile.am])
commit b9399b8880e97af8b66d981ad3edd498e76d2e16
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:47:58 2015 +0200
Fix compiler warning with recent X servers
xf86GetOptValString was changed to return const char *.
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/neo_driver.c b/src/neo_driver.c
index da01962..62d6742 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -636,7 +636,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
int apertureSize;
Bool height_480 = FALSE;
Bool lcdCenterOptSet = FALSE;
- char *s;
+ const char *s;
if (flags & PROBE_DETECT) {
neoProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
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;
commit 74a9a343f6e156d24539b81f1224b7410acf0e38
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:07:53 2014 -0400
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@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);
Reply to: