public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Orion Poplawski <orion@nwra.com>
To: git-commits@fedoraproject.org
Subject: [rpms/OpenColorIO] epel9: Revert to 2.1.2
Date: Sun, 07 Jun 2026 22:25:55 GMT	[thread overview]
Message-ID: <178087115578.1.7924059429067870117.rpms-OpenColorIO-8991ed5cdeba@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/OpenColorIO
Branch : epel9
Commit : 8991ed5cdebade3ee5811d36bf7eaa8a8fcb4073
Author : Orion Poplawski <orion@nwra.com>
Date   : 2026-06-07T16:13:03-06:00
Stats  : +34/-135 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/OpenColorIO/c/8991ed5cdebade3ee5811d36bf7eaa8a8fcb4073?branch=epel9

Log:
Revert to 2.1.2

---
diff --git a/OCIO-strlen.patch b/OCIO-strlen.patch
new file mode 100644
index 0000000..094c46c
--- /dev/null
+++ b/OCIO-strlen.patch
@@ -0,0 +1,12 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>

diff --git a/OpenColorIO-mzver.patch b/OpenColorIO-mzver.patch
deleted file mode 100644
index 3be84fc..0000000
--- a/OpenColorIO-mzver.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up OpenColorIO-2.3.2/src/apps/ocioarchive/main.cpp.mzver OpenColorIO-2.3.2/src/apps/ocioarchive/main.cpp
---- OpenColorIO-2.3.2/src/apps/ocioarchive/main.cpp.mzver	2024-02-14 19:52:58.342003757 -0700
-+++ OpenColorIO-2.3.2/src/apps/ocioarchive/main.cpp	2024-03-03 18:07:39.405984145 -0700
-@@ -235,7 +235,7 @@ int main(int argc, const char **argv)
-         }
- 
-         std::string path = args[0];
--#if MZ_VERSION_BUILD >= 040000
-+#if MZ_VERSION_BUILD >= 0x40000
-         reader = mz_zip_reader_create();
- #else
-         mz_zip_reader_create(&reader);
-diff -up OpenColorIO-2.3.2/src/OpenColorIO/OCIOZArchive.cpp.mzver OpenColorIO-2.3.2/src/OpenColorIO/OCIOZArchive.cpp
---- OpenColorIO-2.3.2/src/OpenColorIO/OCIOZArchive.cpp.mzver	2024-02-14 19:52:58.342003757 -0700
-+++ OpenColorIO-2.3.2/src/OpenColorIO/OCIOZArchive.cpp	2024-03-03 18:08:27.921308017 -0700
-@@ -226,7 +226,7 @@ void archiveConfig(std::ostream & ostrea
-     std::string configStr = ss.str();
- 
-     // Write zip to memory stream.
--#if MZ_VERSION_BUILD >= 040000
-+#if MZ_VERSION_BUILD >= 0x40000
-     write_mem_stream = mz_stream_mem_create();
- #else
-     mz_stream_mem_create(&write_mem_stream);
-@@ -242,7 +242,7 @@ void archiveConfig(std::ostream & ostrea
-     options.compress_level  = ArchiveCompressionLevels::BEST;
- 
-     // Create the writer handle.
--#if MZ_VERSION_BUILD >= 040000
-+#if MZ_VERSION_BUILD >= 0x40000
-     archiver = mz_zip_writer_create();
- #else
-     mz_zip_writer_create(&archiver);
-@@ -341,7 +341,7 @@ void ExtractOCIOZArchive(const char * ar
-     std::string outputDestination = pystring::os::path::normpath(destination);
- 
-     // Create zip reader.
--#if MZ_VERSION_BUILD >= 040000
-+#if MZ_VERSION_BUILD >= 0x40000
-     extracter = mz_zip_reader_create();
- #else
-     mz_zip_reader_create(&extracter);
-@@ -463,7 +463,7 @@ std::vector<uint8_t> getFileStringFromAr
-     std::vector<uint8_t> buffer;
- 
-     // Create the reader object.
--#if MZ_VERSION_BUILD >= 040000
-+#if MZ_VERSION_BUILD >= 0x40000
-     reader = mz_zip_reader_create();
- #else
-     mz_zip_reader_create(&reader);
-@@ -527,7 +527,7 @@ void getEntriesMappingFromArchiveFile(co
-     void *reader = NULL;
- 
-     // Create the reader object.
--#if MZ_VERSION_BUILD >= 040000
-+#if MZ_VERSION_BUILD >= 0x40000
-     reader = mz_zip_reader_create();
- #else
-     mz_zip_reader_create(&reader);

diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index 4244189..f46820f 100644
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -6,19 +6,15 @@
 %endif
 
 Name:           OpenColorIO
-Version:        2.3.2
-Release:        3%{?dist}
+Version:        2.1.2
+Release:        4%{?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
-# Change MZ_VERSION_BUILD to hex
-# https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1954
-Patch0:         OpenColorIO-mzver.patch
 
-# OpenVDB no longer builds on i686
-ExcludeArch:    i686
+Patch0:         OCIO-strlen.patch
 
 # OIIO is only built for these arches due to Libraw
 %if 0%{?rhel} >= 8 && 0%{?rhel} < 9
@@ -29,19 +25,16 @@ ExclusiveArch:  x86_64 ppc64le
 BuildRequires:  cmake gcc-c++
 BuildRequires:  help2man
 BuildRequires:  python3
-BuildRequires:  python3-distutils-extra
 BuildRequires:  python3-markupsafe
 BuildRequires:  python3-setuptools
 
 # Libraries
-BuildRequires:  cmake(OpenEXR)
+BuildRequires:  OpenEXR-devel
 BuildRequires:  boost-devel
 BuildRequires:  expat-devel
 BuildRequires:  glew-devel
-BuildRequires:  imath-devel
 BuildRequires:  libX11-devel libXmu-devel libXi-devel
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
-BuildRequires:  minizip-ng-compat-devel >= 3.0.6
 BuildRequires:  opencv-devel
 BuildRequires:  pybind11-devel
 BuildRequires:  python3-devel
@@ -53,11 +46,18 @@ BuildRequires:  freeglut-devel
 BuildRequires:  openshadinglanguage-devel
 %endif
 
+# 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:  OpenImageIO-iv
+BuildRequires:  OpenImageIO-utils
+
 #######################
 # Unbundled libraries #
 #######################
 BuildRequires:  lcms2-devel
-BuildRequires:  yaml-cpp-devel >= 0.7.0
+BuildRequires:  yaml-cpp-devel >= 0.5.0
 
 %if 0%{?docs}
 BuildRequires:  doxygen
@@ -109,9 +109,6 @@ 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 \
@@ -122,9 +119,6 @@ sed -i "s/minizip-ng/minizip/g" src/OpenColorIO/OCIOZArchive.cpp src/apps/ocioar
 %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
@@ -137,14 +131,14 @@ sed -i "s/minizip-ng/minizip/g" src/OpenColorIO/OCIOZArchive.cpp src/apps/ocioar
 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
@@ -160,12 +154,12 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
 %doc CHANGELOG.md COMMITTERS.md CONTRIBUTING.md GOVERNANCE.md PROCESS.md
 %doc README.md SECURITY.md THIRD-PARTY.md
 %{_libdir}/*.so.*
-%{python3_sitearch}/PyOpenColorIO/
+%{python3_sitearch}/*.so
 
 %files tools
 %{_bindir}/*
 %{_datadir}/ocio/
-#{_mandir}/man1/*
+%{_mandir}/man1/*
 
 %if 0%{?docs}
 %files doc
@@ -180,53 +174,6 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
 
 
 %changelog
-* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 2.3.2-3
-- Rebuilt for Python 3.13
-
-* Tue May 07 2024 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.2-2
-- Rebuild for pystring soname bump
-
-* Sun Mar 03 2024 Orion Poplawski <orion@nwra.com> - 2.3.2-1
-- Update to 2.3.2
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jan 18 2024 Richard Shaw <hobbes1069@gmail.com> - 2.2.1-8
-- Rebuild for OIIO 2.5.6.
-
-* Mon Jan 01 2024 Richard Shaw <hobbes1069@gmail.com> - 2.2.1-7
-- Rebuild for OpenImageIO 2.5.x.
-
-* Mon Dec 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2.2.1-6
-- Rebuilt for minizip-ng transition Fedora change
-- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 2.2.1-4
-- Rebuilt for Python 3.12
-
-* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 2.2.1-3
-- Bootstrap for Python 3.12
-
-* 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.
 

                 reply	other threads:[~2026-06-07 22:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178087115578.1.7924059429067870117.rpms-OpenColorIO-8991ed5cdeba@fedoraproject.org \
    --to=orion@nwra.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox