xorg-server: Changes to 'debian-unstable'
debian/changelog | 9 +++++-
debian/patches/05_only_call_gamma_set_if_nonnull.diff | 25 ++++++++++++++++++
debian/patches/series | 1
3 files changed, 33 insertions(+), 2 deletions(-)
New commits:
commit 58f1c12709c8369fec7f719a71114a307fc6ce08
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jan 20 23:51:37 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 32ed9f0..f771567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
+xorg-server (2:1.7.4-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -8,7 +8,7 @@ xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
* Add 05_only_call_gamma_set_if_nonnull.diff to unbreak the nv driver,
closes: #564203.
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:48:01 +0000
+ -- Brice Goglin <bgoglin@debian.org> Wed, 20 Jan 2010 23:51:26 +0100
xorg-server (2:1.7.4-1) unstable; urgency=low
commit 189f4bb9b941b4204d8e73ae8938d2509e76b474
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jan 20 23:48:12 2010 +0100
Add 05_only_call_gamma_set_if_nonnull.diff
diff --git a/debian/changelog b/debian/changelog
index bcdf3fa..32ed9f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ [ Brice Goglin ]
+ * Add 05_only_call_gamma_set_if_nonnull.diff to unbreak the nv driver,
+ closes: #564203.
+
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:48:01 +0000
xorg-server (2:1.7.4-1) unstable; urgency=low
diff --git a/debian/patches/05_only_call_gamma_set_if_nonnull.diff b/debian/patches/05_only_call_gamma_set_if_nonnull.diff
new file mode 100644
index 0000000..b1d00ba
--- /dev/null
+++ b/debian/patches/05_only_call_gamma_set_if_nonnull.diff
@@ -0,0 +1,25 @@
+Bug#564203
+
+From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001
+From: Michael Vogt <mvo@ubuntu.com>
+Date: Wed, 6 Jan 2010 14:40:34 +0100
+Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c:
+ - only call gamma_set if its non NULL
+
+---
+ hw/xfree86/modes/xf86Crtc.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index d015c6a..573fe96 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
+ }
+
+ /* Only upload when needed, to avoid unneeded delays. */
+- if (!crtc->active)
++ if (!crtc->active && crtc->funcs->gamma_set)
+ crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+ crtc->gamma_blue, crtc->gamma_size);
+
diff --git a/debian/patches/series b/debian/patches/series
index 7d97522..047e43d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
# 03 and 04 are backports from git master
03_fedora_glx_versioning.diff
04_fedora_glx14-swrast.diff
+05_only_call_gamma_set_if_nonnull.diff
#13_debian_add_xkbpath_env_variable.diff
11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
12-Add-libudev-input-hotplug-backend.diff
Reply to: