Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -7,3 +7,4 @@
 /OpenColorIO-2.1.0.tar.gz
 /OpenColorIO-2.1.1.tar.gz
 /OpenColorIO-2.1.2.tar.gz
+/OpenColorIO-2.2.1.tar.gz

OpenColorIO.spec

@@ -4,18 +4,16 @@
 %endif
 
 Name:           OpenColorIO
-Version:        2.1.2
-Release:        4%{?dist}
+Version:        2.2.1
+Release:        2%{?dist}
 Summary:        Enables color transforms and image display across graphics apps
 
 License:        BSD
 URL:            http://opencolorio.org/
 Source0:        https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
 
-Patch0:         OCIO-strlen.patch
-
 # OIIO is only built for these arches due to Libraw
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8 && 0%{?rhel} < 9
 ExclusiveArch:  x86_64 ppc64le
 %endif
 
@@ -27,13 +25,14 @@ BuildRequires:  python3-markupsafe
 BuildRequires:  python3-setuptools
 
 # Libraries
-BuildRequires:  OpenEXR-devel
+BuildRequires:  cmake(OpenEXR)
 BuildRequires:  boost-devel
 BuildRequires:  expat-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  glew-devel
 BuildRequires:  libX11-devel libXmu-devel libXi-devel
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
+BuildRequires:  minizip-ng-devel >= 3.0.6
 BuildRequires:  opencv-devel
 BuildRequires:  pybind11-devel
 BuildRequires:  python3-devel
@@ -44,7 +43,7 @@ BuildRequires:  zlib-devel
 # WARNING: OpenColorIO and OpenImageIO are cross dependent.
 # If an ABI incompatible update is done in one, the other also needs to be
 # rebuilt.
-BuildRequires:  OpenImageIO-devel
+BuildRequires:  cmake(OpenImageIO)
 BuildRequires:  OpenImageIO-iv
 BuildRequires:  OpenImageIO-utils
 
@@ -52,7 +51,7 @@ BuildRequires:  OpenImageIO-utils
 # Unbundled libraries #
 #######################
 BuildRequires:  lcms2-devel
-BuildRequires:  yaml-cpp-devel >= 0.5.0
+BuildRequires:  yaml-cpp-devel >= 0.7.0
 
 %if 0%{?docs}
 BuildRequires:  doxygen
@@ -104,6 +103,9 @@ Development libraries and headers for %{name}.
 %prep
 %autosetup -p1 -n %{name}-%{version}%{?relcan:-rc%{relcan}}
 
+# Fedora maps minzip-ng back to minizip so work around it here:
+sed -i "s/minizip-ng/minizip/g" src/OpenColorIO/OCIOZArchive.cpp src/apps/ocioarchive/main.cpp
+
 
 %build
 %cmake -DCMAKE_CXX_STANDARD=14 \
@@ -114,6 +116,9 @@ Development libraries and headers for %{name}.
 %ifnarch x86_64
        -DOCIO_USE_SSE=OFF \
 %endif
+       -Dminizip-ng_LIBRARY=%{_libdir}/libminizip.so \
+	   -Dminizip-ng_INCLUDE_DIR=%{_includedir}/minizip \
+	   -Dminizip-ng_DIR=TRUE \
        -DOpenGL_GL_PREFERENCE=GLVND
 
 %cmake_build
@@ -126,14 +131,14 @@ Development libraries and headers for %{name}.
 find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
 
 # Generate man pages
-pushd %{__cmake_builddir}/src/apps
-mkdir -p %{buildroot}%{_mandir}/man1
-for app in ociobakelut ociocheck ociochecklut ocioconvert ociolutimage ociomakeclf ocioperf ociowrite; do \
-help2man -N -s 1 %{?fedora:--version-string=%{version}} \
-         -o %{buildroot}%{_mandir}/man1/$app.1 \
-         $app/$app
-done
-popd
+#pushd %{__cmake_builddir}/src/apps
+#mkdir -p %{buildroot}%{_mandir}/man1
+#for app in ociobakelut ociocheck ociochecklut ocioconvert ociolutimage ociomakeclf ocioperf ociowrite; do \
+#help2man -N -s 1 %{?fedora:--version-string=%{version}} \
+#         -o %{buildroot}%{_mandir}/man1/$app.1 \
+#         $app/$app
+#done
+#popd
 
 
 %check
@@ -154,7 +159,7 @@ popd
 %files tools
 %{_bindir}/*
 %{_datadir}/ocio/
-%{_mandir}/man1/*
+#{_mandir}/man1/*
 
 %if 0%{?docs}
 %files doc
@@ -169,6 +174,19 @@ popd
 
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 12 2023 Richard Shaw <hobbes1069@gmail.com> - 2.2.1-1
+- Update to 2.2.1.
+
+* Tue Nov 15 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-5.1
+- Rebuild post OIIO bootstrap.
+
+* Mon Nov 14 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-5
+- Rebuild for yaml-cpp 0.7.0.
+- Disable BR for OIIO to bootstrap.
+
 * Fri Oct 07 2022 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-4
 - Rebuild for OpenImageIO 2.4.4.2.
 

sources

@@ -1 +1 @@
-SHA512 (OpenColorIO-2.1.2.tar.gz) = 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
+SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9