xserver-xorg-video-qxl: Changes to 'debian-unstable'
debian/changelog | 8 ++++
debian/control | 12 ++++++
debian/patches/series | 1
debian/patches/translate-the-access-region.diff | 48 ++++++++++++++++++++++++
debian/rules | 4 ++
5 files changed, 73 insertions(+)
New commits:
commit ef7eaac7c11bffd6ca91ec1aa82d54526e6afbd8
Author: Liang Guo <bluestonechina@gmail.com>
Date: Thu Feb 2 15:28:34 2012 +0800
Refresh debian/control
diff --git a/debian/control b/debian/control
index 56fcf1b..d3446d5 100644
--- a/debian/control
+++ b/debian/control
@@ -44,12 +44,10 @@ 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
+Priority: extra
+Description: X.Org X server -- QXL display drive (debugging symbols)r
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
+ This package contains the debugging symbols for this driver
commit fa38c6c350f25c05ea2ba378ad323e5b04821b24
Author: Liang Guo <bluestonechina@gmail.com>
Date: Wed Feb 1 18:11:55 2012 +0800
Fix bug 655318
diff --git a/debian/changelog b/debian/changelog
index cd33224..62817b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-qxl (0.0.16-2) unstable; urgency=low
+
+ [Serge Hallyn]
+ * Add translate-the-access-region.patch(Closes: #655318)
+ * Add debug package
+
+ -- Liang Guo <bluestonechina@gmail.com> Wed, 01 Feb 2012 18:01:19 +0800
+
xserver-xorg-video-qxl (0.0.16-1) unstable; urgency=low
[ Liang Guo ]
diff --git a/debian/control b/debian/control
index c3ad5eb..56fcf1b 100644
--- a/debian/control
+++ b/debian/control
@@ -39,3 +39,17 @@ Description: X.Org X server -- QXL display driver
<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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..07222c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+translate-the-access-region.diff
diff --git a/debian/patches/translate-the-access-region.diff b/debian/patches/translate-the-access-region.diff
new file mode 100644
index 0000000..7c2800a
--- /dev/null
+++ b/debian/patches/translate-the-access-region.diff
@@ -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, ®ion_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, ®ion_rec);
+ #endif
+-
++ REGION_TRANSLATE (pScreen, region, xoff, yoff);
++
+ result = TRUE;
+
+ if (uxa_screen->info->prepare_access)
diff --git a/debian/rules b/debian/rules
index 3d192dc..1cb9c56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
Reply to: