gentoo auto-resync : 15:09:2022 - 23:13:44

4 files changed, 73 insertions, 2 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index d742180cf18e..fd3292adf23e 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,10 +1,12 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
 AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167
+AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187 BLAKE2B 2e415fce94cf501b3780f6aff6bdc076db6395b53334d98484a8ac2d7b1e9ec0a5b85bc2199e7861cfb6870f81b843621ffb9a90c493cfb544b219f353362d87 SHA512 19431be0f2d8733265840ae9d428a9ddae823e37017e23d798a12a3390c879b1d8bcffd4b7d12bca8f7f929fe307fd4bff9f421830ca7b5607a188364f02bb8f
+AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce
 DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 EBUILD openexr-2.5.8.ebuild 2037 BLAKE2B 0a934e0f8cf659d3a9209f1c289fcfefca2c08603950d940e24c445a16d056549e4a36bab8bcbbab0f2cea015908e9ecc56b471f73e0d9785b8a6cd9b46597ec SHA512 ca402e055f8ef05a96dc89245af3d675c66c3ac58ade050db66cb8be0132545d467f7d8930529fdbf47d215e53c0b45166b65a9e77fdccccc4b44deffca871e8
 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
-EBUILD openexr-3.1.5.ebuild 1803 BLAKE2B eb42d6fa4b88568e6133aecc6b41e6f0024e989f0520e1015142720f93e839d54cd5a4f7fc1eb9353451cce8fdc9bf0aaef7470c96fc69b28cc71a0d2fa21132 SHA512 2c7c8df67620d87eeb6c44aa257fdde1de9419a209ef07323a0249c432b80373e37239978dc7144a9e2a818565898a37df77b3ee5bf7d07c97e527551f9b5786
+EBUILD openexr-3.1.5.ebuild 1945 BLAKE2B 79c0860052d3466cc0e30e0f105b993b017651d03401b3d56418a8ca228956a953a5d255ac069c6f1dfa0c1644c4e8412084acaf81a8e38a64221df23d5c73f3 SHA512 ed403f051e9cc24fdb463cfd83bf257a273d72ea2664056efd161ff9a78fb477f977daec3f63cfe5143380f45a3fe7bd3e80c6d2431478a3e7e55bc6ace1533b
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch b/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
new file mode 100644
index 000000000000..3b104089350e
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
@@ -0,0 +1,44 @@
+From https://github.com/AcademySoftwareFoundation/openexr/commit/c5763cfdf59ef4880dacdb11664782822a0976cd
+From: Cary Phillips <cary@ilm.com>
+Date: Sun, 31 Jul 2022 13:36:03 -0700
+Subject: [PATCH 1/4] Add missing #include <cstdint> required by gcc-13 (#1264)
+
+Originally submitted as #1262, thanks.
+
+Signed-off-by: Cary Phillips <cary@ilm.com>
+
+Adapted changes in exrcheck/main.cpp for 3.1.5 code base on Gentoo (different
+ordering of #included header files compared to current HEAD).
+--- a/src/bin/exrcheck/main.cpp
++++ b/src/bin/exrcheck/main.cpp
+@@ -4,6 +4,7 @@
+ #include <ImfCheckFile.h>
+ #include <ImathConfig.h>
+ 
++#include <cstdint>
+ #include <iostream>
+ #include <fstream>
+ #include <string.h>
+--- a/src/lib/OpenEXR/ImfDeepTiledInputFile.h
++++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.h
+@@ -19,6 +19,7 @@
+ 
+ #include "ImfTileDescription.h"
+ 
++#include <cstdint>
+ #include <ImathBox.h>
+ 
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+--- a/src/lib/OpenEXR/ImfDeepTiledInputPart.h
++++ b/src/lib/OpenEXR/ImfDeepTiledInputPart.h
+@@ -10,6 +10,7 @@
+ 
+ #include "ImfTileDescription.h"
+ 
++#include <cstdint>
+ #include <ImathBox.h>
+ 
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+-- 
+2.37.3
+
diff --git a/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch b/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch
new file mode 100644
index 000000000000..77ca274703cc
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch
@@ -0,0 +1,21 @@
+https://github.com/AcademySoftwareFoundation/openexr/pull/1276
+
+From 974b14f67e89dddb6710364034116b3f7b9e0247 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 15 Sep 2022 18:58:01 +0200
+Subject: [PATCH] add missed #include <cstdint> statement
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/lib/OpenEXR/ImfTiledMisc.h
++++ b/src/lib/OpenEXR/ImfTiledMisc.h
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <vector>
++#include <cstdint>
+ 
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+ 
+-- 
+2.37.3
+
diff --git a/media-libs/openexr/openexr-3.1.5.ebuild b/media-libs/openexr/openexr-3.1.5.ebuild
index 920a0755bd8a..b13e0484bc86 100644
--- a/media-libs/openexr/openexr-3.1.5.ebuild
+++ b/media-libs/openexr/openexr-3.1.5.ebuild
@@ -30,7 +30,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+	"${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
+	"${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch
+)
 
 DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )