Hello community, here is the log from the commit of package OpenImageIO for openSUSE:Factory checked in at 2017-04-12 17:34:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenImageIO (Old) and /work/SRC/openSUSE:Factory/.OpenImageIO.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenImageIO" Wed Apr 12 17:34:27 2017 rev:9 rq:484395 version:1.7.13 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenImageIO/OpenImageIO.changes 2017-02-07 12:02:16.299771767 +0100 +++ /work/SRC/openSUSE:Factory/.OpenImageIO.new/OpenImageIO.changes 2017-04-12 17:59:21.333001847 +0200 @@ -1,0 +2,43 @@ +Sun Apr 2 08:21:20 UTC 2017 - [email protected] + +- Update to release 1.7.13 +- Fix gcc7 build with the following build flags: + -Wno-error=maybe-uninitialized -Wno-error=noexcept-type + -Wno-error=format-truncation= and -Wno-error=aligned-new= +- Rebased oiio_gcc6_missleading_indentation.patch +- Upstream changes since 1.7.11: + * TIFF, JPEG, others: Improved reading Exif meatdata from XMP + blocks, now it does a better job of discerning the proper data + types. #1627 + * RAW: The default value for missing "raw:use_camera_matrix" has + been changed to 1 (not 0) to better match default behavior of + libraw/dcraw. #1629 + * RAW: Add support for selecting new demosaicing algorithms: + "DMT" (mode 11) and "AAHD" (mode 12). Renamed the "Modified AHD" + to "AHD-Mod" to simplify and match libraw terminology. Made + matching of demosaicing algorithms case-insensitive. #1629 + * RAW: Support "ACES" color space for direct conversion while + reading RAW images (supported in libraw 0.18 or newer). #1626 + * oiiotool: Improved error reporting of file open errors when + -iconfig is used. #1626 + * oiiotool `--echo STRING` prints the string to the console. This + can contain expressions! So you can do something like oiiotool + file.exr -echo "Size is {TOP.width}x{TOP.height}" #1633 + * JPEG: Be more reslient to malformed Exif data blocks with bogus + offsets. #1585, #1639 + * TIFF output omitted setting the "Make" and "Model" metadata tags. + #1642 + * webp: Several new sanity checks prevent the webp reader from + spending too much I/O time and memory reading bogus files + (malformed, corrupted, or not a webp after all). #1640 + * PSD: Support has been added for "cmyk", "multichannel", and + "grayscale" color modes. And support was fixed for rgb and + grayscale 32 bit per sample bit depth. #1641 + * BMP: add support for version 5 headers. #1616 + * TIFF: Fix typo that prevented correct reading of some Exif + fields. #1625 + * ImageBuf: Fix broken threads(n) method, which didn't correctly + pass the right number of threads along. #1622. + * Fix build warnings about undefined OIIO_MSVS_AT_LEAST_2013 symbol. + +------------------------------------------------------------------- Old: ---- oiio-Release-1.7.0dev.tar.bz2 New: ---- oiio-Release-1.7.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenImageIO.spec ++++++ --- /var/tmp/diff_new_pack.WzMJIM/_old 2017-04-12 17:59:23.508694157 +0200 +++ /var/tmp/diff_new_pack.WzMJIM/_new 2017-04-12 17:59:23.508694157 +0200 @@ -15,17 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define _rev 280d10045d4f6670ecb94c97b55f59db07a8961c %define so_ver 1_7 +%global gccv %(gcc -dumpversion) Name: OpenImageIO -Version: 1.7.0dev +Version: 1.7.13 Release: 0 Summary: Library for Reading and Writing Images License: BSD-3-Clause Group: Productivity/Graphics/Other Url: http://www.openimageio.org/ #DL-URL: https://github.com/OpenImageIO/oiio/archive/Release-%%{version}/OpenImageIO-%%{version}.tar.gz -Source0: oiio-Release-%{version}.tar.bz2 + +Source0: https://github.com/OpenImageIO/oiio/archive/Release-%{version}.tar.gz#/oiio-Release-%{version}.tar.gz Patch0: oiio-clusterfit-boundscheck.patch Patch1: oiio-detectplatform-others.patch Patch2: oiio_gcc6_missleading_indentation.patch @@ -44,6 +46,7 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: freetype2-devel +BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: glew-devel BuildRequires: hdf5-devel @@ -130,7 +133,8 @@ %setup -q -n oiio-Release-%{version} %patch0 %patch1 -%patch2 -p1 +%patch2 -p0 +echo "gcc version %{gccv}" # Make sure that bundled libraries are not used rm -f src/include/pugiconfig.hpp \ @@ -143,8 +147,23 @@ %define pwd $OIIOINC %define oiioinclude %{pwd}/src/include echo %{pwd} +%if 1 == 0 +%define gcc_version 7 +export CC=gcc-7 +export CPP=cpp-7 +export CXX=g++-7 +%else +export CC=gcc +export CPP=cpp +export CXX=g++ +%endif export CFLAGS="%{optflags}" +%if 0%{?gcc_version} >= 7 +#This host of flags to allow oiio to build with gcc7 are the result of oiio being built with -Werror" +export CXXFLAGS="%{optflags} -Wno-error=maybe-uninitialized -Wno-error=noexcept-type -Wno-error=format-truncation= -Wno-error=aligned-new=" +%else export CXXFLAGS="%{optflags}" +%endif mkdir -p build cd build cmake \ @@ -165,8 +184,9 @@ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DUSE_OPENCV:BOOL=OFF \ .. -make %{?_smp_mflags} VERBOSE=1 || \ -make -j1 VERBOSE=1 +make %{?_smp_mflags} VERBOSE=1 +#|| \ +#make -j1 VERBOSE=1 cd .. make %{?_smp_mflags} doxygen @@ -193,7 +213,7 @@ %files %defattr(-,root,root,-) -%doc CHANGES CREDITS LICENSE README.rst +%doc CHANGES.md CREDITS.md LICENSE README.md %{_bindir}/* %dir %{_datadir}/fonts/oiio %{_datadir}/fonts/oiio/DroidSans-Bold.ttf @@ -210,19 +230,19 @@ %files devel %defattr(-,root,root,-) %doc %{_docdir}/%{name}-devel/ -%{_includedir}/OpenImageIO/ +%{_includedir}/%{name}/ %{_libdir}/*.so -%files -n libOpenImageIO%{so_ver} +%files -n lib%{name}%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libOpenImageIO.so.* +%{_libdir}/lib%{name}.so.* -%files -n libOpenImageIO_Util%{so_ver} +%files -n lib%{name}_Util%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libOpenImageIO_Util.so.* +%{_libdir}/lib%{name}_Util.so.* -%files -n python-OpenImageIO +%files -n python-%{name} %defattr(-,root,root,-) -%{python_sitearch}/OpenImageIO.so +%{python_sitearch}/%{name}.so %changelog ++++++ oiio_gcc6_missleading_indentation.patch ++++++ --- /var/tmp/diff_new_pack.WzMJIM/_old 2017-04-12 17:59:23.548688501 +0200 +++ /var/tmp/diff_new_pack.WzMJIM/_new 2017-04-12 17:59:23.552687935 +0200 @@ -2,13 +2,13 @@ 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 +Index: 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 +--- src/dpx.imageio/libdpx/Writer.cpp.orig 2017-03-31 09:14:21.850540237 +0200 ++++ src/dpx.imageio/libdpx/Writer.cpp 2017-03-31 09:16:22.031055455 +0200 @@ -208,12 +208,12 @@ bool dpx::Writer::WriteElement(const int - if (! this->WritePadData(0x2000)) - return false; + if (! this->WritePadData(0x2000)) + return false; - // update file ptr - this->header.SetDataOffset(element, this->fileLoc); @@ -25,15 +25,3 @@ } -@@ -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);
