Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gli for openSUSE:Factory checked in at 2021-06-02 22:12:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gli (Old) and /work/SRC/openSUSE:Factory/.gli.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gli" Wed Jun 2 22:12:20 2021 rev:3 rq:896898 version:0.8.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gli/gli.changes 2019-08-27 10:24:46.495926025 +0200 +++ /work/SRC/openSUSE:Factory/.gli.new.1898/gli.changes 2021-06-02 22:12:46.060074847 +0200 @@ -1,0 +2,6 @@ +Wed Jun 2 11:18:23 UTC 2021 - Manfred Hollstein <[email protected]> + +- Backport 4ea121f: Fix ordered comparison of pointer and zero: + * gli-std::strstr.patch + +------------------------------------------------------------------- New: ---- gli-std::strstr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gli.spec ++++++ --- /var/tmp/diff_new_pack.bzLxNS/_old 2021-06-02 22:12:46.588073542 +0200 +++ /var/tmp/diff_new_pack.bzLxNS/_new 2021-06-02 22:12:46.592073531 +0200 @@ -1,7 +1,7 @@ # # spec file for package gli # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,7 @@ Source: https://github.com/g-truc/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE gli-cmake-config.patch -- Fix cmake config location Patch1: gli-cmake-config.patch +Patch2: gli-std::strstr.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: glm-devel @@ -80,6 +81,7 @@ %prep %setup -q %patch1 +%patch2 -p1 %build %if 0%{?suse_version} < 1500 ++++++ gli-std::strstr.patch ++++++ diff -rup gli-0.8.2.0.orig/manual.md gli-0.8.2.0/manual.md --- gli-0.8.2.0.orig/manual.md 2016-11-12 23:36:01.000000000 +0100 +++ gli-0.8.2.0/manual.md 2021-06-02 11:37:08.815699456 +0200 @@ -135,7 +135,7 @@ bool convert_rgb32f_rgb9e5(const char* F { 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)); diff -rup gli-0.8.2.0.orig/test/core/core_convert.cpp gli-0.8.2.0/test/core/core_convert.cpp --- gli-0.8.2.0.orig/test/core/core_convert.cpp 2016-11-12 23:36:01.000000000 +0100 +++ gli-0.8.2.0/test/core/core_convert.cpp 2021-06-02 11:37:18.087762356 +0200 @@ -32,7 +32,7 @@ bool convert_rgb32f_rgb9e5(const char* F { 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));
