[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2023-10-28 Thread Sam James 
commit: bd8b5905e24067d0d4679e8b4e945fe5396b0442
Author: Paul Zander  gmail  com>
AuthorDate: Sat Oct 28 09:29:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 28 21:43:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8b5905

media-libs/opencolorio: fix 2.2.1 doc with newer doxygen

Closes: https://bugs.gentoo.org/916329

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../opencolorio-2.2.1-support-doxygen-1.9.7.patch  | 184 +
 media-libs/opencolorio/opencolorio-2.2.1.ebuild|   1 +
 2 files changed, 185 insertions(+)

diff --git 
a/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch 
b/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch
new file mode 100644
index ..b3b4db802e96
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch
@@ -0,0 +1,184 @@
+https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/94da59daeb4647faa9b134665ad156f37cfa021d
+
+From 94da59daeb4647faa9b134665ad156f37cfa021d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Achard?= 
+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 
+---
+ include/OpenColorIO/OpenColorIO.h| 29 ++--
+ include/OpenColorIO/OpenColorTypes.h | 25 +---
+ 2 files changed, 11 insertions(+), 43 deletions(-)
+
+diff --git a/include/OpenColorIO/OpenColorIO.h 
b/include/OpenColorIO/OpenColorIO.h
+index 313b9c631..1352771ff 100644
+--- a/include/OpenColorIO/OpenColorIO.h
 b/include/OpenColorIO/OpenColorIO.h
+@@ -733,11 +733,8 @@ class OCIOEXPORT Config
+ const char * getRoleColorSpace(const char * roleName) const noexcept;
+ 
+ /**
+- * \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.
+  *
+@@ -854,11 +851,8 @@ class OCIOEXPORT Config
+ /// 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.)
+  *
+@@ -938,8 +932,6 @@ class OCIOEXPORT Config
+  */
+ int instantiateDisplayFromICCProfile(const char * ICCProfileFilepath);
+ 
+-/** @} */
+-
+ /**
+  * \brief
+  * 
+@@ -1087,8 +1079,7 @@ class OCIOEXPORT Config
+ void clearViewTransforms();
+ 
+ /**
+- * \defgroup Methods related to named transforms.
+- * @{
++ * Methods related to named transforms.
+  */
+ 
+ /**
+@@ -1131,8 +1122,6 @@ class OCIOEXPORT Config
+ /// Clear all named transforms.
+ void clearNamedTransforms();
+ 
+-/** @} */
+-
+ // 
+ // File Rules
+ //
+@@ -2051,8 +2040,7 @@ class OCIOEXPORT ColorSpaceSet
+ const Impl * getImpl() const { return m_impl; }
+ };
+ 
+-/** \defgroup ColorSpaceSetOperators
+- *  @{
++/** ColorSpaceSetOperators
+  */
+ 
+ /**
+@@ -2092,8 +2080,6 @@ extern OCIOEXPORT ConstColorSpaceSetRcPtr 
operator&&(const ConstColorSpaceSetRcP
+ extern OCIOEXPORT ConstColorSpaceSetRcPtr operator-(const 
ConstColorSpaceSetRcPtr & lcss,
+ const 
ConstColorSpaceSetRcPtr & rcss);
+ 
+-/** @}*/
+-
+ 
+ //
+ // Look
+@@ -3669,8 +3655,7 @@ class OCIOEXPORT SystemMonitors
+ 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.
+@@ -3687,8 +3672,6 @@ class OCIOEXPORT SystemMonitors
+ /// Get the ICC profile path associated to the monitor.
+ virtual const char * getProfileFilepath(size_t idx) const = 0;
+ 
+-/** @} */
+-
+ protected:
+ SystemMonitors() = default;
+ virtual ~SystemMonitors() = default;
+diff --git a/include/OpenColorIO/OpenColorTypes.h 
b/include/OpenColorIO/OpenColorTypes.h
+index c400568ea..0df8310e9 100644
+--- a/include/OpenColorIO/OpenColorTypes.h
 b/include/OpenColorIO/OpenColorTypes.h
+@@ -726,8 +726,7 @@ extern OCIOEXPORT ExposureContrastStyle 
ExposureContrastStyleFromString(const ch
+ extern OCIOEXPORT const char * NegativeStyleToString(NegativeStyle style);
+ extern OCIOEXPORT NegativeStyle NegativeStyleFromString(const char * style);
+ 
+-/** \defgroup Env. variables.
+- *  @{
++/** Env.

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2023-07-19 Thread Sam James 
commit: 585ca5fdc0b38af79b53f68defb4deb4f735c356
Author: Paul Zander  gmail  com>
AuthorDate: Wed Jun 28 12:39:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 19 20:59:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585ca5fd

media-libs/opencolorio: add 2.2.1

add support for sys-libs/minizip-ng:4

Bug: https://bugs.gentoo.org/895714
Closes: https://bugs.gentoo.org/829604
Closes: https://bugs.gentoo.org/895714
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31876
Signed-off-by: Sam James  gentoo.org>

 media-libs/opencolorio/Manifest|   1 +
 ...ncolorio-2.2.1-adjust-python-installation.patch |  17 +++
 .../opencolorio-2.2.1-support-minizip-ng-4.patch   |  92 +++
 media-libs/opencolorio/metadata.xml|   9 +-
 media-libs/opencolorio/opencolorio-2.2.1.ebuild| 130 +
 5 files changed, 248 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 0302db0fdbed..debed58d79d4 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1 +1,2 @@
 DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B 
bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d
 SHA512 
b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
+DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B 
b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f
 SHA512 
d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9

diff --git 
a/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch
 
b/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch
new file mode 100644
index ..6f023310eb8d
--- /dev/null
+++ 
b/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch
@@ -0,0 +1,17 @@
+From 5ca483b67404a9ba2230f2f03ff3255eceb3d2bc Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 19 Feb 2023 23:14:44 +0100
+Subject: [PATCH] [Gentoo-specific] adjust python installation
+
+Signed-off-by: Bernd Waibel 
+--- a/src/bindings/python/CMakeLists.txt
 b/src/bindings/python/CMakeLists.txt
+@@ -230,7 +230,7 @@ target_compile_definitions(PyOpenColorIO
+ if(WIN32)
+ set(_Python_VARIANT_PATH "${CMAKE_INSTALL_LIBDIR}/site-packages")
+ else()
+-set(_Python_VARIANT_PATH 
"${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages")
++set(_Python_VARIANT_PATH 
"${CMAKE_INSTALL_PREFIX}/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages")
+ endif()
+ 
+ # Create an internal global variable to access it in another scope but not 
publicly visible

diff --git 
a/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch 
b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch
new file mode 100644
index ..8ee4ceaf9970
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch
@@ -0,0 +1,92 @@
+# From https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1806
+From d15ccddd4d20d66749577d7444de861112f6864c Mon Sep 17 00:00:00 2001
+From: Brad Smith 
+Date: Thu, 29 Jun 2023 09:57:28 -0400
+Subject: [PATCH] Add support for minizip-ng 4 API
+
+Signed-off-by: Brad Smith 
+---
+ src/OpenColorIO/OCIOZArchive.cpp | 22 +-
+ src/apps/ocioarchive/main.cpp|  4 
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/src/OpenColorIO/OCIOZArchive.cpp 
b/src/OpenColorIO/OCIOZArchive.cpp
+index 85fc7bb76..24d836e95 100644
+--- a/src/OpenColorIO/OCIOZArchive.cpp
 b/src/OpenColorIO/OCIOZArchive.cpp
+@@ -225,7 +225,11 @@ void archiveConfig(std::ostream & ostream, const Config & 
config, const char * c
+ std::string configStr = ss.str();
+ 
+ // Write zip to memory stream.
++#if MZ_VERSION_BUILD >= 04
++write_mem_stream = mz_stream_mem_create();
++#else
+ mz_stream_mem_create(_mem_stream);
++#endif
+ mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024);
+ mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE);
+ 
+@@ -237,7 +241,11 @@ void archiveConfig(std::ostream & ostream, const Config & 
config, const char * c
+ options.compress_level  = ArchiveCompressionLevels::BEST;
+ 
+ // Create the writer handle.
++#if MZ_VERSION_BUILD >= 04
++archiver = mz_zip_writer_create();
++#else
+ mz_zip_writer_create();
++#endif
+ 
+ // Archive options.
+ // Compression method
+@@ -332,7 +340,11 @@ void ExtractOCIOZArchive(const char * archivePath, const 
char * destination)
+ std::string outputDestination =

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2022-08-31 Thread Sam James 
commit: 855ef95061367779af0f38f7afd291af21616403
Author: brahmajit das  protonmail  com>
AuthorDate: Tue Aug 23 09:25:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  1 02:05:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855ef950

media-libs/opencolorio: Fix strtol_l on musl

Fix strtol_l missing on musl. On musl libc use strtol
Taken from Alpine Linux, please refer:
https://git.alpinelinux.org/aports/tree/community/opencolorio/0002-fix-strtol.patch

Closes: https://bugs.gentoo.org/829453

Signed-off-by: brahmajit das  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26855
Signed-off-by: Sam James  gentoo.org>

 .../files/opencolorio-2.1.2-musl-strtol.patch  | 27 ++
 media-libs/opencolorio/opencolorio-2.1.2.ebuild|  1 +
 2 files changed, 28 insertions(+)

diff --git a/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch 
b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
new file mode 100644
index ..87059614ff03
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
@@ -0,0 +1,27 @@
+# Fix strtol_l missing on musl. On musl libc use strtol
+# Taken from Alpine Linux, please refer:
+# 
https://git.alpinelinux.org/aports/tree/community/opencolorio/0002-fix-strtol.patch?id=dd7ba461824ab0618f0493cbb450b221fdc2513c
+# Please refer: 
https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1624
+--- a/src/utils/NumberUtils.h
 b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char 
*first, const char *last,
+ tempval = ::strtod_l(first, , loc.local);
+ #endif
+
+-if (errno != 0)
++if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char 
*first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, , 0, loc.local);
+-#else
++#elif defined(__GLIBC__)
+ tempval = ::strtol_l(first, , 0, loc.local);
++#else
++tempval = ::strtol(first, , 0);
+ #endif
+
+ if (errno != 0)

diff --git a/media-libs/opencolorio/opencolorio-2.1.2.ebuild 
b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
index 17b4b7fb8e1f..eda322b00de6 100644
--- a/media-libs/opencolorio/opencolorio-2.1.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
@@ -55,6 +55,7 @@ RESTRICT="test"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.1-gcc12.patch
+   "${FILESDIR}"/${PN}-2.1.2-musl-strtol.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2022-06-05 Thread Sam James 
commit: 98e9e578139ff41ae4f18ce00fe81d19c22142dc
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  6 01:22:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  6 01:24:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e9e578

media-libs/opencolorio: drop 1.1.1-r3, 2.0.1-r2, 2.0.3, 2.1.1-r2

Signed-off-by: Sam James  gentoo.org>

 media-libs/opencolorio/Manifest|   3 -
 .../files/opencolorio-1.1.0-remove-Werror.patch|  17 ---
 ...1.1.0-remove-building-of-bundled-programs.patch | 154 -
 ...nstallDirs-and-fix-cmake-install-location.patch | 102 --
 .../files/opencolorio-1.1.0-yaml-cpp-0.6.patch |  54 
 ...ecific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch |  38 -
 .../opencolorio-1.1.1-fix-self-assign-clang.patch  |  14 --
 .../files/opencolorio-1.1.1-no-werror.patch|  12 --
 .../opencolorio-1.1.1-yaml-cpp-boost-check.patch   |  35 -
 media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild | 106 --
 media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild |  96 -
 media-libs/opencolorio/opencolorio-2.0.3.ebuild|  97 -
 media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild | 100 -
 13 files changed, 828 deletions(-)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 1cfa23094bad..fbccb7669120 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,5 +1,2 @@
-DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B 
f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf
 SHA512 
bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B 
cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159
 SHA512 
5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
-DIST opencolorio-2.0.3.tar.gz 10813503 BLAKE2B 
a853f2a39b4c3c0005056f0278355f01a8d62ec90054d3f1ce29501ce8fc96628d68eb3d942bb0cc33c71dcaa1a7421684bdd79b190a5eda5c5b5c6b9190017c
 SHA512 
cb8d6d4e2481bfe9449f665ff888ad6ffb2d2e82f1a132b7cd3a74c88b2084f469c362511e57b964d3aee7c1badd41422640ab3a857402fa6a90c8bdf4cc60bb
 DIST opencolorio-2.1.1.tar.gz 11013141 BLAKE2B 
ffece30b9f37acd10665a716d519c9807f6398e5e59baedd194376a1424a6d875781c027d998567b2a241da6388a780c94d95237b0b4d64b836cc5d4383c
 SHA512 
86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
 DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 
2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463
 SHA512 
594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353

diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch 
b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch
deleted file mode 100644
index 2814f703f81d..
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/pyglue/CMakeLists.txt b/src/pyglue/CMakeLists.txt
-index a90ca1c..35de89a 100644
 a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -22,9 +22,9 @@ endif()
- 
- # Process all warnings as errors
- # Unfortunately Windows still has a warning
--if(UNIX)
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
-+#if(UNIX)
-+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-+#endif()
- 
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)

diff --git 
a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
 
b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
deleted file mode 100644
index 9041677c9ce4..
--- 
a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 967369b36c9684d7ffb73a926c442d8991a3afef Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs 
-Date: Mon, 15 Jan 2018 13:09:31 +
-Subject: [PATCH 3/3] Remove building of bundled programs
-

- docs/CMakeLists.txt | 98 ++---
- 1 file changed, 3 insertions(+), 95 deletions(-)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index a822a19..d588139 100644
 a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -1,90 +1,4 @@
- 
--###
--### External Doc Apps ###
--
--if (WIN32)
--# Workaround to mimic *nix '> PYTHONPATH=XXX CMD' 
--#  on windows, it becomes

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2022-05-07 Thread Sam James 
commit: 16594ec389119cfd9c6058b5b00972b80cd532d7
Author: Sam James  gentoo  org>
AuthorDate: Sat May  7 07:08:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  7 07:17:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16594ec3

media-libs/opencolorio: fix build with GCC 12

Closes: https://bugs.gentoo.org/841479
Signed-off-by: Sam James  gentoo.org>

 media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch | 14 ++
 media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild |  4 
 2 files changed, 18 insertions(+)

diff --git a/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch 
b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
new file mode 100644
index ..0bf00862e51b
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
@@ -0,0 +1,14 @@
+https://src.fedoraproject.org/rpms/OpenColorIO/raw/rawhide/f/OCIO-strlen.patch
+https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/4fa94918c2cf572dcaf61ca07016f3b5c231c14c
+https://bugs.gentoo.org/841479
+--- a/src/OpenColorIO/FileRules.cpp
 b/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+

diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild 
b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
index 942486329016..b8d6102d7296 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
@@ -55,6 +55,10 @@ RESTRICT="test"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gcc12.patch
+)
+
 pkg_setup() {
use python && python-single-r1_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2022-02-15 Thread Sam James 
commit: 5cf44c5ab2ca709df6fb7b90434d02487faed323
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 17:58:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 15 19:49:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf44c5a

media-libs/opencolorio: adjust to unslotted OpenEXR

Bug: https://bugs.gentoo.org/833158
Closes: https://bugs.gentoo.org/831357
Closes: https://bugs.gentoo.org/832862
Closes: https://bugs.gentoo.org/821247
Signed-off-by: Sam James  gentoo.org>

 .../files/opencolorio-2.1.1-imath-openexr-3.patch  | 75 --
 ...2.1.1-r3.ebuild => opencolorio-2.1.1-r4.ebuild} |  4 --
 2 files changed, 79 deletions(-)

diff --git 
a/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch 
b/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch
deleted file mode 100644
index bf606889865d..
--- a/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/share/cmake/modules/FindImath.cmake 
b/share/cmake/modules/FindImath.cmake
-index 44a55e8..8a2d7ca 100644
 a/share/cmake/modules/FindImath.cmake
-+++ b/share/cmake/modules/FindImath.cmake
-@@ -49,6 +49,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
- find_path(Imath_INCLUDE_DIR
- NAMES
- Imath/ImathConfig.h
-+Imath-3/IMathConfig.h
- HINTS
- ${Imath_ROOT}
- ${PC_Imath_INCLUDE_DIRS}
-@@ -90,8 +91,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
- 
- # Get version from config header file
- if(Imath_INCLUDE_DIR)
--if(EXISTS "${Imath_INCLUDE_DIR}/Imath/ImathConfig.h")
--set(_Imath_CONFIG "${Imath_INCLUDE_DIR}/Imath/ImathConfig.h")
-+if(EXISTS "${Imath_INCLUDE_DIR}/Imath-3/ImathConfig.h")
-+set(_Imath_CONFIG 
"${Imath_INCLUDE_DIR}/Imath-3/ImathConfig.h")
- endif()
- endif()
- 
-diff --git a/src/utils/Half.h.in b/src/utils/Half.h.in
-index 3784341..237f3ed 100644
 a/src/utils/Half.h.in
-+++ b/src/utils/Half.h.in
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF @OCIO_USE_IMATH_HALF@
- 
- #if OCIO_USE_IMATH_HALF
--#   include 
-+#   include 
- #else
- #   include 
- #endif
-diff --git a/vendor/aftereffects/vc/vc15/utils/Half.h 
b/vendor/aftereffects/vc/vc15/utils/Half.h
-index 5035750..5144e72 100644
 a/vendor/aftereffects/vc/vc15/utils/Half.h
-+++ b/vendor/aftereffects/vc/vc15/utils/Half.h
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF 0
- 
- #if OCIO_USE_IMATH_HALF
--#   include 
-+#   include 
- #else
- #   include 
- #endif
-diff --git a/vendor/aftereffects/xcode/xcode12/utils/Half.h 
b/vendor/aftereffects/xcode/xcode12/utils/Half.h
-index 5035750..5144e72 100644
 a/vendor/aftereffects/xcode/xcode12/utils/Half.h
-+++ b/vendor/aftereffects/xcode/xcode12/utils/Half.h
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF 0
- 
- #if OCIO_USE_IMATH_HALF
--#   include 
-+#   include 
- #else
- #   include 
- #endif
-diff --git a/vendor/aftereffects/xcode/xcode9/utils/Half.h 
b/vendor/aftereffects/xcode/xcode9/utils/Half.h
-index 5035750..5144e72 100644
 a/vendor/aftereffects/xcode/xcode9/utils/Half.h
-+++ b/vendor/aftereffects/xcode/xcode9/utils/Half.h
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF 0
- 
- #if OCIO_USE_IMATH_HALF
--#   include 
-+#   include 
- #else
- #   include 
- #endif

diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild 
b/media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild
similarity index 98%
rename from media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild
rename to media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild
index 65a48f36c3c7..f90a88c6c238 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild
@@ -59,10 +59,6 @@ RESTRICT="test"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.1.1-imath-openexr-3.patch
-)
-
 pkg_setup() {
use python && python-single-r1_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2021-04-28 Thread Sergei Trofimovich 
commit: 7e726d850502018b6760da78dbd4a419603016b8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Apr 28 07:21:14 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr 28 07:21:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e726d85

media-libs/opencolorio: drop -Werror

Reported-by: Austin Kilgore
Closes: https://bugs.gentoo.org/786198
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../opencolorio/files/opencolorio-1.1.1-no-werror.patch  | 12 
 media-libs/opencolorio/opencolorio-1.1.1.ebuild  |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch 
b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
new file mode 100644
index 000..df8fa210253
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/786198
+--- a/src/core/CMakeLists.txt
 b/src/core/CMakeLists.txt
+@@ -23,8 +23,6 @@ if(WIN32)
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+ set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+ endif()
+-else()
+-set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
+ endif()
+ 
+ # SHARED

diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild 
b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 481f2561de4..a20bb6f44ae 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.0-remove-Werror.patch"
"${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
"${FILESDIR}/${P}-fix-self-assign-clang.patch"
+   "${FILESDIR}/${P}-no-werror.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2018-01-13 Thread David Seifert 
commit: 489c3c78999d7f5c20d86aa2b5e2493821ee5fd0
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Fri Jan 12 22:19:10 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 13 13:30:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489c3c78

media-libs/opencolorio: version bump to 1.1.0

Closes: https://github.com/gentoo/gentoo/pull/6842

 media-libs/opencolorio/Manifest|   1 +
 .../files/opencolorio-1.1.0-cmake-fixes.patch  | 173 +
 media-libs/opencolorio/opencolorio-1.1.0.ebuild|  85 ++
 3 files changed, 259 insertions(+)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 63d78b13800..78f98ec8306 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1,4 @@
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 
6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4
 SHA512 
8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 
54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da
 SHA512 
f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
 DIST opencolorio-1.0.9_p20170719.tar.gz 13752783 BLAKE2B 
2f6a0e095bb3fd56a49b6d43f5c4f3690a2c735c1cc84c337bcb19abf391bedd600bcb6fc512fd8e1c56fe1e337ee57358329490f2dc2c92362b8c939a579917
 SHA512 
1ee86cae951afed963bc62e251975a6c721553fc1bb7650faccb6160fcd6b3e030c509667cb7b2543a3ca32ed6777259d98bf25e2bb8150fee8054310b9d2590
+DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 
555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152
 SHA512 
909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998

diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch 
b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
new file mode 100644
index 000..9cb3500d9da
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
@@ -0,0 +1,173 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2017-11-29 22:51:15.0 +
 b/CMakeLists.txt   2017-12-27 16:49:51.461300828 +
+@@ -59,6 +59,7 @@ endif()
+ include(ParseArguments)
+ include(OCIOMacros)
+ include(ExternalProject)
++include(GNUInstallDirs)
+ 
+ enable_language(CXX)
+ 
+@@ -531,7 +532,7 @@ endif()
+ configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
+ ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
+ 
+-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh 
DESTINATION share/ocio/)
++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh 
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
+ 
+ 
###
+ ### CPACK ###
+@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
+ message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
+ "
+ )
+-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION 
${CMAKE_INSTALL_LIBDIR}/CMake)
+diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+--- a/docs/CMakeLists.txt  2017-11-29 22:51:15.0 +
 b/docs/CMakeLists.txt  2017-12-27 16:53:28.976491353 +
+@@ -1,91 +1,5 @@
+ 
+ 
###
+-### External Doc Apps ###
+-
+-if (WIN32)
+-# Workaround to mimic *nix '> PYTHONPATH=XXX CMD' 
+-#  on windows, it becomes  '> set PYTHONPATH=XXX \n call CMD'
+-#   '\n' is here because '\\&' does not work.
+-set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
+-# Unfortunately some windows tools require to have
+-#  the paths with the '\' (not working with '//').
+-set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+-string(REGEX REPLACE "/" "" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
+-set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-string(REGEX REPLACE "/" "" PYT_EXTDIST_BINPATH 
${PYT_EXTDIST_BINPATH})
+-else()
+-set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
+-set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+-set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-endif()
+-
+-# setuptools
+-# https://pypi.python.org/pypi/setuptools
+-set(SETUPTOOLS_VERSION 1.1.6)
+-
+-ExternalProject_Add(setuptools
+-URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
+-BUILD_IN_SOURCE 1
+-CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/

2018-01-13 Thread David Seifert 
commit: c096702b017761ba14439afd4d9ddbef302cb8ba
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Fri Jan 12 22:22:40 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 13 13:30:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c096702b

media-libs/opencolorio: Remove 1.0.9_p20170719

 media-libs/opencolorio/Manifest|   1 -
 .../files/opencolorio-1.0.9-cmake-fixes-v1.patch   | 150 -
 .../opencolorio/opencolorio-1.0.9_p20170719.ebuild |  86 
 3 files changed, 237 deletions(-)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 78f98ec8306..61692b3aa83 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,4 +1,3 @@
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 
6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4
 SHA512 
8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 
54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da
 SHA512 
f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
-DIST opencolorio-1.0.9_p20170719.tar.gz 13752783 BLAKE2B 
2f6a0e095bb3fd56a49b6d43f5c4f3690a2c735c1cc84c337bcb19abf391bedd600bcb6fc512fd8e1c56fe1e337ee57358329490f2dc2c92362b8c939a579917
 SHA512 
1ee86cae951afed963bc62e251975a6c721553fc1bb7650faccb6160fcd6b3e030c509667cb7b2543a3ca32ed6777259d98bf25e2bb8150fee8054310b9d2590
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 
555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152
 SHA512 
909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998

diff --git 
a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch 
b/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
deleted file mode 100644
index 23f67cae55c..000
--- a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2017-07-19 21:38:48.0 +0100
-+++ b/CMakeLists.txt   2017-08-15 14:14:02.223744929 +0100
-@@ -59,6 +59,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -519,7 +520,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh 
DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh 
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
- 
- 
###
- ### CPACK ###
-@@ -634,4 +635,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION 
${CMAKE_INSTALL_LIBDIR}/CMake)
-diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
 a/docs/CMakeLists.txt  2017-07-19 21:38:48.0 +0100
-+++ b/docs/CMakeLists.txt  2017-08-15 14:10:29.645282585 +0100
-@@ -1,68 +1,5 @@
- 
- 
###
--### External Doc Apps ###
--
--# setuptools
--# https://pypi.python.org/pypi/setuptools
--set(SETUPTOOLS_VERSION 1.1.6)
--ExternalProject_Add(setuptools
--URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
--BUILD_IN_SOURCE 1
--CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install 
--prefix=${EXTDIST_ROOT}
--)
--
--# docutils
--# https://pypi.python.org/pypi/docutils
--set(DOCUTILS_VERSION 0.11)
--ExternalProject_Add(docutils
--DEPENDS setuptools
--URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
--BUILD_IN_SOURCE 1
--CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install 
--prefix=${EXTDIST_ROOT}
--)
--
--# jinja2
--# https://pypi.python.org/pypi/Jinja2
--set(JINJA2_VERSION 2.7.1)
--ExternalProject_Add(Jinja2
--DEPENDS setuptools
--URL