gentoo auto-resync : 29:10:2023 - 03:34:39

5 files changed, 261 insertions, 5 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 048fc3cd1c49..83e8dc44d921 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,12 +1,14 @@
 AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415de07c07093f45fd7f4f445735f2c7bda437f75b5f7b30e72fd522af97e4995887312b7828d954ff4bc8a179f476f2c3 SHA512 1738924260ee3abf556207f3323c8cc45e3e5f9210ff46b8b1e9ac1766c39ac06cc50a61d0c77bdf10a318405f6f5dda84d15f4c004be950dce40e2dd3087f2b
 AUX opencolorio-2.1.2-musl-strtol.patch 1041 BLAKE2B 58384b1a2a6e2778219909aaabe95061f0348ea7302cf97f85f417b709511b250cec578b8c3d85f2b0c1d35a469c4ddde932cc0ee1040daec8664141e9c1df4e SHA512 d268ac0c55ff6dcf5e1756a65c0593e39b2a7b86ccb913d5cbeaf6877465b537592bd903187a4183ae69c96b3c420ac1bcdf2175ff2071339eaaeed49bb6f52e
 AUX opencolorio-2.2.1-adjust-python-installation.patch 864 BLAKE2B e4e68ec13d47648ca41dce07ea7302a218e784e0b2bd700456642708271763c05e1bc667cdd9338a94790ac23f9862f1301e1eb4680bdb5ff948baba7051e3db SHA512 91afc3a825dadca245b046b2fd63edba2ffb44759a124eb3c9665b88d890b0a6cb09c1bed2067adf974faf65dedfd8bddb901e15a80e2d6b1c3645c08a0a7c3e
+AUX opencolorio-2.2.1-support-doxygen-1.9.7.patch 5263 BLAKE2B 7d9ddd3db43dba04851bdd56f3395a7de85dcacf442feca787d4f129ca49de6941d02bbc44ff58ae8ce5d94d50665a32b2c8270d35abfe879c61f688cde39767 SHA512 254f8e9de92ab80b0b15bb2a828a57117eda2bb8781da312a2a53db8d720cf76424d235e95c55c0c57a458c7c53bab22cc1a4de3477320d85f88f5274e38e072
 AUX opencolorio-2.2.1-support-minizip-ng-4.patch 3133 BLAKE2B f84abb93233d0834b1f1bd8066140db1120ddf1a1eeb95d340283ed5ef56bb598787d8a23cdc5b8acbbdc595d6850956c25e0a0f57139d872e45dd5469407d55 SHA512 d0c811f80978f8d08dccd94cd25b26b5fd9e8ba3bcb2cffa82426e9faea5e0afef46843128e297614d7e2fd0886bc9928ddb7e03b9b691fd03b05923693de8da
+AUX opencolorio-2.3.0-fix-cxxflags.patch 868 BLAKE2B 0c0a553066f4901a48290be145bdd2d543b5b6afb3b2363227da4366e70ba5d9a803ffbe00f5d63e5ee5f4cfc292c9e4f79fdee5555b72bf6f3f3d0db80e80d0 SHA512 f272b547535691e5d4e73aa5c11bdb4e04ef06838b0e34153f08d0b742d8875f93dbf5c2502c2a54725b9b6c1e5caac795c5f69bd3d3b48cf6826f358889155a
 AUX opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch 808 BLAKE2B aed4b9d8bf512e42578e239bfe9a60074cb812d5d8894fc489f535a709d1b755d1934cf1c556ee9a06b5fd199796f4f6defdb36b8f9df7503288fd4a7eb5db7c SHA512 cf5a4b007ab4a9c25f6f94caeb007a0f4f2d83203eca6a4b83b38abc9df08593eb10159194e9c399f5877a618acd4da355b8fb299f39a73d04a4c94a903dbecc
 DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
 DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
 DIST opencolorio-2.3.0.tar.gz 11406998 BLAKE2B 0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488 SHA512 cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7
 EBUILD opencolorio-2.1.3.ebuild 3168 BLAKE2B 7e64eecf250f5f56b15dde6c7a283185f4bb95d939c771a98b0856eba91de18f02ae27ac354ef104c6eb515f79bfa49e5daa8b1f407347f3c1fb0706597a2261 SHA512 b5f4ec43b46270cc2b05875b722c70840822eb0a46f4b1fd6bcd781170a331d5ce9809aca4df1364666992059aba53ea6f20a4c88c6b2ac0015b2280c3bfd64d
-EBUILD opencolorio-2.2.1.ebuild 3406 BLAKE2B 7ee98412345b52482743731173cbe2876d379c181703f429d8584133f5989c3d32d4788cf6a4cdc3270f770bd5a3433615fbf062f3a1a8af11297c6492f81cc7 SHA512 cef8639799e4091d60df80bf60466ce01f0208e74c0bc40ffb221aa03073be0277521b6ce956fa5aa8628e673ea4c3401a6ead1306cfedb329286710a2e2da54
-EBUILD opencolorio-2.3.0.ebuild 3431 BLAKE2B b0a956f4b24260e0ad2a96f04c253f107ea17d1dd1009eb96a04f28737bc1b3b85f0d788542312b5ab65f6f0c720027263cc6785b5b64b899ae0c6433e73ca33 SHA512 976e9fab3c14479da5d8d71d3995968accbcd791b023030bc67e3119c27ba17228c6e284df409f2b37095c39a3486cd69abee29362087ed3a5b4f47f459d122b
+EBUILD opencolorio-2.2.1.ebuild 3679 BLAKE2B bdfb6406cf28419f111878c79f1fb6486dc50f42f3830fa5bb25c22f5893ac555c47c70d5ad292ccb604b8d1c7ba5f8fdf2dddb4ade6819f9c4f2e94044e5256 SHA512 5af3d13a9f92210b18c856c943c41d629e17bf1891fac757eeff327321358fdef59abfb87003308fcdce33e78153608cd9cf7b982788aaaacadc0fbf2aa96e61
+EBUILD opencolorio-2.3.0.ebuild 4580 BLAKE2B 6f9ec1e5b8c591580f492cd655d7f0e5d05253718bf0057bec5edf753a443be9b10d8b7af340276f13ebbe6a794f77caaff2b08f08dbd937e8099d3cfd93c0d8 SHA512 8d580d10d96801585b821b68b3f81a331e13523889295590bbf21763266cc6e22f43b2923bb7603724ee3f48f7b41006ad4edad1b38e32f7909fa427205af2d5
 MISC metadata.xml 792 BLAKE2B 6b94c1223e756ef3179ab3442c134bf7881400434332691bc693a36c8bceb4db609dd143afb6a18192c7bfaa9ccb72015c215e08b3bd65fbdb3ccc2fb3ff713d SHA512 c1b3d44b5ce24813b3e07074ba2fe40c3af89033dfbe5a372b130be26fcfeba9fa9c2a0d9e6a695972dc402979aa732df27fd3c6128a8f3a51fe926ecb73cb25
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 000000000000..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?= <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(-)
+
+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. 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_OPTIMIZATION_FLAGS_ENVVAR;
+  */
+ extern OCIOEXPORT const char * OCIO_USER_CATEGORIES_ENVVAR;
+ 
+-/** @}*/
+-
+-/** \defgroup VarsRoles
+- *  @{
++/** VarsRoles
+  */
+ 
+ // TODO: Move to .rst
+@@ -852,10 +848,7 @@ extern OCIOEXPORT const char * ROLE_INTERCHANGE_SCENE;
+  */
+ 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_NAME;
+  */
+ extern OCIOEXPORT const char * METADATA_ID;
+ 
+-/** @}*/
+-
+-/** \defgroup VarsCaches
+- *  @{
++/** VarsCaches
+  */
+ 
+ /*!rst::
+@@ -963,8 +950,6 @@ extern OCIOEXPORT const char * OCIO_DISABLE_PROCESSOR_CACHES;
+ // variable to disable the fallback.
+ extern OCIOEXPORT const char * OCIO_DISABLE_CACHE_FALLBACK;
+ 
+-/** @}*/
+-
+ 
+ // Archive config feature
+ // Default filename (with extension) of an config.
diff --git a/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch
new file mode 100644
index 000000000000..cefae22a00e6
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch
@@ -0,0 +1,23 @@
+From d69edd3ef411853cd780b75cf260295a39a8a49f Mon Sep 17 00:00:00 2001
+From: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
+Date: Wed, 20 Sep 2023 15:10:46 -0400
+Subject: [PATCH] Correctly reset CMAKE_CXX_FLAGS.
+
+Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
+---
+ share/cmake/utils/CheckSupportSSE2.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/cmake/utils/CheckSupportSSE2.cmake b/share/cmake/utils/CheckSupportSSE2.cmake
+index 8c929c7e9..6a07155de 100644
+--- a/share/cmake/utils/CheckSupportSSE2.cmake
++++ b/share/cmake/utils/CheckSupportSSE2.cmake
+@@ -59,7 +59,7 @@ else()
+     message(STATUS "Performing Test COMPILER_SUPPORTS_SSE2 - Failed")
+ endif()
+ 
+-set(CMAKE_REQUIRED_FLAGS "${_cmake_cxx_flags_orig}")
++set(CMAKE_CXX_FLAGS "${_cmake_cxx_flags_orig}")
+ unset(_cmake_cxx_flags_orig)
+ 
+ if(__universal_build)
diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
index 1c91f789cb30..638a4d840676 100644
--- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
@@ -82,6 +82,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
 	"${FILESDIR}/${PN}-2.2.1-support-minizip-ng-4.patch"
+	"${FILESDIR}/${PN}-${PV}-support-doxygen-1.9.7.patch"
 )
 
 pkg_setup() {
@@ -125,6 +126,14 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_install() {
+	cmake_src_install
+
+	# there are already files in ${ED}/usr/share/doc/${PF}
+	mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die
+	rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+}
+
 src_test() {
 	virtx cmake_src_test
 }
diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
index a89bc43446ab..0ea5f92ccd4a 100644
--- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
@@ -17,7 +17,12 @@ SLOT="0/$(ver_cut 1-2)"
 # minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
 # osl: ~riscv
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apps cpu_flags_x86_sse2 doc opengl python test"
+CPU_USE=(
+	x86_{avx,avx2,avx512f,f16c,sse2,sse3,sse4_1,sse4_2,ssse3}
+	# requires https://github.com/DLTcollab/sse2neon
+	# arm_neon
+)
+IUSE="apps ${CPU_USE[@]/#/cpu_flags_} doc opengl python test"
 # TODO: drop opengl? It does nothing without building either the apps or the testsuite
 REQUIRED_USE="
 	apps? ( opengl )
@@ -82,6 +87,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
 	"${FILESDIR}/${PN}-2.3.0-support-yaml-cpp-0.8.0.patch"
+	"${FILESDIR}/${PN}-2.3.0-fix-cxxflags.patch"
 )
 
 pkg_setup() {
@@ -113,9 +119,33 @@ src_configure() {
 		"-DOCIO_BUILD_PYTHON=$(usex python)"
 		"-DOCIO_BUILD_TESTS=$(usex test)"
 		"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
-		"-DOCIO_USE_OIIO_CMAKE_CONFIG=ON"
-		"-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)"
+		# allow the user to tell OCIO to display more information when searching and building the dependencies.
+		# "-DOCIO_VERBOSE=YES"
+
+		"-DOCIO_USE_SIMD=ON"
 	)
+
+	if use amd64 || use x86 ; then
+		mycmakeargs+=(
+			"-DOCIO_USE_SSE2=$(usex cpu_flags_x86_sse2)"
+			"-DOCIO_USE_SSE3=$(usex cpu_flags_x86_sse3)"
+			"-DOCIO_USE_SSSE3=$(usex cpu_flags_x86_ssse3)"
+			"-DOCIO_USE_SSE4=$(usex cpu_flags_x86_sse4_1)"
+			"-DOCIO_USE_SSE42=$(usex cpu_flags_x86_sse4_2)"
+			"-DOCIO_USE_AVX=$(usex cpu_flags_x86_avx)"
+			"-DOCIO_USE_AVX2=$(usex cpu_flags_x86_avx2)"
+			"-DOCIO_USE_AVX512=$(usex cpu_flags_x86_avx512f)"
+			"-DOCIO_USE_F16C=$(usex cpu_flags_x86_f16c)"
+		)
+	fi
+
+	# requires https://github.com/DLTcollab/sse2neon
+	# if use arm || use arm64 ; then
+	# 	mycmakeargs+=(
+	# 		"-DOCIO_USE_SSE2NEON=$(usex cpu_flags_arm_neon)"
+	# 	)
+	# fi
+
 	use python && mycmakeargs+=(
 		"-DOCIO_PYTHON_VERSION=${EPYTHON/python/}"
 		"-DPython_EXECUTABLE=${PYTHON}"
@@ -125,6 +155,14 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_install() {
+	cmake_src_install
+
+	# there are already files in ${ED}/usr/share/doc/${PF}
+	mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die
+	rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+}
+
 src_test() {
 	virtx cmake_src_test
 }