[xorg-x11-drv-qxl/f14/master] - Fix notification bubbles under gnome not showing (backport from the surface-fixes branch)
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Oct 17 19:46:20 UTC 2010
commit c009dc08d2f17f721016301580402c0febb8b4bc
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sun Oct 17 21:47:58 2010 +0200
- Fix notification bubbles under gnome not showing (backport from the
surface-fixes branch)
qxl-fixes-from-surface-fixes-branch.patch | 77 +++++++++++++++++++++++++++++
xorg-x11-drv-qxl.spec | 8 +++-
2 files changed, 84 insertions(+), 1 deletions(-)
---
diff --git a/qxl-fixes-from-surface-fixes-branch.patch b/qxl-fixes-from-surface-fixes-branch.patch
new file mode 100644
index 0000000..8cb2920
--- /dev/null
+++ b/qxl-fixes-from-surface-fixes-branch.patch
@@ -0,0 +1,77 @@
+--- xf86-video-qxl-0.0.20.f14b/src/qxl_driver.c 2010-10-17 17:32:16.843699002 +0200
++++ xf86-video-qxl-0.0.20.f14b.new/src/qxl_driver.c 2010-10-17 17:29:54.379699004 +0200
+@@ -144,9 +144,9 @@
+ * device to dump everything
+ */
+ ram_header->update_area.top = 0;
+- ram_header->update_area.bottom = 1280;
++ ram_header->update_area.bottom = qxl->virtual_y;
+ ram_header->update_area.left = 0;
+- ram_header->update_area.right = 800;
++ ram_header->update_area.right = qxl->virtual_x;
+ ram_header->update_surface = 0; /* Only primary for now */
+
+ outb (qxl->io_base + QXL_IO_UPDATE_AREA, 0);
+@@ -1247,17 +1250,20 @@
+
+ pScreen->SaveScreen = qxl_blank_screen;
+
+- /* Note: this must be done before setup_uxa(), because it
+- * calls DamageSetup() which registers a pixmap private.
+- *
+- * That will trigger an assert if _dixInitPrivates has
+- * been called, which setup_uxa() eventually does.
+- */
++ setup_uxa (qxl, pScreen);
++
++ DamageSetup(pScreen);
++
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+ if (!miCreateDefColormap(pScreen))
+ goto out;
+-
+- setup_uxa (qxl, pScreen);
++
++ /* Note: this must be done after DamageSetup() because it calls
++ * _dixInitPrivates. And if that has been called, DamageSetup()
++ * will assert.
++ */
++ if (!uxa_resources_init (pScreen))
++ return FALSE;
+
+ qxl->create_screen_resources = pScreen->CreateScreenResources;
+ pScreen->CreateScreenResources = qxl_create_screen_resources;
+--- xf86-video-qxl-0.0.20.f14b/src/uxa/uxa.c 2010-10-17 17:32:16.792699002 +0200
++++ xf86-video-qxl-0.0.20.f14b.new/src/uxa/uxa.c 2010-10-17 17:29:54.380699002 +0200
+@@ -573,9 +572,6 @@
+ }
+ #endif
+
+- if (!uxa_glyphs_init(screen))
+- return FALSE;
+-
+ LogMessage(X_INFO,
+ "UXA(%d): Driver registered support for the following"
+ " operations:\n", screen->myNum);
+@@ -605,3 +601,11 @@
+ {
+ /*right now does nothing */
+ }
++
++Bool uxa_resources_init(ScreenPtr screen)
++{
++ if (!uxa_glyphs_init(screen))
++ return FALSE;
++
++ return TRUE;
++}
+--- xf86-video-qxl-0.0.20.f14b/src/uxa/uxa.h 2010-09-14 13:26:55.000000000 +0200
++++ xf86-video-qxl-0.0.20.f14b.new/src/uxa/uxa.h 2010-10-17 17:29:54.385699002 +0200
+@@ -558,6 +558,7 @@
+ uxa_driver_t *uxa_driver_alloc(void);
+
+ Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver);
++Bool uxa_resources_init(ScreenPtr screen);
+
+ void uxa_driver_fini(ScreenPtr pScreen);
+
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index 3791b48..5a2206a 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -5,7 +5,7 @@
Summary: Xorg X11 qxl video driver
Name: xorg-x11-drv-qxl
Version: 0.0.20.f14b
-Release: 6%{?dist}
+Release: 7%{?dist}
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
License: MIT
@@ -28,6 +28,7 @@ Patch5: 0005-Slightly-tweak-the-vfresh-range-of-the-default-monit.patch
Patch6: 0006-limit-calculated-virtual-size-to-fit-within-the-fram.patch
Patch7: 0007-Don-t-access-the-qxl-device-when-our-vt-is-not-focus.patch
Patch8: 0008-Fix-the-driver-crashing-qemu-on-32-bits.patch
+Patch9: qxl-fixes-from-surface-fixes-branch.patch
%description
@@ -44,6 +45,7 @@ X.Org X11 qxl video driver.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
%configure --disable-static
@@ -67,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/qxl_drv.so
%changelog
+* Sun Oct 17 2010 Hans de Goede <hdegoede at redhat.com> 0.0.20.f14b-7
+- Fix notification bubbles under gnome not showing (backport from the
+ surface-fixes branch)
+
* Sun Oct 17 2010 Hans de Goede <hdegoede at redhat.com> 0.0.20.f14b-6
- Fix a pointer casting bug which causes the qxl driver to trigger an
assertion in the qxl device terminating the entire virtual machine
More information about the scm-commits
mailing list