Add upstream patch for Doxygen issue.
This commit is contained in:
Richard Shaw
parent
71c2508c76
commit
9f43492800
|
|
@ -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.
|
||||
|
|
@ -12,6 +12,8 @@ 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue