[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#655318: marked as done (cherrypick upstream patch to fix drawing bugs (and add -dbg pkg))

Your message dated Thu, 02 Feb 2012 16:35:46 +0000
with message-id <E1RszdS-0000rB-9n@franck.debian.org>
and subject line Bug#655318: fixed in xserver-xorg-video-qxl 0.0.16-2
has caused the Debian Bug report #655318,
regarding cherrypick upstream patch to fix drawing bugs (and add -dbg pkg)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
655318: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655318
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: xserver-xorg-video-qxl
Version: 0.0.16-1

Hi,

using certain window managers over spice, we found corrupted
drawables
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-qxl/+bug/913314
and xorg segfaults
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-qxl/+bug/913311
Cherrypicking upstream commit id c77ba9f217093f946a4c6bf6edf9f34b24844d8d
fixes both.  The following patch does that, as well as adding a -dbg
package (which helped track down the needed patch).

(it also updates the maintainer which you obviously do not want for
the debian package, sorry about that.)

thanks,
-serge

============================= Debdiff: =================================
diff -Nru xserver-xorg-video-qxl-0.0.16/debian/changelog xserver-xorg-video-qxl-0.0.16/debian/changelog
--- xserver-xorg-video-qxl-0.0.16/debian/changelog	2011-11-12 00:16:28.000000000 +0100
+++ xserver-xorg-video-qxl-0.0.16/debian/changelog	2012-01-10 11:34:59.000000000 +0100
@@ -1,3 +1,15 @@
+xserver-xorg-video-qxl (0.0.16-1ubuntu2) precise; urgency=low
+
+  * add translate-the-access-region.patch.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Tue, 10 Jan 2012 11:34:13 +0100
+
+xserver-xorg-video-qxl (0.0.16-1ubuntu1) precise; urgency=low
+
+  * Add a debug package.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Tue, 10 Jan 2012 11:28:58 +0100
+
 xserver-xorg-video-qxl (0.0.16-1) unstable; urgency=low
 
   [ Liang Guo ]
diff -Nru xserver-xorg-video-qxl-0.0.16/debian/control xserver-xorg-video-qxl-0.0.16/debian/control
--- xserver-xorg-video-qxl-0.0.16/debian/control	2011-09-17 15:45:28.000000000 +0200
+++ xserver-xorg-video-qxl-0.0.16/debian/control	2012-01-10 11:29:21.000000000 +0100
@@ -1,7 +1,8 @@
 Source: xserver-xorg-video-qxl
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Liang Guo <bluestonechina@gmail.com>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  debhelper (>= 8),
@@ -39,3 +40,17 @@
  <URL:http://www.X.org>
  .
  This package is built from the X.org xf86-video-qxl driver module.
+
+Package: xserver-xorg-video-qxl-dbg
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-video-qxl (= ${binary:Version})
+Section: debug
+Description: X.Org X server -- QXL display driver
+ This package provides the driver for QXL video device, i.e. if Linux is 
+ running inside a RedHat Enterprise Virtualization (RHEV) environment, or
+ other SPICE-compatible KVM/Qemu emulator. 
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package contains the debugging symbols
diff -Nru xserver-xorg-video-qxl-0.0.16/debian/patches/series xserver-xorg-video-qxl-0.0.16/debian/patches/series
--- xserver-xorg-video-qxl-0.0.16/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ xserver-xorg-video-qxl-0.0.16/debian/patches/series	2012-01-10 11:34:09.000000000 +0100
@@ -0,0 +1 @@
+translate-the-access-region.patch
diff -Nru xserver-xorg-video-qxl-0.0.16/debian/patches/translate-the-access-region.patch xserver-xorg-video-qxl-0.0.16/debian/patches/translate-the-access-region.patch
--- xserver-xorg-video-qxl-0.0.16/debian/patches/translate-the-access-region.patch	1970-01-01 01:00:00.000000000 +0100
+++ xserver-xorg-video-qxl-0.0.16/debian/patches/translate-the-access-region.patch	2012-01-10 11:34:00.000000000 +0100
@@ -0,0 +1,48 @@
+commit c77ba9f217093f946a4c6bf6edf9f34b24844d8d
+Author: Søren Sandmann <ssp@redhat.com>
+Date:   Fri Oct 28 12:56:30 2011 -0400
+
+    Translate the access region according to the drawable offset.
+    
+    The driver code expects to be given coordinates relative to the
+    offscreen pixmap.
+
+diff --git a/src/uxa/uxa.c b/src/uxa/uxa.c
+index 83e06cc..9d02e34 100644
+--- a/src/uxa/uxa.c
++++ b/src/uxa/uxa.c
+@@ -143,19 +143,19 @@ Bool uxa_prepare_access(DrawablePtr pDrawable, RegionPtr region, uxa_access_t ac
+ {
+ 	ScreenPtr pScreen = pDrawable->pScreen;
+ 	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+-	PixmapPtr pPixmap = uxa_get_drawable_pixmap(pDrawable);
+-	Bool offscreen = uxa_pixmap_is_offscreen(pPixmap);
++	int xoff, yoff;
++	PixmapPtr pPixmap = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff);
+ 	BoxRec box;
+ 	RegionRec region_rec;
+ 	Bool result;
+ 
+-	if (!offscreen)
++	if (!pPixmap)
+ 	    return TRUE;
+ 
+ 	box.x1 = 0;
+ 	box.y1 = 0;
+-	box.x2 = pPixmap->drawable.width;
+-	box.y2 = pPixmap->drawable.height;
++	box.x2 = pDrawable->width;
++	box.y2 = pDrawable->height;
+ 	
+ 	REGION_INIT (pScreen, &region_rec, &box, 1);
+ 	if (!region)
+@@ -168,7 +168,8 @@ Bool uxa_prepare_access(DrawablePtr pDrawable, RegionPtr region, uxa_access_t ac
+ 	 */
+ 	REGION_INTERSECT (pScreen, region, region, &region_rec);
+ #endif
+-	
++	REGION_TRANSLATE (pScreen, region, xoff, yoff);
++
+ 	result = TRUE;
+ 
+ 	if (uxa_screen->info->prepare_access)
diff -Nru xserver-xorg-video-qxl-0.0.16/debian/rules xserver-xorg-video-qxl-0.0.16/debian/rules
--- xserver-xorg-video-qxl-0.0.16/debian/rules	2011-09-17 15:45:28.000000000 +0200
+++ xserver-xorg-video-qxl-0.0.16/debian/rules	2012-01-10 11:10:15.000000000 +0100
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+.PHONY: override_dh_strip
+override_dh_strip:
+	dh_strip --dbg-package=xserver-xorg-video-qxl-dbg
+
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp

--- End Message ---
--- Begin Message --- 
Source: xserver-xorg-video-qxl
Source-Version: 0.0.16-2

We believe that the bug you reported is fixed in the latest version of
xserver-xorg-video-qxl, which is due to be installed in the Debian FTP archive:

xserver-xorg-video-qxl-dbg_0.0.16-2_amd64.deb
  to main/x/xserver-xorg-video-qxl/xserver-xorg-video-qxl-dbg_0.0.16-2_amd64.deb
xserver-xorg-video-qxl_0.0.16-2.debian.tar.gz
  to main/x/xserver-xorg-video-qxl/xserver-xorg-video-qxl_0.0.16-2.debian.tar.gz
xserver-xorg-video-qxl_0.0.16-2.dsc
  to main/x/xserver-xorg-video-qxl/xserver-xorg-video-qxl_0.0.16-2.dsc
xserver-xorg-video-qxl_0.0.16-2_amd64.deb
  to main/x/xserver-xorg-video-qxl/xserver-xorg-video-qxl_0.0.16-2_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 655318@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Liang Guo <bluestonechina@gmail.com> (supplier of updated xserver-xorg-video-qxl package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 01 Feb 2012 18:01:19 +0800
Source: xserver-xorg-video-qxl
Binary: xserver-xorg-video-qxl xserver-xorg-video-qxl-dbg
Architecture: source amd64
Version: 0.0.16-2
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Liang Guo <bluestonechina@gmail.com>
Description: 
 xserver-xorg-video-qxl - X.Org X server -- QXL display driver
 xserver-xorg-video-qxl-dbg - X.Org X server -- QXL display drive (debugging symbols)r
Closes: 655318
Changes: 
 xserver-xorg-video-qxl (0.0.16-2) unstable; urgency=low
 .
   [Serge Hallyn]
   * Add translate-the-access-region.patch(Closes: #655318)
   * Add debug package
Checksums-Sha1: 
 2067b01a7f2bc32cd568b21b8c0b3a561e667139 1835 xserver-xorg-video-qxl_0.0.16-2.dsc
 91a1cc01f0706a2305c1c54262675b49d4f06081 4621 xserver-xorg-video-qxl_0.0.16-2.debian.tar.gz
 d22e8673f37b408a460301c394b61f0661393272 92176 xserver-xorg-video-qxl_0.0.16-2_amd64.deb
 9ab307c5ade5b0afcf5a9c731235a662c21c17eb 278658 xserver-xorg-video-qxl-dbg_0.0.16-2_amd64.deb
Checksums-Sha256: 
 0fa2e461f64bca8cd9e1e2199d8a28a5cd8b284d1f57a8b5a68162ce407374ff 1835 xserver-xorg-video-qxl_0.0.16-2.dsc
 68316630e899f32093ae41633669ffe80bd44e1fb994c924d2ba129b08f961f9 4621 xserver-xorg-video-qxl_0.0.16-2.debian.tar.gz
 5db92b7e052deb2cd01983458ed714b77da34c53b148e9597207eeb5f3e74325 92176 xserver-xorg-video-qxl_0.0.16-2_amd64.deb
 a33afb1b3b4ae087036ecca7dc971136e594654df5102596e7b826e1fa0ec324 278658 xserver-xorg-video-qxl-dbg_0.0.16-2_amd64.deb
Files: 
 73a10147a05f33dc42ceb34851030229 1835 x11 optional xserver-xorg-video-qxl_0.0.16-2.dsc
 63385d7f30037f613c85a9435c6afcc7 4621 x11 optional xserver-xorg-video-qxl_0.0.16-2.debian.tar.gz
 a509c2ff2e76e1bc748a0d71f39729b8 92176 x11 optional xserver-xorg-video-qxl_0.0.16-2_amd64.deb
 ac4f88b9f0176163a329c07faef2de60 278658 debug extra xserver-xorg-video-qxl-dbg_0.0.16-2_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk8qZ/sACgkQeGfVPHR5Nd0FFACghfPiNDxhVaVh2nsjgQuJb7Ep
x/gAn0od5twmUGmLtozNy+7gFm0KQgoj
=40NN
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: