From 8a577fa7cf54db646f4e61f383390054e5f04ca3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Sep 2015 22:12:46 +0000 Subject: directfb: Avoid using VLAs and printf formats These are not portable features and are flagged by clang Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- meta/recipes-graphics/directfb/directfb.inc | 4 +- ...direct-Aboid-usng-VLAs-and-printf-formats.patch | 61 ++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 4fbca878ef..446aaeadb4 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,7 +14,9 @@ DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ file://configurefix.patch \ file://fusion.patch \ - file://bashism.patch" + file://bashism.patch \ + file://0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch \ + " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch b/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch new file mode 100644 index 0000000000..76e0f75303 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch @@ -0,0 +1,61 @@ +From f43ef44806ffb8e3b35d99070dde9b6cc1714d3d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Sep 2015 21:32:20 +0000 +Subject: [PATCH] gfx,direct: Aboid usng VLAs and printf formats + +VLAs are flagged by clang when using non-POD types, therefore replace +the usage with alloca which is exact same allocation on stack + + __attribute__((__format__ (__printf__))) is not portable as used here + therefore disable the check for clang here, we lose no functionality + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + lib/direct/util.h | 2 +- + src/gfx/util.cpp | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/direct/util.h b/lib/direct/util.h +index 72941e9..8e7fa4a 100644 +--- a/lib/direct/util.h ++++ b/lib/direct/util.h +@@ -98,7 +98,7 @@ + #define D_CONST_FUNC + #endif + +-#if __GNUC__ >= 3 ++#if __GNUC__ >= 3 && !defined __clang__ + #define D_FORMAT_PRINTF(n) __attribute__((__format__ (__printf__, n, n+1))) + #define D_FORMAT_VPRINTF(n) __attribute__((__format__ (__printf__, n, 0))) + #else +diff --git a/src/gfx/util.cpp b/src/gfx/util.cpp +index 40032bc..d1015d4 100644 +--- a/src/gfx/util.cpp ++++ b/src/gfx/util.cpp +@@ -294,8 +294,8 @@ dfb_gfx_copy_regions_stereo( CoreSurface *source, + { + unsigned int i, n = 0; + DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; +- DFBRectangle rects[num]; +- DFBPoint points[num]; ++ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); ++ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); + + for (i=0; iconfig.size.w, source->config.size.h }; +- DFBRectangle rects[num]; +- DFBPoint points[num]; ++ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); ++ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); + CoreGraphicsStateClient *client = _client ? _client : &StateClient::Get()->client; + CardState *state = client->state; + CardState backup; +-- +2.5.1 + -- cgit 1.2.3-korg