- OpeneImageIO support requires at least c++14

- removed obsolete patches

diff --git a/OpenColorIO-cmake-dir.patch b/OpenColorIO-cmake-dir.patch
deleted file mode 100644 (file)
index 23e24dd..0000000
--- a/OpenColorIO-cmake-dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- OpenColorIO-1.1.0/CMakeLists.txt.orig      2018-06-26 20:01:54.413455888 +0200
-+++ OpenColorIO-1.1.0/CMakeLists.txt   2018-06-26 20:18:58.653444195 +0200
-@@ -600,7 +600,7 @@
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION lib${LIB_SUFFIX}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -612,7 +612,7 @@
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -650,4 +650,4 @@
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION lib${LIB_SUFFIX}/cmake/OpenColorIO)

diff --git a/OpenColorIO-disable-latex.patch b/OpenColorIO-disable-latex.patch
deleted file mode 100644 (file)
index e076e4e..0000000
--- a/OpenColorIO-disable-latex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- OpenColorIO-1.1.1/docs/CMakeLists.txt.orig 2019-04-03 18:36:15.424733746 +0200
-+++ OpenColorIO-1.1.1/docs/CMakeLists.txt      2019-04-03 20:59:12.768266291 +0200
-@@ -76,8 +76,7 @@
-         PATTERN .* EXCLUDE
- )
- 
--find_package(LATEX)
--if(PDFLATEX_COMPILER)
-+if(FALSE)
-     
-     add_custom_target(latex
-         COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex

diff --git a/OpenColorIO-no-Werror.patch b/OpenColorIO-no-Werror.patch
deleted file mode 100644 (file)
index ef80b4c..0000000
--- a/OpenColorIO-no-Werror.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- OpenColorIO-1.1.0/src/core/CMakeLists.txt.orig     2018-06-25 22:20:57.554347159 +0200
-+++ OpenColorIO-1.1.0/src/core/CMakeLists.txt  2018-06-25 22:21:19.001013583 +0200
-@@ -23,8 +23,6 @@
-     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-         set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
-     endif()
--else()
--    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
- 
- # SHARED
---- OpenColorIO-1.1.0/src/pyglue/CMakeLists.txt.orig   2018-01-05 02:38:27.000000000 +0100
-+++ OpenColorIO-1.1.0/src/pyglue/CMakeLists.txt        2018-06-25 22:20:32.314347449 +0200
-@@ -20,12 +20,6 @@
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")

diff --git a/OpenColorIO-oiio.patch b/OpenColorIO-oiio.patch
deleted file mode 100644 (file)
index e992038..0000000
--- a/OpenColorIO-oiio.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- OpenColorIO-1.1.0/CMakeLists.txt.orig      2018-06-26 19:16:47.136820152 +0200
-+++ OpenColorIO-1.1.0/CMakeLists.txt   2018-06-26 19:59:46.266790685 +0200
-@@ -460,7 +460,11 @@
- if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
- 
-     # Try to find OpenImageIO (OIIO) and OpenGL stuff
-+    if(DISABLE_OIIO)
-+        set(OIIO_FOUND FALSE)
-+    else()
-     OCIOFindOpenImageIO()
-+    endif()
-     
-     if(OIIO_FOUND)
-         add_subdirectory(src/apps/ocioconvert)

diff --git a/OpenColorIO-yaml-cpp.patch b/OpenColorIO-yaml-cpp.patch
deleted file mode 100644 (file)
index 80629bb..0000000
--- a/OpenColorIO-yaml-cpp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- OpenColorIO-1.1.0/src/core/OCIOYaml.cpp.orig       2018-01-05 02:38:27.000000000 +0100
-+++ OpenColorIO-1.1.0/src/core/OCIOYaml.cpp    2018-06-25 21:49:48.951035161 +0200
-@@ -30,7 +30,7 @@
- 
- #include <OpenColorIO/OpenColorIO.h>
- 
--#ifndef WIN32
-+#if 0
- 
- // fwd declare yaml-cpp visibility
- #pragma GCC visibility push(hidden)
---- OpenColorIO-1.1.0/CMakeLists.txt.orig      2018-06-26 05:31:36.084052127 +0200
-+++ OpenColorIO-1.1.0/CMakeLists.txt   2018-06-26 19:16:47.136820152 +0200
-@@ -271,7 +271,7 @@
-     mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
- 
-     if(YAML_CPP_FOUND)
--        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
-+        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0" AND YAML_CPP_VERSION VERSION_LESS "0.6.0")
-             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
-             # Don't bother doing this step if we are already including the boost headers for shared_ptr
-             if(NOT OCIO_USE_BOOST_PTR)

diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index f822302f83bc754451786faa558753cc8e4976c9..dfd2377d2ee772044727d0b28f014204349fcf6c 100644 (file)
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -22,11 +22,6 @@ Group:               Libraries
 #Source0Download: https://github.com/imageworks/OpenColorIO/releases
 Source0:       https://github.com/imageworks/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 604f562e073f23d88ce89ed4f7f709ba
-Patch4:                %{name}-yaml-cpp.patch
-Patch5:                %{name}-no-Werror.patch
-Patch6:                %{name}-oiio.patch
-Patch7:                %{name}-cmake-dir.patch
-Patch8:                %{name}-disable-latex.patch
 URL:           http://opencolorio.org/
 BuildRequires: Imath-devel >= 3.1.2
 BuildRequires: cmake >= 2.8
@@ -141,11 +136,6 @@ Wiązanie Pythona do biblioteki OpenColorIO.
 
 %prep
 %setup -q
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
 
 %build
 # required for cmake to find JNI headers/libs when lib64 is in use
@@ -153,10 +143,9 @@ Wiązanie Pythona do biblioteki OpenColorIO.
 
 install -d build
 cd build
-# yaml-cpp 0.6.x requires C++11
-CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %cmake .. \
        -DCMAKE_CONFIGURATION_TYPES=PLD \
+       -DCMAKE_CXX_STANDARD=14 \
        %cmake_on_off doc OCIO_BUILD_DOCS \
        %cmake_on_off java OCIO_BUILD_JAVA \
        %{!?with_oiio:-DDISABLE_OIIO=ON} \
@@ -204,6 +193,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ocioconvert
 %attr(755,root,root) %{_bindir}/ociolutimage
+%attr(755,root,root) %{_bindir}/ocioperf
 %endif
 
 %if %{with oiio} && %{with opengl}