Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libdevil for openSUSE:Factory checked in at 2021-04-15 16:57:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdevil (Old) and /work/SRC/openSUSE:Factory/.libdevil.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdevil" Thu Apr 15 16:57:37 2021 rev:10 rq:885385 version:1.7.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libdevil/libdevil.changes 2019-09-13 15:00:03.177281646 +0200 +++ /work/SRC/openSUSE:Factory/.libdevil.new.12324/libdevil.changes 2021-04-15 16:58:19.994761256 +0200 @@ -1,0 +2,7 @@ +Wed Apr 14 10:43:09 UTC 2021 - pgaj...@suse.com +- +- added patches + fix build with openexr3 + + libdevil-openexr3.patch + +------------------------------------------------------------------- New: ---- libdevil-openexr3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdevil.spec ++++++ --- /var/tmp/diff_new_pack.LfTbmv/_old 2021-04-15 16:58:20.494762047 +0200 +++ /var/tmp/diff_new_pack.LfTbmv/_new 2021-04-15 16:58:20.498762053 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdevil # -# 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 @@ -35,6 +35,8 @@ Patch3: DevIL-%{version}-gcc5.patch # PATCH-FIX-UPSTREAM Patch4: jp2-remove-use-of-uchar-define.patch +# build with openexr3 +Patch5: libdevil-openexr3.patch BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel BuildRequires: SDL-devel @@ -70,7 +72,7 @@ %package tools Summary: Tools that can be used when using DevIL libraries -License: LGPL-2.1-only AND GPL-3.0-or-later +License: GPL-3.0-or-later AND LGPL-2.1-only Group: Development/Tools/Other Requires: libIL%{libIL} = %{version} @@ -86,7 +88,7 @@ Obsoletes: libdevil1 < %{version} %if 0%{?suse_version} Requires(post): %{install_info_prereq} -Requires(preun): %{install_info_prereq} +Requires(preun):%{install_info_prereq} %endif %description -n libIL%{libIL} @@ -126,6 +128,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p2 +%patch5 -p1 # FIXME: src-IL/src/il_wdp.c unclear license: https://jxrlib.codeplex.com can stand as replacement # make sure we don't compile this accidentally > src-IL/src/il_wdp.c ++++++ libdevil-openexr3.patch ++++++ Index: devil-1.7.8/src-IL/include/il_exr.h =================================================================== --- devil-1.7.8.orig/src-IL/include/il_exr.h 2009-03-08 08:10:08.000000000 +0100 +++ devil-1.7.8/src-IL/include/il_exr.h 2021-04-14 12:28:09.841522523 +0200 @@ -63,8 +63,8 @@ class ilIStream : public Imf::IStream virtual bool read (char c[/*n*/], int n); // I don't think I need this one, since we are taking care of the file handles ourselves. //virtual char * readMemoryMapped (int n); - virtual Imf::Int64 tellg (); - virtual void seekg (Imf::Int64 Pos); + virtual uint64_t tellg (); + virtual void seekg (uint64_t Pos); virtual void clear (); protected: @@ -79,8 +79,8 @@ class ilOStream : public Imf::OStream virtual void write (const char c[/*n*/], int n); // I don't think I need this one, since we are taking care of the file handles ourselves. //virtual char * readMemoryMapped (int n); - virtual Imf::Int64 tellp (); - virtual void seekp (Imf::Int64 Pos); + virtual uint64_t tellp (); + virtual void seekp (uint64_t Pos); protected: Index: devil-1.7.8/src-IL/src/il_exr.cpp =================================================================== --- devil-1.7.8.orig/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100 +++ devil-1.7.8/src-IL/src/il_exr.cpp 2021-04-14 12:28:09.841522523 +0200 @@ -143,9 +143,9 @@ bool ilIStream::read(char c[], int n) //@TODO: Make this work with 64-bit values. -Imf::Int64 ilIStream::tellg() +uint64_t ilIStream::tellg() { - Imf::Int64 Pos; + uint64_t Pos; // itell only returns a 32-bit value! Pos = itell(); @@ -156,7 +156,7 @@ Imf::Int64 ilIStream::tellg() // Note that there is no return value here, even though there probably should be. //@TODO: Make this work with 64-bit values. -void ilIStream::seekg(Imf::Int64 Pos) +void ilIStream::seekg(uint64_t Pos) { // iseek only uses a 32-bit value! iseek((ILint)Pos, IL_SEEK_SET); // I am assuming this is seeking from the beginning. @@ -309,9 +309,9 @@ void ilOStream::write(const char c[], in } //@TODO: Make this work with 64-bit values. -Imf::Int64 ilOStream::tellp() +uint64_t ilOStream::tellp() { - Imf::Int64 Pos; + uint64_t Pos; // itellw only returns a 32-bit value! Pos = itellw(); @@ -321,7 +321,7 @@ Imf::Int64 ilOStream::tellp() // Note that there is no return value here, even though there probably should be. //@TODO: Make this work with 64-bit values. -void ilOStream::seekp(Imf::Int64 Pos) +void ilOStream::seekp(uint64_t Pos) { // iseekw only uses a 32-bit value! iseekw((ILint)Pos, IL_SEEK_SET); // I am assuming this is seeking from the beginning.