Hello community, here is the log from the commit of package OpenImageIO for openSUSE:Factory checked in at 2016-06-19 12:53:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenImageIO (Old) and /work/SRC/openSUSE:Factory/.OpenImageIO.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenImageIO" Changes: -------- --- /work/SRC/openSUSE:Factory/OpenImageIO/OpenImageIO.changes 2016-03-29 09:56:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.OpenImageIO.new/OpenImageIO.changes 2016-06-19 12:53:08.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 17 15:11:15 UTC 2016 - normand@linux.vnet.ibm.com + +- Added oiio_gcc6_missleading_indentation.patch tracked upstream + https://github.com/OpenImageIO/oiio/pull/1436 + and remove just added flag. See boo#985370 +- Removed previous work around for the bug. + +------------------------------------------------------------------- +Fri Jun 17 14:57:11 UTC 2016 - davejplater@gmail.com + +- Fix gcc6 build with -Wno-error=misleading-indentation flag, see + boo#985370 + +------------------------------------------------------------------- New: ---- oiio_gcc6_missleading_indentation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenImageIO.spec ++++++ --- /var/tmp/diff_new_pack.Lck3a3/_old 2016-06-19 12:53:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Lck3a3/_new 2016-06-19 12:53:09.000000000 +0200 @@ -28,6 +28,7 @@ Source0: oiio-Release-%{version}.tar.bz2 Patch0: oiio-clusterfit-boundscheck.patch Patch1: oiio-detectplatform-others.patch +Patch2: oiio_gcc6_missleading_indentation.patch # NOTE: Please don't uncomment a build requirement unless you have submitted the package to factory and it exists #BuildRequires: Field3D-devel BuildRequires: OpenColorIO-devel @@ -122,6 +123,7 @@ %setup -q -n oiio-Release-%{version} %patch0 %patch1 +%patch2 -p1 # Make sure that bundled libraries are not used rm -f src/include/pugiconfig.hpp \ ++++++ oiio_gcc6_missleading_indentation.patch ++++++ --- src/dpx.imageio/libdpx/Writer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: oiio-Release-1.7.0dev/src/dpx.imageio/libdpx/Writer.cpp =================================================================== --- oiio-Release-1.7.0dev.orig/src/dpx.imageio/libdpx/Writer.cpp +++ oiio-Release-1.7.0dev/src/dpx.imageio/libdpx/Writer.cpp @@ -208,12 +208,12 @@ bool dpx::Writer::WriteElement(const int if (! this->WritePadData(0x2000)) return false; - // update file ptr - this->header.SetDataOffset(element, this->fileLoc); - this->fileLoc += count; - - // write - return (this->fd->Write(data, count) > 0); + // update file ptr + this->header.SetDataOffset(element, this->fileLoc); + this->fileLoc += count; + + // write + return (this->fd->Write(data, count) > 0); } @@ -244,9 +244,9 @@ bool dpx::Writer::WriteElement(const int return false; // The DPX spec recommends that the image data starts on a 8K boundry. - if (! this->WritePadData(0x2000)) + if (! this->WritePadData(0x2000)) { return false; - + } // mark location in headers if (element == 0) this->header.SetImageOffset(this->fileLoc);