gentoo auto-resync : 15:08:2024 - 12:22:30

3 files changed, 42 insertions, 1 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index eb0f3161676d..57cae026e445 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,7 @@ AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2
 AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6
 AUX libaom-3.8.1-tests-parallel.patch 907 BLAKE2B 3c969182fed047b6075ebd0d19f50dfe19028658da42eefc991eaf4ed15736ac95219f5562dc8c04e34849c615fe74a5c940701e274ed7485387092d8d46fb50 SHA512 293924e8732640977c706dcf7fe811f76f093402faa3db8e61d35e32552df889dc63073f004dce4bc4230ceb647f78d0085c9a0099b597b148b9a29fc38f2544
 AUX libaom-3.9.0-guard-ssse3.patch 1570 BLAKE2B 69b5b73ba6ff68b1e5badfcd7cfdf9cc6afeca2838363273852c7757efba448881d042e52be9632c7593cd0992daea439c05da3423a7d31c2abac64fe86723f0 SHA512 5222e5af8a41da106074ed312fb1c35ce7337b43cc6d0ec3e9fbf11fecef2e5f756d64dafa3d5cb6a0d4d31afa9e155b795dfe0db37b891f54ad2d1b409b74a4
+AUX libaom-3.9.1-gcc15-cstdint.patch 1173 BLAKE2B a52439c510a54a1af72c56efff47e004ffef6c276aeebc02981b95afeca30dbacaa87baadfb25f2638454ccbc556b023c06814878fcb45a0eaa0c3e5682fdb25 SHA512 396deeaefec8152c4f45a8c788941a30688d2b7d72cb6233902e3b4cdc7d2bb1110fed56219b176a77057dd7231a5deab3c190f261cdf9e194af519fbb71d09a
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e2258215e99cab4b6f64ac558213009477bc22f43267b60bcbb30ec10325de2aed48b22237b12cd6220f4330e300b62bafedac0b SHA512 c08ef4c9c45f1a27e6c31b8cc9799d8e65d895663a79d7be51da1733be6d8013adaad3a8f1d7491f555a2eea58aead44b9ce935c3e9bb957cb8bbb93f6f4fd98
 DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3
@@ -17,6 +18,6 @@ EBUILD libaom-3.5.0.ebuild 3298 BLAKE2B d5039a7ac72305f1e4930e258577d8aa15b5fa1c
 EBUILD libaom-3.7.0-r2.ebuild 4388 BLAKE2B 0d0cf93808bbc21cdad38266631884bea7ea34bc0476578656b03ad2bd85fc17b20c7655ba9ba0cdce5405d6c434baae722f512d94538dda41b921dbdc49eb6e SHA512 88f0da21d5088db1ab848dd877b59a07415e2bfe604922964e3b6904e98a81177f40ca257d049bc98a1cb14eb869657dc8d6c579c5009cf025b5b2af1659e672
 EBUILD libaom-3.8.1.ebuild 5021 BLAKE2B efdf65610fd174e11d56b721f5cfeff9e1f9e394cb14a687a5129b779d26d2fbad91b0dc1ad91ad4f760f0994e251de4e293970f902c1cf0dde7b6c452912b95 SHA512 0a0d53ad8271f838c88e48c328533fa20846a76e2d76ce18673791a61360e5efaa883ca6c8cc8539d3dc00054c6a7cc15f6934cabb8a539aa1e662e763271263
 EBUILD libaom-3.9.0.ebuild 4546 BLAKE2B 2c776663efbfc9ed96750e31f83483e0281d6d7a976afd1259fa6b883a57e5287aef30fe2ee25c86103860158ab76fb8bacefeec2a1198ae0a7e595688e64cd0 SHA512 ec8ef1f77cd78a8341cfe47abba0586796e32f9f231ca440575300e96e084c23cba8ac62bf8c1e1b970efce5eaf7e2715fc88bc2863083a1c3e6849218483984
-EBUILD libaom-3.9.1.ebuild 4500 BLAKE2B 683ff001c44e58f2ef9a6647e5ab0528985d3e0ad2fa1e0cddebcf41994ea436cb9a0fde425798390e49c977e3ff535ed2e16a0a5e24eed9f077d3b5311c4e4f SHA512 44d493599fb34ac00db89c81e544dc6b733f88a43269c03405e9e4cc5dccce1ded513762b23002066f99ecb4a7b1b02a4992bc78fa53229186724dbee35307dc
+EBUILD libaom-3.9.1.ebuild 4547 BLAKE2B cc36bec843d1d93c31827bfee0f761db39bcbd32c8e0199490082fdbdb40008c0a858d66b89276f294387b188d315e860c9e3cecdf831acdf684ae341777d7bb SHA512 d2132f43c4f94f2094b1ace9f1b2a30da761109d7ae78c97a64eabb20913863ba9962dfdcd14cf1efb6968fa8573300d1ade03016c36c4f1fb137607a40656a7
 EBUILD libaom-9999.ebuild 4520 BLAKE2B 12310a60c0c2b3492c40464d3e33d870f16ff79553080b5d2f515e110f9f683c22fc31fdfe1bfdc026cca6e69cde248fe2f59fdd06a0b101a15f50923f07c76e SHA512 78824f8e0586cbdb76041524b4696b5ad314c35af3aebed45904a5b08614c29f2e6f299ac010e00136a802f6afbcd9df08836f71d9faa76e2a0bab105e02b1b7
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.9.1-gcc15-cstdint.patch b/media-libs/libaom/files/libaom-3.9.1-gcc15-cstdint.patch
new file mode 100644
index 000000000000..4195d240e493
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.9.1-gcc15-cstdint.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/937420
+https://aomedia.issues.chromium.org/issues/357622679
+https://aomedia-review.googlesource.com/c/aom/+/192404
+
+From b20dcf3adf51919226b436151734ba38d1123850 Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Tue, 06 Aug 2024 10:38:00 -0700
+Subject: [PATCH] update libwebm to libwebm-1.0.0.31-10-g3b63004
+
+This fixes a build error seen in gcc 15:
+3b63004 mkvparser/mkvparser.cc: add missing <cstdint> include
+
+Bug: aomedia:357622679
+Change-Id: I6c4a1795d189f9993d4f2c5c9f0375912bc58f0c
+(cherry picked from commit e448dcd13a9f534c7291903e9ab18dfc4fea54ad)
+--- a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
++++ b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
+@@ -8,9 +8,9 @@
+ #ifndef MKVMUXER_MKVMUXERUTIL_H_
+ #define MKVMUXER_MKVMUXERUTIL_H_
+ 
+-#include "mkvmuxertypes.h"
++#include <stdint.h>
+ 
+-#include "stdint.h"
++#include "mkvmuxertypes.h"
+ 
+ namespace mkvmuxer {
+ class Cluster;
+--- a/third_party/libwebm/mkvparser/mkvparser.cc
++++ b/third_party/libwebm/mkvparser/mkvparser.cc
+@@ -16,6 +16,7 @@
+ #include <cfloat>
+ #include <climits>
+ #include <cmath>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <new>
diff --git a/media-libs/libaom/libaom-3.9.1.ebuild b/media-libs/libaom/libaom-3.9.1.ebuild
index 18e04da00b1b..7e193b62a448 100644
--- a/media-libs/libaom/libaom-3.9.1.ebuild
+++ b/media-libs/libaom/libaom-3.9.1.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
 	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
 	"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
+	"${FILESDIR}"/${PN}-3.9.1-gcc15-cstdint.patch
 )
 
 multilib_src_configure() {