From f41b25b2d1d1e1e7614925e59210d70e650b7a72 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Thu, 29 Jun 2017 17:49:19 +0800 Subject: spice: Fix compilation error | ../../git/server/red_parse_qxl.c:367:18: error: 'BITMAP_FMT_IS_RGB' defined but not used [-Werror=unused-const-variable=] | static const int BITMAP_FMT_IS_RGB[] = {0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1}; Signed-off-by: He Zhe Signed-off-by: Bruce Ashfield --- ...xl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch | 29 ++++++++++++++++++++++ recipes-support/spice/spice_git.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 recipes-support/spice/files/0001-red_parse_qxl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch (limited to 'recipes-support/spice') diff --git a/recipes-support/spice/files/0001-red_parse_qxl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch b/recipes-support/spice/files/0001-red_parse_qxl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch new file mode 100644 index 0000000..ccae5f5 --- /dev/null +++ b/recipes-support/spice/files/0001-red_parse_qxl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch @@ -0,0 +1,29 @@ +From 85838d4c9f2322aedb99b38fffd7da95a494d8ed Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Thu, 29 Jun 2017 08:26:35 +0000 +Subject: [PATCH] red_parse_qxl: Fix BITMAP_FMT_IS_RGB defined but not used + +| ../../git/server/red_parse_qxl.c:367:18: error: 'BITMAP_FMT_IS_RGB' +defined but not used [-Werror=unused-const-variable=] +| static const int BITMAP_FMT_IS_RGB[] = {0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1}; + +Signed-off-by: He Zhe +--- + server/red_parse_qxl.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c +index 6c0b0658..cfc2da95 100644 +--- a/server/red_parse_qxl.c ++++ b/server/red_parse_qxl.c +@@ -364,7 +364,6 @@ static int bitmap_consistent(SpiceBitmap *bitmap) + + // This is based on SPICE_BITMAP_FMT_*, copied from server/red_worker.c + // to avoid a possible unoptimization from making it non static. +-static const int BITMAP_FMT_IS_RGB[] = {0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1}; + + static SpiceImage *red_get_image(RedMemSlotInfo *slots, int group_id, + QXLPHYSICAL addr, uint32_t flags, int is_mask) +-- +2.11.0 + diff --git a/recipes-support/spice/spice_git.bb b/recipes-support/spice/spice_git.bb index 828087a..6f1be3a 100644 --- a/recipes-support/spice/spice_git.bb +++ b/recipes-support/spice/spice_git.bb @@ -35,6 +35,7 @@ SRC_URI += " \ file://spice-fix-CVE-2013-4282.patch \ file://configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch \ file://build-allow-separated-src-and-build-dirs.patch \ + file://0001-red_parse_qxl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf