gentoo auto-resync : 01:09:2022 - 19:24:10

3 files changed, 30 insertions, 1 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index ca544bbdb4a3..d86e02787f4f 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,6 +1,7 @@
 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
 DIST opencolorio-2.1.1.tar.gz 11013141 BLAKE2B ffece30b9f37acd10665a716d519c9807f6398e5e59baedd194376a1424a6d875781c027d998567b2a241da6388a780c94d95237b0b4d64b836cc5ccccd4383c SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
 DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463 SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
 EBUILD opencolorio-2.1.1-r7.ebuild 3235 BLAKE2B fc8fcf4425f54319d1682adbb75d10e826c0427e6e88df3235f8fc5eb0296ad95582d637adca5a4f8edc3acdb819ce5544c88e5da8ce5366c4fbae30959958d5 SHA512 a68e6e983ee08be66d6732304de7c775a4292797c13b350f93bdf4410cb2d47720869c7d4d66514be011df6aea70c407a6ddfccd975c2eef87cddab42f73e54c
-EBUILD opencolorio-2.1.2.ebuild 3211 BLAKE2B d25624a37c728daa4cd55a3f4bea0fbf24de5a4da9b0272a867e7a6130a973236cc1845854df64074ee0f67544f856eb135a318aa69a6ab3548667fc2cba1446 SHA512 15c374d5d95bf03d0701658ee7d8f380eba81fb3f6cf634c1397198401e7f29f7021870ff278087300691c3c25c22dfe9c90b0579e27623e515cfd4ff55d7fd4
+EBUILD opencolorio-2.1.2.ebuild 3256 BLAKE2B 2269c61cee1e8a6dd89a6e2b38055521ef796905602edfa5516878a3d8d283557f5d02ba6b569edf0541f79362ddc52734b0c28e09876b48f8d1ad21e4e6539f SHA512 ec43b26e9c2fdec44cc432665709e68f5595b919dbe7014526456d9fc670d4e5897f1152dbf118541bf6cac412072dc793e2c7da323df2452a1221c5957b9fba
 MISC metadata.xml 475 BLAKE2B a5e021764a849b172bc4e5a70bcf9c45930f2be703ec8b9db4ad2b6c0395eeab9cbe404d9146f2d48df5c7fb1d68b11bc1a5dc235c58ca6d6e715676fe2dea21 SHA512 823dba870b69fabaa8a61351ea24bbca701fec4a5d64d6a9a75a2306910b663447caaac7ef6e06ccb6d945a5e9eea4ebcb5322154eadcdc2d191abf879bf786d
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 000000000000..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, &endptr, 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, &endptr, 0, loc.local);
+-#else
++#elif defined(__GLIBC__)
+     tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++    tempval = ::strtol(first, &endptr, 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() {