+++ /dev/null
---- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt.orig 2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt 2011-11-26 09:02:29.701499722 +0100
-@@ -1,5 +1,3 @@
- add_oiio_plugin (dpxinput.cpp dpxoutput.cpp
-- libdpx/DPX.cpp libdpx/OutStream.cpp libdpx/RunLengthEncoding.cpp
-- libdpx/Codec.cpp libdpx/Reader.cpp libdpx/Writer.cpp libdpx/DPXHeader.cpp
-- libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp
-- LINK_LIBRARIES ${OPENEXR_LIBRARIES})
-+ libdpx/DPXColorConverter.cpp
-+ LINK_LIBRARIES dpx)
---- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp.orig 2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp 2011-11-26 09:03:24.121501545 +0100
-@@ -28,7 +28,7 @@
- (This is the Modified BSD License)
- */
-
--#include "libdpx/DPX.h"
-+#include <DPX.h>
- #include "libdpx/DPXColorConverter.h"
-
- #include "typedesc.h"
-@@ -499,7 +499,7 @@
- case dpx::k1125LineProgressive169AR:
- tmpstr = "YCbCr 1125p, 16:9 (SMPTE 274M)";
- break;
-- case dpx::k255:
-+ case 255:
- // don't set the attribute at all
- break;
- default:
---- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp.orig 2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp 2011-11-26 09:03:35.934835274 +0100
-@@ -33,7 +33,7 @@
- #include <cmath>
- #include <boost/algorithm/string.hpp>
-
--#include "libdpx/DPX.h"
-+#include <DPX.h>
- #include "libdpx/DPXColorConverter.h"
-
- #include "typedesc.h"
---- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h.orig 2011-11-05 08:35:00.000000000 +0100
-+++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h 2011-11-26 09:05:17.444838673 +0100
-@@ -37,7 +37,7 @@
- #define _DPX_COLORCONVERTER_H 1
-
-
--#include "DPX.h"
-+#include <DPX.h>
-
-
- namespace dpx
Summary: Library for reading and writing images
Summary(pl.UTF-8): Biblioteka do odczytu i zapisu obrazów
Name: OpenImageIO
-Version: 1.7.11
-Release: 6
+Version: 2.0.7
+Release: 1
License: BSD
Group: Libraries
Source0: https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: bd9338d99dff81f238e17d78c333a85e
+# Source0-md5: 3d722173d84cc705f4aead0679fa2393
Patch0: %{name}-link.patch
Patch1: %{name}-system-squish.patch
-Patch2: %{name}-system-dpx.patch
-Patch3: %{name}-system-libcineon.patch
-Patch4: ffmpeg4.patch
+Patch2: %{name}-system-libcineon.patch
+Patch3: no-clang-format.patch
URL: https://sites.google.com/site/openimageio/home
BuildRequires: Field3D-devel
%{?with_ocio:BuildRequires: OpenColorIO-devel}
BuildRequires: boost-devel >= 1.35
BuildRequires: boost-python-devel >= 1.35
BuildRequires: cmake >= 2.6
-BuildRequires: dpx-devel
BuildRequires: ffmpeg-devel
BuildRequires: giflib-devel
BuildRequires: glew-devel >= 1.5.1
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
-BuildRequires: openjpeg-devel
+BuildRequires: openjpeg2-devel
BuildRequires: ptex-devel >= 2.1
BuildRequires: pugixml-devel
BuildRequires: python-devel >= 1:2.6
+BuildRequires: python-pybind11
+BuildRequires: robin-map-devel
BuildRequires: squish-devel >= 1.10
%{?with_tbb:BuildRequires: tbb-devel}
BuildRequires: txt2man
Wiązanie Pythona do biblioteki OpenImageIO.
%prep
-%setup -q -n %{name}-oiio-6950fb8
+%setup -q -n %{name}-oiio-7f79c70
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%{__rm} -r src/dds.imageio/squish
# when using system pugixml, don't use hacked headers
%build
install -d build
cd build
-CXXFLAGS="%{rpmcxxflags} -std=c++11" \
%cmake ../ \
%ifarch i386 i486
-DNOTHREADS=1 \
%endif
-DEMBEDPLUGINS=OFF \
- -DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-1.5 \
+ -DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-2.3 \
-DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
-DLIB_INSTALL_DIR:PATH=%{_libdir} \
-DPYLIB_INSTALL_DIR=%{py_sitedir} \
-DPYTHON_VERSION=%{py_ver} \
-DUSE_EXTERNAL_PUGIXML=ON \
-DSTOP_ON_WARNING=OFF \
+ -DPYBIND11_HOME:PATH=%{py_incdir} \
+ -DCMAKE_INSTALL_MANDIR=%{_mandir}/man1 \
%{!?with_ocio:-DUSE_OCIO=OFF} \
%{!?with_tbb:-DUSE_TBB=OFF}
# name clash with iv
%{__mv} $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{iv,oiiv}.1
# installed as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/OpenImageIO
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES.md CREDITS.md LICENSE README.md
+%doc CHANGES.md CREDITS.md LICENSE.md README.md
%attr(755,root,root) %{_bindir}/iconvert
%attr(755,root,root) %{_bindir}/idiff
%attr(755,root,root) %{_bindir}/igrep
%attr(755,root,root) %{_bindir}/maketx
%attr(755,root,root) %{_bindir}/oiiotool
%attr(755,root,root) %{_libdir}/libOpenImageIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.7
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.2.0
%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.1.7
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.2.0
%attr(755,root,root) %{_libdir}/bmp.imageio.so
%attr(755,root,root) %{_libdir}/fits.imageio.so
%attr(755,root,root) %{_libdir}/hdr.imageio.so
%attr(755,root,root) %{_libdir}/softimage.imageio.so
%attr(755,root,root) %{_libdir}/targa.imageio.so
%attr(755,root,root) %{_libdir}/zfile.imageio.so
+%attr(755,root,root) %{_libdir}/dicom.imageio.so
+%attr(755,root,root) %{_libdir}/null.imageio.so
%{_mandir}/man1/iconvert.1*
%{_mandir}/man1/idiff.1*
%{_mandir}/man1/igrep.1*
%attr(755,root,root) %{_libdir}/libOpenImageIO.so
%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so
%{_includedir}/OpenImageIO
+%{_pkgconfigdir}/OpenImageIO.pc
+%{_datadir}/cmake/Modules/FindOpenImageIO.cmake
%files plugin-cineon
%defattr(644,root,root,755)
%files iv
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/oiiv
+%{_mandir}/man1/oiiv.1*
%files -n python-OpenImageIO
%defattr(644,root,root,755)
--- /dev/null
+--- OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake~ 2019-04-01 07:28:42.000000000 +0200
++++ OpenImageIO-oiio-7f79c70/src/cmake/compiler.cmake 2019-04-21 11:32:25.692670361 +0200
+@@ -338,32 +338,6 @@
+ # Hint: run with CLANG_TIDY_ARGS=-list-checks to list all the checks
+ endif ()
+
+-# clang-format
+-find_program (CLANG_FORMAT_EXE
+- NAMES clang-format bin/clang-format
+- HINTS ${CLANG_FORMAT_EXE_HINT} ENV CLANG_FORMAT_EXE_HINT
+- ENV LLVM_DIRECTORY
+- NO_DEFAULT_PATH
+- DOC "Path to clang-format executable")
+-find_program (CLANG_FORMAT_EXE NAMES clang-format bin/clang-format)
+-if (CLANG_FORMAT_EXE)
+- message (STATUS "clang-format found: ${CLANG_FORMAT_EXE}")
+- # Start with the list of files to include when formatting...
+- file (GLOB_RECURSE FILES_TO_FORMAT ${CLANG_FORMAT_INCLUDES})
+- # ... then process any list of excludes we are given
+- foreach (_pat ${CLANG_FORMAT_EXCLUDES})
+- file (GLOB_RECURSE _excl ${_pat})
+- list (REMOVE_ITEM FILES_TO_FORMAT ${_excl})
+- endforeach ()
+- #message (STATUS "clang-format file list: ${FILES_TO_FORMAT}")
+- file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format
+- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+- add_custom_target (clang-format
+- COMMAND "${CLANG_FORMAT_EXE}" -i -style=file ${FILES_TO_FORMAT} )
+-else ()
+- message (STATUS "clang-format not found.")
+-endif ()
+-
+
+ if (EXTRA_CPP_ARGS)
+ message (STATUS "Extra C++ args: ${EXTRA_CPP_ARGS}")