Hello community, here is the log from the commit of package freeimage for openSUSE:Factory checked in at 2020-08-28 21:12:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeimage (Old) and /work/SRC/openSUSE:Factory/.freeimage.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeimage" Fri Aug 28 21:12:32 2020 rev:8 rq:828999 version:3.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/freeimage/freeimage.changes 2020-06-02 14:32:40.862390357 +0200 +++ /work/SRC/openSUSE:Factory/.freeimage.new.3399/freeimage.changes 2020-08-28 21:12:42.080071992 +0200 @@ -1,0 +2,5 @@ +Mon Aug 24 15:35:55 UTC 2020 - Dirk Stoecker <opens...@dstoecker.de> + +- fix build with libraw 0.20 (libraw_0_20.patch) + +------------------------------------------------------------------- New: ---- libraw_0_20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeimage.spec ++++++ --- /var/tmp/diff_new_pack.U0cSAs/_old 2020-08-28 21:12:44.020072934 +0200 +++ /var/tmp/diff_new_pack.U0cSAs/_new 2020-08-28 21:12:44.024072936 +0200 @@ -23,8 +23,8 @@ Release: 0 Summary: Multi-format Image Decoder Library License: GPL-2.0-only OR GPL-3.0-only -URL: http://freeimage.sourceforge.net/ -Source0: http://downloads.sourceforge.net/freeimage/FreeImage%{tarver}.zip +URL: https://freeimage.sourceforge.net/ +Source0: https://downloads.sourceforge.net/freeimage/FreeImage%{tarver}.zip Patch0: unbundle.patch # PATCH-FIX-OPENSUSE doxygen.patch asterios.dra...@gmail.com -- Fix documentation building (Based on patch from Fedora) Patch1: doxygen.patch @@ -33,6 +33,8 @@ Patch4: freeimage-no-return-in-nonvoid.patch Patch5: CVE-2019-12211_2019-12213.patch Patch6: bigendian.patch +# PATCH-FIX-UPSTREAM: compile with libraw 0.20.0 - https://734724.bugs.gentoo.org/attachment.cgi?id=651956 +Patch7: libraw_0_20.patch BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: jxrlib-devel @@ -92,6 +94,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Remove bundled libs to make sure these don't get used during compile rm -rf Source/LibPNG/ Source/LibRawLite/ Source/OpenEXR/ Source/ZLib/ Source/LibOpenJPEG/ Source/LibJPEG/ ++++++ libraw_0_20.patch ++++++ Index: FreeImage/Source/FreeImage/PluginRAW.cpp =================================================================== --- FreeImage.orig/Source/FreeImage/PluginRAW.cpp +++ FreeImage/Source/FreeImage/PluginRAW.cpp @@ -63,17 +63,14 @@ public: } int read(void *buffer, size_t size, size_t count) { - if(substream) return substream->read(buffer, size, count); return _io->read_proc(buffer, (unsigned)size, (unsigned)count, _handle); } int seek(INT64 offset, int origin) { - if(substream) return substream->seek(offset, origin); return _io->seek_proc(_handle, (long)offset, origin); } INT64 tell() { - if(substream) return substream->tell(); return _io->tell_proc(_handle); } @@ -83,13 +80,11 @@ public: int get_char() { int c = 0; - if(substream) return substream->get_char(); if(!_io->read_proc(&c, 1, 1, _handle)) return -1; return c; } char* gets(char *buffer, int length) { - if (substream) return substream->gets(buffer, length); memset(buffer, 0, length); for(int i = 0; i < length; i++) { if(!_io->read_proc(&buffer[i], 1, 1, _handle)) @@ -104,7 +99,6 @@ public: std::string buffer; char element = 0; bool bDone = false; - if(substream) return substream->scanf_one(fmt,val); do { if(_io->read_proc(&element, 1, 1, _handle) == 1) { switch(element) { @@ -127,7 +121,6 @@ public: } int eof() { - if(substream) return substream->eof(); return (_io->tell_proc(_handle) >= _eof); }
