ChangeLog | 13 +++++++++++++
configure.ac | 2 +-
debian/changelog | 11 +++++++++++
src/dummy_driver.c | 4 ++--
4 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit b767ffbca15cc686e9d7fb14b3ac74aa589945dc
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 20 16:41:12 2012 +0100
Upload to unstable with “high” urgency.
diff --git a/debian/changelog b/debian/changelog
index cf47f90..a23aa70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xserver-xorg-video-dummy (1:0.3.5-2) UNRELEASED; urgency=low
+xserver-xorg-video-dummy (1:0.3.5-2) unstable; urgency=high
* Merge upstream master up to 02918fd534:
- Use USE_DGA rather than XFreeXDGA in preprocessor checks, the
former is set through ./configure while the latter comes from
the server. Meaning if DGA is enabled in the server and is
disabled in the driver, crashes happen (#660574).
+ * Set urgency to “high” for the RC bug fix.
- -- Cyril Brulebois <k...@debian.org> Mon, 20 Feb 2012 16:38:17 +0100
+ -- Cyril Brulebois <k...@debian.org> Mon, 20 Feb 2012 16:40:46 +0100
xserver-xorg-video-dummy (1:0.3.5-1) unstable; urgency=low
commit a422fc8c1055b045fb46392986c8752db16edc6d
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Feb 20 16:40:44 2012 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 35d1689..4e09967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+commit 02918fd53434a23a72fe878a90f4ec48ef0e0416
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Mon Jan 9 01:00:40 2012 -0800
+
+ Don't use XFreeXDGA to determine DGA support
+
+ If our server supports DGA and we want to build the dummy driver without
it,
+ XFreeXDGA will be defined by the server and will be picked up rather than
+ our configuration option. This change forces us to honor our configuration
+ hoice.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
commit bccf37f052748386902112b770b89d81bddfaeb8
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Jan 1 07:15:36 2012 +0100
diff --git a/debian/changelog b/debian/changelog
index aa60ac8..cf47f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-dummy (1:0.3.5-2) UNRELEASED; urgency=low
+
+ * Merge upstream master up to 02918fd534:
+ - Use USE_DGA rather than XFreeXDGA in preprocessor checks, the
+ former is set through ./configure while the latter comes from
+ the server. Meaning if DGA is enabled in the server and is
+ disabled in the driver, crashes happen (#660574).
+
+ -- Cyril Brulebois <k...@debian.org> Mon, 20 Feb 2012 16:38:17 +0100
+
xserver-xorg-video-dummy (1:0.3.5-1) unstable; urgency=low
* New upstream release:
commit 02918fd53434a23a72fe878a90f4ec48ef0e0416
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Mon Jan 9 01:00:40 2012 -0800
Don't use XFreeXDGA to determine DGA support
If our server supports DGA and we want to build the dummy driver without it,
XFreeXDGA will be defined by the server and will be picked up rather than
our configuration option. This change forces us to honor our configuration
hoice.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/configure.ac b/configure.ac
index d92e22a..6861485 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
if test "x$DGA" = xyes; then
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
- AC_DEFINE(XFreeXDGA, 1, [Support DGA extension])
+ AC_DEFINE(USE_DGA, 1, [Support DGA extension])
fi
AC_SUBST([DGA])
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 041ca96..6533b27 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -45,7 +45,7 @@
#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "servermd.h"
-#ifdef XFreeXDGA
+#ifdef USE_DGA
#define _XF86DGA_SERVER_
#include <X11/extensions/xf86dgaproto.h>
#endif
@@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
char **argv)
xf86SetBlackWhitePixels(pScreen);
-#ifdef XFreeXDGA
+#ifdef USE_DGA
DUMMYDGAInit(pScreen);
#endif
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rzvrx-0005mm...@vasks.debian.org
