MIRRORS/meta-freescale-distro
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-distro.git synced 2025-10-22 23:13:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

gli: backport upstream patches to resolve gcc11 build

Browse Source 
According to the GCC11 Porting Guide [1], error is issued on ordered
pointer comparison with integer which causes the following build
failure:

| test/core/core_convert.cpp:35:85: error: ordered comparison of pointer with integer zero ('const char*' and 'int')
|    35 |         if(std::strstr(FilenameDst, ".dds") > 0 || std::strstr(FilenameDst, ".ktx") > 0)
|       |                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~

Backport upstream patch to correct the ordered comparison.

Link: [1] https://gcc.gnu.org/gcc-11/porting_to.html
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
This commit is contained in:
Andrey Zhizhikin 2021-05-05 10:20:55 +00:00 committed by Otavio Salvador
parent b0ab9f02cf
commit 36264e4abf
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-graphics/gli/gli/0001-Fix-ordered-comparison-of-pointer-and-zero.patch Normal file
View File

@ -0,0 +1,26 @@
From 4ea121f3a2af89e39d6fe703c9040ad254d816b2 Mon Sep 17 00:00:00 2001
From: "Peter Hille (png!das-system)" <peter@das-system-networks.de>
Date: Tue, 28 Aug 2018 15:34:05 +0200
Subject: [PATCH] Fix ordered comparison of pointer and zero
Upstream-Status: Backport [https://github.com/g-truc/gli/commit/4ea121f3a2af89e39d6fe703c9040ad254d816b2]
---
test/core/core_convert.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/core/core_convert.cpp b/test/core/core_convert.cpp
index 7a4366c6..38297186 100644
--- a/test/core/core_convert.cpp
+++ b/test/core/core_convert.cpp
@@ -33,7 +33,7 @@ bool convert_rgb32f_rgb9e5(const char* FilenameSrc, const char* FilenameDst)
{
if(FilenameDst == NULL)
return false;
- if(std::strstr(FilenameDst, ".dds") > 0 || std::strstr(FilenameDst, ".ktx") > 0)
+ if(std::strstr(FilenameDst, ".dds") != nullptr || std::strstr(FilenameDst, ".ktx") != nullptr)
return false;
gli::texture2d TextureSource(gli::load(FilenameSrc));
--
2.17.1

1
recipes-graphics/gli/gli_0.8.2.0.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://readme.md;beginline=19;endline=20;md5=ab03b667ee630c1
SRC_URI = " \
git://github.com/g-truc/gli;branch=0.8.2 \
file://0001-Set-C-standard-through-CMake-standard-options.patch \
file://0001-Fix-ordered-comparison-of-pointer-and-zero.patch \
"
SRCREV = "30808550a20ca53a255e6e1e77070493eda7b736"
S = "${WORKDIR}/git"