debian/changelog | 8 ++++++++
debian/control | 6 +++---
debian/copyright | 2 +-
debian/watch | 2 +-
src/compat-api.h | 5 +++++
5 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 598c2b899f4b191f3e6972c5e923048c1f3b8f38
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Nov 18 12:39:19 2016 +0100
Update a bunch of URLs in packaging to https.
diff --git a/debian/changelog b/debian/changelog
index e6614ae..0f4b6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-siliconmotion (1:1.7.8-2) UNRELEASED;
urgency=medium
* Cherry-pick commit e67f394 (Adapt Block/WakeupHandler signature for
ABI 23) from upstream master branch.
+ * Update a bunch of URLs in packaging to https.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 18 Nov 2016 12:38:23 +0100
diff --git a/debian/control b/debian/control
index baa770b..f232cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
quilt,
xutils-dev (>= 1:7.5+4),
Standards-Version: 3.9.3
-Vcs-Git:
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion
-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
+Vcs-Git:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
+Vcs-Browser:
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
Package: xserver-xorg-video-siliconmotion
Architecture: any
@@ -30,6 +30,6 @@ Description: X.Org X server -- SiliconMotion display driver
of chipsets, commonly found in laptops.
.
More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
.
This package is built from the X.org xf86-video-siliconmotion driver module.
diff --git a/debian/copyright b/debian/copyright
index 120dc92..fa883ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
+https://xorg.freedesktop.org/releases/individual/driver/
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
Copyright (C) 2000,2008 Silicon Motion, Inc. All Rights Reserved.
diff --git a/debian/watch b/debian/watch
index 6cee75d..577e057 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-siliconmotion
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/driver/
xf86-video-siliconmotion-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/
xf86-video-siliconmotion-(.*)\.tar\.gz
commit 8886effcf4dc00fd9f36ba5d0ef26483c34dd5b2
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Fri Nov 18 12:38:44 2016 +0100
Document the cherry-pick in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 6b6347e..e6614ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-siliconmotion (1:1.7.8-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick commit e67f394 (Adapt Block/WakeupHandler signature for
+ ABI 23) from upstream master branch.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Fri, 18 Nov 2016 12:38:23 +0100
+
xserver-xorg-video-siliconmotion (1:1.7.8-1) unstable; urgency=medium
* New upstream release.
commit 481295588527b4d61d414b555fd635f1cf9f5aea
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>
(cherry picked from commit e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c)
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
