Update to 2.3.2
Add patch to convert MZ_VERSION_BUILD to hex
This commit is contained in:
Orion Poplawski
parent
1b12f007f4
commit
a5370dab3a
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
||||
/OpenColorIO-2.1.1.tar.gz
|
||||
/OpenColorIO-2.1.2.tar.gz
|
||||
/OpenColorIO-2.2.1.tar.gz
|
||||
/OpenColorIO-2.3.2.tar.gz
|
||||
|
||||
@ -1,182 +0,0 @@
|
||||
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.
|
||||
60
OpenColorIO-mzver.patch
Normal file
60
OpenColorIO-mzver.patch
Normal file
@ -0,0 +1,60 @@
|
||||
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);
|
||||
@ -1,13 +1,14 @@
|
||||
Name: OpenColorIO
|
||||
Version: 2.2.1
|
||||
Release: 10%{?dist}
|
||||
Version: 2.3.2
|
||||
Release: 1%{?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
|
||||
# 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
|
||||
@ -149,7 +150,7 @@ 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}/*.so
|
||||
%{python3_sitearch}/PyOpenColorIO/
|
||||
|
||||
%files tools
|
||||
%{_bindir}/*
|
||||
@ -169,6 +170,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} \;
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
|
||||
SHA512 (OpenColorIO-2.3.2.tar.gz) = 4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133
|
||||
|
||||
Loading…
Reference in New Issue
Block a user