Compare commits

...

10 Commits

Author SHA1 Message Date
David Abdurachmanov fdb0c9daf2
Bootstrap for Python 3.12 (riscv64)
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-12-06 19:44:23 +02:00
Lukas Javorsky ceb6f89bc1 Rebuilt for minizip-ng transition Fedora change
Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
2023-12-04 16:39:42 +00:00
Richard Shaw 7a7e9b9439 Remove old patches. 2023-07-31 21:21:46 -05:00
Fedora Release Engineering 61d05ee3be Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 11:19:43 +00:00
Python Maint 1e1dc74ea3 Rebuilt for Python 3.12 2023-07-03 19:47:10 +02:00
Python Maint f4c2a79657 Bootstrap for Python 3.12 2023-07-03 14:12:00 +02:00
Miro Hrončok 4fa8c4dad7 Bring in imath-devel even without OpenImageIO 2023-06-14 17:52:42 +02:00
Miro Hrončok dac3001480 Make the tests and docs condition actually meaningful
We want to avoid them when bootstrapping even on non %rhel.
2023-06-14 17:42:36 +02:00
Miro Hrončok 77beb2190f Allow a Python bootstrap, avoid a self dependency loop 2023-06-14 15:27:14 +00:00
Richard Shaw 9f43492800 Add upstream patch for Doxygen issue. 2023-06-14 09:26:00 -05:00
3 changed files with 207 additions and 15 deletions

View File

@ -0,0 +1,182 @@
From 94da59daeb4647faa9b134665ad156f37cfa021d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Achard?= <remiachard@gmail.com>
Date: Tue, 30 May 2023 19:33:25 +0100
Subject: [PATCH] Fix documentation build on Doxygen 1.9.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémi Achard <remiachard@gmail.com>
---
include/OpenColorIO/OpenColorIO.h | 29 ++++++----------------------
include/OpenColorIO/OpenColorTypes.h | 25 +++++-------------------
2 files changed, 11 insertions(+), 43 deletions(-)
Index: OpenColorIO-2.2.1/include/OpenColorIO/OpenColorIO.h
===================================================================
--- OpenColorIO-2.2.1.orig/include/OpenColorIO/OpenColorIO.h
+++ OpenColorIO-2.2.1/include/OpenColorIO/OpenColorIO.h
@@ -722,11 +722,8 @@ public:
const char * getRoleColorSpace(int index) const;
/**
- * \defgroup Methods related to displays and views.
- * @{
- */
-
- /**
+ * Methods related to displays and views.
+ *
* The following methods only manipulate active displays and views. Active
* displays and views are defined from an env. variable or from the config file.
*
@@ -843,11 +840,8 @@ public:
/// Clear all the displays.
void clearDisplays();
- /** @} */
-
/**
- * \defgroup Methods related to the Virtual Display.
- * @{
+ * Methods related to the Virtual Display.
*
* ... (See descriptions for the non-virtual methods above.)
*
@@ -927,8 +921,6 @@ public:
*/
int instantiateDisplayFromICCProfile(const char * ICCProfileFilepath);
- /** @} */
-
/**
* \brief
*
@@ -1076,8 +1068,7 @@ public:
void clearViewTransforms();
/**
- * \defgroup Methods related to named transforms.
- * @{
+ * Methods related to named transforms.
*/
/**
@@ -1120,8 +1111,6 @@ public:
/// Clear all named transforms.
void clearNamedTransforms();
- /** @} */
-
//
// File Rules
//
@@ -2031,8 +2020,7 @@ private:
const Impl * getImpl() const { return m_impl; }
};
-/** \defgroup ColorSpaceSetOperators
- * @{
+/** ColorSpaceSetOperators
*/
/**
@@ -2072,8 +2060,6 @@ extern OCIOEXPORT ConstColorSpaceSetRcPt
extern OCIOEXPORT ConstColorSpaceSetRcPtr operator-(const ConstColorSpaceSetRcPtr & lcss,
const ConstColorSpaceSetRcPtr & rcss);
-/** @}*/
-
//
// Look
@@ -3649,8 +3635,7 @@ public:
virtual bool isSupported() const noexcept = 0;
/**
- * \defgroup Methods to access some information of the attached and active monitors.
- * @{
+ * Methods to access some information of the attached and active monitors.
*/
/// Get the number of active monitors reported by the operating system.
@@ -3667,8 +3652,6 @@ public:
/// Get the ICC profile path associated to the monitor.
virtual const char * getProfileFilepath(size_t idx) const = 0;
- /** @} */
-
protected:
SystemMonitors() = default;
virtual ~SystemMonitors() = default;
Index: OpenColorIO-2.2.1/include/OpenColorIO/OpenColorTypes.h
===================================================================
--- OpenColorIO-2.2.1.orig/include/OpenColorIO/OpenColorTypes.h
+++ OpenColorIO-2.2.1/include/OpenColorIO/OpenColorTypes.h
@@ -726,8 +726,7 @@ extern OCIOEXPORT ExposureContrastStyle
extern OCIOEXPORT const char * NegativeStyleToString(NegativeStyle style);
extern OCIOEXPORT NegativeStyle NegativeStyleFromString(const char * style);
-/** \defgroup Env. variables.
- * @{
+/** Env. variables.
*
* These environmental variables are used by the OpenColorIO library.
* For variables that allow specifying more than one token, they should be separated by commas.
@@ -776,10 +775,7 @@ extern OCIOEXPORT const char * OCIO_OPTI
*/
extern OCIOEXPORT const char * OCIO_USER_CATEGORIES_ENVVAR;
-/** @}*/
-
-/** \defgroup VarsRoles
- * @{
+/** VarsRoles
*/
// TODO: Move to .rst
@@ -852,10 +848,7 @@ extern OCIOEXPORT const char * ROLE_INTE
*/
extern OCIOEXPORT const char * ROLE_INTERCHANGE_DISPLAY;
-/** @}*/
-
-/** \defgroup VarsSharedView
- * @{
+/** VarsSharedView
*/
/*!rst::
@@ -870,10 +863,7 @@ Shared View
*/
extern OCIOEXPORT const char * OCIO_VIEW_USE_DISPLAY_NAME;
-/** @}*/
-
-/** \defgroup VarsFormatMetadata
- * @{
+/** VarsFormatMetadata
*/
// TODO: Move to .rst
@@ -929,10 +919,7 @@ extern OCIOEXPORT const char * METADATA_
*/
extern OCIOEXPORT const char * METADATA_ID;
-/** @}*/
-
-/** \defgroup VarsCaches
- * @{
+/** VarsCaches
*/
/*!rst::
@@ -963,8 +950,6 @@ extern OCIOEXPORT const char * OCIO_DISA
// variable to disable the fallback.
extern OCIOEXPORT const char * OCIO_DISABLE_CACHE_FALLBACK;
-/** @}*/
-
// Archive config feature
// Default filename (with extension) of an config.

View File

@ -1,12 +0,0 @@
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>

View File

@ -1,17 +1,20 @@
%if ! 0%{?bootstrap} || ! 0%{?rhel}
%global bootstrap 1
%if ! 0%{?bootstrap} && ! 0%{?rhel}
%global docs 1
%global tests 1
%endif
Name: OpenColorIO
Version: 2.2.1
Release: 2%{?dist}
Release: 6.0.riscv64%{?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: 94da59daeb4647faa9b134665ad156f37cfa021d.patch
# OIIO is only built for these arches due to Libraw
%if 0%{?rhel} >= 8 && 0%{?rhel} < 9
ExclusiveArch: x86_64 ppc64le
@ -30,9 +33,10 @@ BuildRequires: boost-devel
BuildRequires: expat-devel
BuildRequires: freeglut-devel
BuildRequires: glew-devel
BuildRequires: imath-devel
BuildRequires: libX11-devel libXmu-devel libXi-devel
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
BuildRequires: minizip-ng-devel >= 3.0.6
BuildRequires: minizip-ng-compat-devel >= 3.0.6
BuildRequires: opencv-devel
BuildRequires: pybind11-devel
BuildRequires: python3-devel
@ -43,9 +47,11 @@ 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.
%if ! 0%{?bootstrap}
BuildRequires: cmake(OpenImageIO)
BuildRequires: OpenImageIO-iv
BuildRequires: OpenImageIO-utils
%endif
#######################
# Unbundled libraries #
@ -174,6 +180,22 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
%changelog
* Wed Dec 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.2.1-6.0.riscv64
- Bootstrap for Python 3.12 (riscv64)
* 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