xserver-xorg-video-savage: Changes to 'debian-unstable'
ChangeLog | 47 +++++++++++++++++++++++++++++
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/savage_dri.c | 3 -
src/savage_driver.c | 11 +++++-
src/savage_driver.h | 1
11 files changed, 139 insertions(+), 9 deletions(-)
New commits:
commit 1127b3a88a3a4725dde00a27adfc00dc677962c3
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:19:49 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 15f2431..4a78e38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
+xserver-xorg-video-savage (1:2.3.8-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 12:16:57 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 12:19:40 +0200
xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low
commit 076ec8f7cd62b329c4fd19688fff3192a8a369a7
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:19:34 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 97cc0c7..15f2431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-savage (1:2.3.8-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 12:16:57 +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 f6126b1..16512bd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders:
Tormod Volden <debian.tormod@gmail.com>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
xserver-xorg-dev (>= 2:1.9.4),
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 c0d815daa87ac9d1d84daeb17009012034e6f2fc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:18:39 2015 +0200
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 933b409..97cc0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-savage (1:2.3.8-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 12:16:57 +0200
diff --git a/debian/control b/debian/control
index 4dd6c61..f6126b1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders:
- Cyril Brulebois <kibi@debian.org>,
Tormod Volden <debian.tormod@gmail.com>
Build-Depends:
debhelper (>= 8),
commit 481738c4191a53f1c391ced5884a83b96b84e54b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:18:11 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 87efed0..933b409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Let uscan verify tarball signatures.
-- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 12:16:57 +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 b2e9759..bf9394e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-savage
version=3
+opts="pgpsigurlmangle=s/$/.sig/" \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-savage-(.*)\.tar\.gz
commit cef51d1075ab5e8ec6d879f1f1c7e71d5a4e2758
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:17:05 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index b70bce3..c012d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+commit f8f24e6856e2627f6620a8fd0474366d057496d2
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 12:08:50 2015 +0200
+
+ Bump to 2.3.8
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 1b58f8ab061f52d8aab9758b4dfa7e48e76b847a
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 8 12:07:42 2015 +0200
+
+ Fix compiler warnings with recent X servers
+
+ savage_driver.c:1228:12: warning: assignment discards 'const' qualifier from pointer target type
+ if ((s = xf86GetOptValString(psav->Options, OPTION_ROTATE))) {
+ ^
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jul 29 09:15:26 2014 -0400
+
+ dri: Stop (uselessly) initializing the ValidateTree hooks
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 16a672d1ba183601d513c4cdca32b47e926a6d1e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:11:46 2014 -0400
+
+ Use own thunk function instead of vgaHW*Weak
+
+ I plan to remove the Weak functions from a future server.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2e9217bb88b76cebfcd2b65b76c8733f80da77ea
+Author: Jeremy White <jwhite@codeweavers.com>
+Date: Thu Mar 21 10:59:13 2013 -0500
+
+ Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.
+
+ Signed-off-by: Jeremy White <jwhite@codeweavers.com>
+ Reviewed-by: Robert Morell <rmorell@nvidia.com>
+
commit d27abbf74fee30ddb9a3ca0d597ca0ce16a1bc35
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Tue Sep 24 23:14:35 2013 +0200
diff --git a/debian/changelog b/debian/changelog
index 51a28d9..87efed0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.3.8-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 12:16:57 +0200
+
xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low
* Actually upload with correct contents. (closes: #724675)
commit f8f24e6856e2627f6620a8fd0474366d057496d2
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:08:50 2015 +0200
Bump to 2.3.8
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index a34e624..7fe8293 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-savage],
- [2.3.7],
+ [2.3.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-savage])
AC_CONFIG_SRCDIR([Makefile.am])
commit 1b58f8ab061f52d8aab9758b4dfa7e48e76b847a
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:07:42 2015 +0200
Fix compiler warnings with recent X servers
savage_driver.c:1228:12: warning: assignment discards 'const' qualifier from pointer target type
if ((s = xf86GetOptValString(psav->Options, OPTION_ROTATE))) {
^
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/savage_driver.c b/src/savage_driver.c
index e82794f..d278345 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1082,7 +1082,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
MessageType from = X_DEFAULT;
int i;
ClockRangePtr clockRanges;
- char *s = NULL;
+ const char *s = NULL;
unsigned char config1, m, n, n1, n2, sr8, cr66 = 0, tmp;
int mclk;
vgaHWPtr hwp;
commit d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 29 09:15:26 2014 -0400
dri: Stop (uselessly) initializing the ValidateTree hooks
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/savage_dri.c b/src/savage_dri.c
index bdb78e4..0842821 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
- pDRIInfo->wrap.ValidateTree = NULL;
- pDRIInfo->wrap.PostValidateTree = NULL;
-
pDRIInfo->createDummyCtx = TRUE;
pDRIInfo->createDummyCtxPriv = FALSE;
commit 16a672d1ba183601d513c4cdca32b47e926a6d1e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:11:46 2014 -0400
Use own thunk function 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/savage_driver.c b/src/savage_driver.c
index bca2c60..e82794f 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
return ((unsigned int) (tmp & 0x08));
}
+static void
+SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
static Bool
SavageDDC1(ScrnInfoPtr pScrn)
{
@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
InI2CREG(byte,psav->I2CPort);
OutI2CREG(byte | 0x12,psav->I2CPort);
- pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
+ pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
+ SavageDDC1Read);
if (!pMon)
return FALSE;
commit 2e9217bb88b76cebfcd2b65b76c8733f80da77ea
Author: Jeremy White <jwhite@codeweavers.com>
Date: Thu Mar 21 10:59:13 2013 -0500
Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
diff --git a/src/savage_driver.h b/src/savage_driver.h
index ec4b1ea..de042af 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -54,6 +54,7 @@
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
+#include "xf86Modes.h"
#include "xf86Pci.h"
#include "xf86_OSproc.h"
#include "xf86Cursor.h"
Reply to: