summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-05-11 19:21:40 +0000
committerArmin Kuster <akuster808@gmail.com>2018-05-17 08:32:26 -0700
commitd182f4170fc133d088c9abe338dceded9faf2d38 (patch)
treed96ec13e75c11f3d626318c6f2a440c43253a6af /meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch
parentb379fcebf988b1c37950e10fa32fa0ffccd61013 (diff)
downloadmeta-openembedded-d182f4170fc133d088c9abe338dceded9faf2d38.tar.gz
spice: upgrade to 0.13.90 version
* 0.13.0 is needed for opengl support, see qemu commit: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=474114b7305cc1be7c2ee8ba5267be159a9d56e3 +# if SPICE_SERVER_VERSION >= 0x000d00 /* release 0.13.0 */ +# define HAVE_SPICE_GL 1 otherwise trying to run qemu with -spice gl=on fails with: qemu-system-x86_64: -spice gl=on: Invalid parameter 'gl' * spice-protocol is built separately since 0.12.6 * spice-protocol submodule has been removed,, spice-protocol must now be installed when building spice-server * celt051 is optional since 0.12.5, use PACKAGECONFIG for it * Added Opus support. Celt support will be obsoleted in a future release. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch')
-rw-r--r--meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch b/meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch
deleted file mode 100644
index 7fcafdc7ef..0000000000
--- a/meta-networking/recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From 9f001b6818ac4baa1df010ccf4200ca56bfb11b2 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Wed, 23 Aug 2017 13:47:29 -0400
4Subject: [PATCH] Fix build issues with gcc 7
5
6gcc 7 checks for when a switch statement doesn't break between
7cases. When a break is not found you will see
8
9| ../../git/server/reds.c: In function 'vdi_port_read_one_msg_from_device':
10| ../../git/server/reds.c:797:31: error: this statement may fall through [-Werror=implicit-fallthrough=]
11| state->read_state = VDI_PORT_READ_STATE_GET_BUFF;
12| ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13| ../../git/server/reds.c:798:9: note: here
14| case VDI_PORT_READ_STATE_GET_BUFF: {
15| ^~~~
16
17The 'fallthrough' comment will let gcc know this is done on purpose.
18
19Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
20---
21 server/inputs_channel.c | 1 +
22 server/reds.c | 2 ++
23 2 files changed, 3 insertions(+)
24
25diff --git a/server/inputs_channel.c b/server/inputs_channel.c
26index 931dac1..534ab66 100644
27--- a/server/inputs_channel.c
28+++ b/server/inputs_channel.c
29@@ -321,6 +321,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui
30 activate_modifiers_watch();
31 }
32 }
33+ /* fallthrough */
34 case SPICE_MSGC_INPUTS_KEY_UP: {
35 SpiceMsgcKeyDown *key_down = (SpiceMsgcKeyDown *)buf;
36 for (i = 0; i < 4; i++) {
37diff --git a/server/reds.c b/server/reds.c
38index 30d0652..8c80eb6 100644
39--- a/server/reds.c
40+++ b/server/reds.c
41@@ -795,6 +795,7 @@ static SpiceCharDeviceMsgToClient *vdi_port_read_one_msg_from_device(SpiceCharDe
42 }
43 state->message_recive_len = state->vdi_chunk_header.size;
44 state->read_state = VDI_PORT_READ_STATE_GET_BUFF;
45+ /* fallthrough */
46 case VDI_PORT_READ_STATE_GET_BUFF: {
47 if (!(state->current_read_buf = vdi_port_read_buf_get())) {
48 return NULL;
49@@ -806,6 +807,7 @@ static SpiceCharDeviceMsgToClient *vdi_port_read_one_msg_from_device(SpiceCharDe
50 state->message_recive_len -= state->recive_len;
51 state->read_state = VDI_PORT_READ_STATE_READ_DATA;
52 }
53+ /* fallthrough */
54 case VDI_PORT_READ_STATE_READ_DATA:
55 n = sif->read(vdagent, state->recive_pos, state->recive_len);
56 if (!n) {
57--
582.7.4
59