diff --git a/0001-audio-Do-not-volume-sync-without-audio.patch b/0001-audio-Do-not-volume-sync-without-audio.patch deleted file mode 100644 index 7a0dd1c..0000000 --- a/0001-audio-Do-not-volume-sync-without-audio.patch +++ /dev/null @@ -1,77 +0,0 @@ -From a99ed1524b075c0cd9e7d82e7877783a1e31d291 Mon Sep 17 00:00:00 2001 -From: Victor Toso -Date: Mon, 7 Sep 2015 10:17:34 +0200 -Subject: [spice-gtk] audio: Do not volume-sync without audio - -In case audio backend is not initialized correctly or there isn't audio -in the VM, we should not try to volume-sync. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1257210 ---- - src/channel-main.c | 6 ++++-- - src/spice-audio.c | 4 ++++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/channel-main.c b/src/channel-main.c -index f5115aa..145b081 100644 ---- a/src/channel-main.c -+++ b/src/channel-main.c -@@ -1159,7 +1159,8 @@ static void agent_sync_audio_playback(SpiceMainChannel *main_channel) - SpiceAudio *audio = spice_audio_get(session, NULL); - SpiceMainChannelPrivate *c = main_channel->priv; - -- if (!test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) || -+ if (audio == NULL || -+ !test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) || - c->agent_volume_playback_sync == TRUE) { - SPICE_DEBUG("%s - is not going to sync audio with guest", __func__); - return; -@@ -1215,7 +1216,8 @@ static void agent_sync_audio_record(SpiceMainChannel *main_channel) - SpiceAudio *audio = spice_audio_get(session, NULL); - SpiceMainChannelPrivate *c = main_channel->priv; - -- if (!test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) || -+ if (audio == NULL || -+ !test_agent_cap(main_channel, VD_AGENT_CAP_AUDIO_VOLUME_SYNC) || - c->agent_volume_record_sync == TRUE) { - SPICE_DEBUG("%s - is not going to sync audio with guest", __func__); - return; -diff --git a/src/spice-audio.c b/src/spice-audio.c -index ce191e1..3114a0a 100644 ---- a/src/spice-audio.c -+++ b/src/spice-audio.c -@@ -197,6 +197,7 @@ void spice_audio_get_playback_volume_info_async(SpiceAudio *audio, - GAsyncReadyCallback callback, - gpointer user_data) - { -+ g_return_if_fail(audio != NULL); - SPICE_AUDIO_GET_CLASS(audio)->get_playback_volume_info_async(audio, - cancellable, main_channel, callback, user_data); - } -@@ -208,6 +209,7 @@ gboolean spice_audio_get_playback_volume_info_finish(SpiceAudio *audio, - guint16 **volume, - GError **error) - { -+ g_return_val_if_fail(audio != NULL, FALSE); - return SPICE_AUDIO_GET_CLASS(audio)->get_playback_volume_info_finish(audio, - res, mute, nchannels, volume, error); - } -@@ -218,6 +220,7 @@ void spice_audio_get_record_volume_info_async(SpiceAudio *audio, - GAsyncReadyCallback callback, - gpointer user_data) - { -+ g_return_if_fail(audio != NULL); - SPICE_AUDIO_GET_CLASS(audio)->get_record_volume_info_async(audio, - cancellable, main_channel, callback, user_data); - } -@@ -229,6 +232,7 @@ gboolean spice_audio_get_record_volume_info_finish(SpiceAudio *audio, - guint16 **volume, - GError **error) - { -+ g_return_val_if_fail(audio != NULL, FALSE); - return SPICE_AUDIO_GET_CLASS(audio)->get_record_volume_info_finish(audio, - res, mute, nchannels, volume, error); - } --- -2.4.3 - diff --git a/0002-Send-monitor-config-if-at-least-one-monitor-has-dime.patch b/0002-Send-monitor-config-if-at-least-one-monitor-has-dime.patch deleted file mode 100644 index 601039d..0000000 --- a/0002-Send-monitor-config-if-at-least-one-monitor-has-dime.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 93792a366e8c3020fe735d1080aa2ce58a2d03fa Mon Sep 17 00:00:00 2001 -Message-Id: <93792a366e8c3020fe735d1080aa2ce58a2d03fa.1442072848.git.crobinso@redhat.com> -In-Reply-To: -References: -From: Pavel Grunt -Date: Fri, 10 Jul 2015 10:37:27 +0200 -Subject: [PATCH 2/2] Send monitor config if at least one monitor has - dimensions - -If a client (virt-manager, spicy) is not setting display dimensions -and the "resize-guest" property is disabled, spice-gtk sends a wrong -monitor config message where all the monitors have width = heigh = 0 -when the agent connects. This message can confuse the guest, in that -case the guest will change the resolution of its monitor. - -Regression since 28312b8d1e287a320851e8828825f2ca138d8b0b - -Resolves: -https://bugzilla.redhat.com/show_bug.cgi?id=1240721 -(cherry picked from commit 4b5e6ec2114e1250c81027ebeac9cfe8d059153f) ---- - src/channel-main.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/src/channel-main.c b/src/channel-main.c -index fbf7677..8a61379 100644 ---- a/src/channel-main.c -+++ b/src/channel-main.c -@@ -1411,6 +1411,22 @@ static void agent_clipboard_release(SpiceMainChannel *channel, guint selection) - agent_msg_queue(channel, VD_AGENT_CLIPBOARD_RELEASE, msgsize, msg); - } - -+static gboolean any_display_has_dimensions(SpiceMainChannel *channel) -+{ -+ SpiceMainChannelPrivate *c; -+ guint i; -+ -+ g_return_if_fail(SPICE_IS_MAIN_CHANNEL(channel)); -+ c = channel->priv; -+ -+ for (i = 0; i < MAX_DISPLAY; i++) { -+ if (c->display[i].width > 0 && c->display[i].height > 0) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - /* main context*/ - static gboolean timer_set_display(gpointer data) - { -@@ -1423,6 +1439,11 @@ static gboolean timer_set_display(gpointer data) - if (!c->agent_connected) - return FALSE; - -+ if (!any_display_has_dimensions(channel)) { -+ SPICE_DEBUG("Not sending monitors config, at least one monitor must have dimensions"); -+ return FALSE; -+ } -+ - session = spice_channel_get_session(SPICE_CHANNEL(channel)); - - /* ensure we have an explicit monitor configuration at least for --- -2.5.0 - diff --git a/sources b/sources index 07ca983..520278e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f84b8fd6a5e926dce07ec5ebb5f0caf3 spice-gtk-0.29.tar.bz2 +723e0e9ce9d507ba5d6cd331a3a9b7fb spice-gtk-0.30.tar.bz2 diff --git a/spice-gtk.spec b/spice-gtk.spec index 7c651c9..d5e4f3e 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -1,8 +1,8 @@ #define _version_suffix Name: spice-gtk -Version: 0.29 -Release: 4%{?dist} +Version: 0.30 +Release: 1%{?dist} Summary: A GTK+ widget for SPICE clients Group: System Environment/Libraries @@ -10,10 +10,6 @@ License: LGPLv2+ URL: http://spice-space.org/page/Spice-Gtk #VCS: git:git://anongit.freedesktop.org/spice/spice-gtk Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2 -Patch1: 0001-audio-Do-not-volume-sync-without-audio.patch -# Fix virt-manager default screen resolution and resolution across reboots -# Resolves: 1240721 -Patch2: 0002-Send-monitor-config-if-at-least-one-monitor-has-dime.patch BuildRequires: intltool BuildRequires: gtk2-devel >= 2.14 @@ -138,8 +134,6 @@ if [ -n '%{?_version_suffix}' ]; then fi pushd spice-gtk-%{version} -%patch1 -p1 -%patch2 -p1 find . -name '*.stamp' | xargs touch popd @@ -258,6 +252,9 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc %{_bindir}/spicy-stats %changelog +* Tue Oct 06 2015 Christophe Fergeau 0.30-1 +- Update to new 0.30 upstream release + * Sat Sep 12 2015 Cole Robinson 0.29-4 - Fix virt-manager default screen resolution and resolution across reboots - Resolves: rhbz#1240721