[fedora-virt-maint] rpms/qemu/F-11 qemu-disable-copyrect-encoding.patch, NONE, 1.1 qemu.spec, 1.107, 1.108

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5083

Modified Files:
	qemu.spec 
Added Files:
	qemu-disable-copyrect-encoding.patch 
Log Message:
* Fri Oct 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-9
- Disable the vnc CopyRect encoding since it's still broken (#503156)


qemu-disable-copyrect-encoding.patch:
 vnc.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE qemu-disable-copyrect-encoding.patch ---
>From 1df8bf2b825dafd9b3c0ea24af184db988fc0741 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 23 Oct 2009 13:41:52 +0100
Subject: [PATCH] Disable the vnc CopyRect encoding

Our CopyRect implementation seems to be broken still:

  https://bugzilla.redhat.com/503156

Let's just disable it until someone has a chance to debug further.

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-disable-copyrect-encoding.patch
---
 vnc.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/vnc.c b/vnc.c
index 119c982..508f40d 100644
--- a/vnc.c
+++ b/vnc.c
@@ -1499,7 +1499,14 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
             vs->vnc_encoding = enc;
             break;
         case VNC_ENCODING_COPYRECT:
+            /* Our CopyRect handling still seems to be broken, see:
+             *
+             *  https://bugzilla.redhat.com/503156
+             *
+             */
+#ifdef FIXME
             vs->features |= VNC_FEATURE_COPYRECT_MASK;
+#endif
             break;
         case VNC_ENCODING_HEXTILE:
             vs->features |= VNC_FEATURE_HEXTILE_MASK;
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- qemu.spec	19 Oct 2009 10:33:43 -0000	1.107
+++ qemu.spec	23 Oct 2009 12:48:18 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -38,6 +38,7 @@ Patch17: qemu-use-statfs-to-determine-hu
 Patch18: qemu-allow-pulseaudio-to-be-the-default.patch
 Patch19: qemu-fix-virtio-net-gso-support.patch
 Patch20: qemu-fix-msr-count-potential-segfault.patch
+Patch21: qemu-disable-copyrect-encoding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -245,6 +246,7 @@ such as kvmtrace and kvm_stat.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -487,6 +489,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Oct 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-9
+- Disable the vnc CopyRect encoding since it's still broken (#503156)
+
 * Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-8
 - Fix potential segfault from too small MSR_COUNT (#528901)