libdrm: Changes to 'ubuntu'
debian/changelog | 10 ++++++++++
debian/patches/02_silent_master.diff | 20 ++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 31 insertions(+)
New commits:
commit a44318b409653aa36cca087b8c8354d79199d5fc
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Dec 14 11:56:17 2009 -0500
Import non-vcs release of 2.4.14-1ubuntu2.
diff --git a/debian/changelog b/debian/changelog
index d6e832a..b1180ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.14-1ubuntu2) lucid; urgency=low
+
+ * debian/patches/02_silent_master.diff:
+ - The library noisily writes to stderr every time the drm master
+ is set or dropped; this can have the side-effect that the kernel
+ repaints all of the console messages over top of whatever you
+ left on the screen. That's fugly.
+
+ -- Scott James Remnant <scott@ubuntu.com> Fri, 11 Dec 2009 04:24:50 +0000
+
libdrm (2.4.14-1ubuntu1) karmic; urgency=low
* Merge from Debian unstable. (LP: #446080)
diff --git a/debian/patches/02_silent_master.diff b/debian/patches/02_silent_master.diff
new file mode 100644
index 0000000..b4cc3db
--- /dev/null
+++ b/debian/patches/02_silent_master.diff
@@ -0,0 +1,20 @@
+diff -rup libdrm-2.4.14~/libdrm/xf86drm.c libdrm-2.4.14/libdrm/xf86drm.c
+--- libdrm-2.4.14~/libdrm/xf86drm.c 2009-07-10 04:17:53.000000000 +0100
++++ libdrm-2.4.14/libdrm/xf86drm.c 2009-12-11 04:22:07.094463655 +0000
+@@ -2498,7 +2498,6 @@ int drmSetMaster(int fd)
+ {
+ int ret;
+
+- fprintf(stderr,"Setting master \n");
+ ret = ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
+ return ret;
+ }
+@@ -2506,7 +2505,7 @@ int drmSetMaster(int fd)
+ int drmDropMaster(int fd)
+ {
+ int ret;
+- fprintf(stderr,"Dropping master \n");
++
+ ret = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
+ return ret;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..4c7eab0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_default_perms.diff
+02_silent_master.diff
Reply to: