ChangeLog | 40 +++++++++++++++++
configure.ac | 2
debian/changelog | 8 +++
debian/control | 4 -
debian/upstream/signing-key.asc | 89 ++++++++++++++++++++++++++++++++++++++++
src/r128_crtc.c | 6 ++
src/r128_driver.c | 4 -
src/r128_output.c | 6 ++
8 files changed, 151 insertions(+), 8 deletions(-)
New commits:
commit d35587f6faf0df097e42a9fbb93933e3a47fdc53
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Wed Jan 18 14:09:17 2017 +0100
Move URL from description to Homepage field.
diff --git a/debian/changelog b/debian/changelog
index 0d9d198..8053392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-r128 (6.10.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Update debian/upstream/signing-key.asc.
+ * Move URL from description to Homepage field.
-- Andreas Boll <andreas.boll....@gmail.com> Wed, 18 Jan 2017 14:07:48 +0100
diff --git a/debian/control b/debian/control
index 19dfb97..25269d9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends:
quilt,
xutils-dev
Standards-Version: 3.9.8
+Homepage: https://www.x.org
Vcs-Git:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128.git
Vcs-Browser:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128.git
@@ -38,9 +39,6 @@ Description: X.Org X server -- ATI r128 display driver
This driver for the X.Org X server (see xserver-xorg for a further
description)
provides support for the ATI Rage 'r128' series.
.
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
This package is built from the X.org xf86-video-r128 driver module.
Package: xserver-xorg-video-r128-dbg
commit ccaa6eecc883f2c25076320d38c8ae4de8829068
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Wed Jan 18 14:08:48 2017 +0100
Update debian/upstream/signing-key.asc.
diff --git a/debian/changelog b/debian/changelog
index 7d0c6dd..0d9d198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-r128 (6.10.2-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Update debian/upstream/signing-key.asc.
-- Andreas Boll <andreas.boll....@gmail.com> Wed, 18 Jan 2017 14:07:48 +0100
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 5a38cbd..2450ba2 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -28,3 +28,92 @@
EIuiQm8CI2/p5+y9vVrkd7Eyi6CAToTmq21OKO3Tm/kWbLMoeyAY8sTMYlgfzQCZ
e2nHiX/WhDHGYJaE5v2GRdGZUG9JirUNUVpYDwDYv2EtNjqV
=5uyB
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=E95b
+-----END PGP PUBLIC KEY BLOCK-----
commit 468d773de2ff7f30b92df0541cfcb907af4b4eec
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Wed Jan 18 14:08:19 2017 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index e38b0c9..076acfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+commit b93b78f41154d24371acb1081c423351e8f370fd
+Author: Matt Turner <matts...@gmail.com>
+Date: Tue Jan 17 14:43:12 2017 -0800
+
+ xf86-video-r128 6.10.2
+
+ Signed-off-by: Matt Turner <matts...@gmail.com>
+
+commit 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Jul 19 10:03:56 2016 -0400
+
+ Adapt Block/WakeupHandler signature for ABI 23
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit a589dd6baf7fa26f8ea7008ba6bd533a5ba3e76e
+Author: Connor Behan <connor.be...@gmail.com>
+Date: Wed Apr 13 12:41:00 2016 -0400
+
+ Remove gatos advertisement
+
+ There are many current working ways to use a TV tuner with Linux. This
+ is not one of them.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94915
+
+ Signed-off-by: Connor Behan <connor.be...@gmail.com>
+
+commit 3328547c840664896c12d0fd2db8f63e3a398a62
+Author: Kevin Brace <kevinbr...@gmx.com>
+Date: Wed Mar 16 18:59:23 2016 -0700
+
+ xextproto 7.1 support update to the source code
+
+ While the compilation script was updated, for some reason, the source
+ code did not get the update.
+
+ Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
+ Reviewed-by: Connor Behan <connor.be...@gmail.com>
+
commit d3f3c9549119629ddd9447a0f9b699a909b916d5
Author: Connor Behan <connor.be...@gmail.com>
Date: Thu Jan 21 22:12:25 2016 -0500
diff --git a/debian/changelog b/debian/changelog
index a07e232..7d0c6dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-r128 (6.10.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Wed, 18 Jan 2017 14:07:48 +0100
+
xserver-xorg-video-r128 (6.10.1-2) unstable; urgency=medium
[ Andreas Boll ]
commit b93b78f41154d24371acb1081c423351e8f370fd
Author: Matt Turner <matts...@gmail.com>
Date: Tue Jan 17 14:43:12 2017 -0800
xf86-video-r128 6.10.2
Signed-off-by: Matt Turner <matts...@gmail.com>
diff --git a/configure.ac b/configure.ac
index 9aaa3ea..c61d000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-r128],
- [6.10.1],
+ [6.10.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-r128])
AC_CONFIG_SRCDIR([Makefile.am])
commit 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5
Author: Adam Jackson <a...@redhat.com>
Date: Tue Jul 19 10:03:56 2016 -0400
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/src/compat-api.h b/src/compat-api.h
index 6bc946f..89976e4 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -75,8 +75,13 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
commit a589dd6baf7fa26f8ea7008ba6bd533a5ba3e76e
Author: Connor Behan <connor.be...@gmail.com>
Date: Wed Apr 13 12:41:00 2016 -0400
Remove gatos advertisement
There are many current working ways to use a TV tuner with Linux. This
is not one of them.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94915
Signed-off-by: Connor Behan <connor.be...@gmail.com>
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 9a676d5..5695614 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1435,10 +1435,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
if (info->MMIO) R128UnmapMMIO(pScrn);
info->MMIO = NULL;
- xf86DrvMsg(pScrn->scrnIndex, X_NOTICE,
- "For information on using the multimedia capabilities\n\tof this"
- " adapter, please see http://gatos.sf.net.\n";);
-
return TRUE;
fail:
commit 3328547c840664896c12d0fd2db8f63e3a398a62
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Wed Mar 16 18:59:23 2016 -0700
xextproto 7.1 support update to the source code
While the compilation script was updated, for some reason, the source
code did not get the update.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
Reviewed-by: Connor Behan <connor.be...@gmail.com>
diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index d62cc6a..ed77492 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -35,7 +35,13 @@
#include "xf86.h"
#include "xf86Modes.h"
+
+#ifdef HAVE_XEXTPROTO_71
#include "X11/extensions/dpmsconst.h"
+#else
+#define DPMS_SERVER
+#include "X11/extensions/dpms.h"
+#endif
#include "r128.h"
#include "r128_probe.h"
diff --git a/src/r128_output.c b/src/r128_output.c
index a2c754b..73b4af2 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -35,7 +35,13 @@
#include "xf86.h"
#include "xf86Modes.h"
+
+#ifdef HAVE_XEXTPROTO_71
#include "X11/extensions/dpmsconst.h"
+#else
+#define DPMS_SERVER
+#include "X11/extensions/dpms.h"
+#endif
#include "r128.h"
#include "r128_probe.h"
