gentoo auto-resync : 29:03:2023 - 21:54:14

3 files changed, 47 insertions, 3 deletions

diff --git a/sci-libs/ignition-common/Manifest b/sci-libs/ignition-common/Manifest
index 798e53169246..cfda3ec95d09 100644
--- a/sci-libs/ignition-common/Manifest
+++ b/sci-libs/ignition-common/Manifest
@@ -1,4 +1,5 @@
 AUX ffmpeg5.patch 1178 BLAKE2B e02bdb7bd615dcfeb679b39b83fdb31cf7bfe7badeacc87fbb2c5da8ec11a2422075dd0f9346b9cf6720abaf499ecafdb11d5c0c728a5c1a3ed3c883e939c5ef SHA512 601cded6c9f7e4b2928b8d9e50122072cf792fc6a98750b09e71d6eedff96b7c9ef62e3ad786c67704c7b3be41021777bd7a86cccf40e1a086cba6d008eb2bc0
+AUX ffmpeg6.patch 1722 BLAKE2B 9c376400f0ea2db6446fec55c11fcefe1d49f99c8258684e26de2faf4862369a1fd36feb43d92ad1b041e675fb26c73675c7423ff7ca849517fd90066e17d21b SHA512 75e36c043937eb1e10f7cbef8325e6ac94e1b42e616ab91fe9ee7cf8a01b71cd6a7cf7dbbcfe8d4db424ea89ce6a6f34479619773572e828f98626cf6e2a34c4
 DIST ignition-common3_3.14.2.tar.gz 7174986 BLAKE2B 38e42f139321aba5ab42c71d874b516bdf7a32edf3d1b0649991e27957d85e1b416d0206cadbeeea12957f7563920952982e4efb813ce8f33520c06e651553cc SHA512 fdc9dfdc8f69ff72e4381af61b3a6e120f361ab21417792db17f85e0ba2d60c4e32df0b72a45101ed72f65ea16a82c95d29e410962e9ecb40c2427a88593bc15
-EBUILD ignition-common-3.14.2.ebuild 974 BLAKE2B b755c0be052b5b5438a6b2306eb3673bd9cc6361980b55a4e371ca6371025c25d6e0a934256921c65a167255dfa0f8101379607887f977fe2e57291d246f6f88 SHA512 65f0492d27f221f2c477001feb8fb0d92322feeb4629c5b6367d8fb00087261b60047f135762718e73621a0dda0cedd5b4fd0576a20207daaf6059a3baff4953
+EBUILD ignition-common-3.14.2.ebuild 1004 BLAKE2B 80510c8ddbe2a83873a548b51e8b432117b7247006f167c076b4b9091102d42c83b1977818e196e4200b6b388ef9d1074d11d643cbffefc50f6a45275f8710d0 SHA512 5c016e73bdf3116c9ba0839c1e4d5e75fad1e8a3f28fb27be547790d8731f80d8465da9ef959a7780faf8d07e988434950527db4405c07a7c5698ebc30312aed
 MISC metadata.xml 342 BLAKE2B d5a6fb81442fbf553f05a28de85f698d01e61f34c784ab4cf30c9dce02715a976fa39376c47155d98f144fa4031613c9749605b2eae0af7f03690fed35981398 SHA512 c9394c6ade1913a0785c8018bd6076a403042bc9430c1ba6b6407d701a9a55bd155be17a09c0b1bfdd6b112250818a823e670ef482776a0090e67f49b05166e8
diff --git a/sci-libs/ignition-common/files/ffmpeg6.patch b/sci-libs/ignition-common/files/ffmpeg6.patch
new file mode 100644
index 000000000000..b4d61f181291
--- /dev/null
+++ b/sci-libs/ignition-common/files/ffmpeg6.patch
@@ -0,0 +1,40 @@
+Index: gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
+===================================================================
+--- gz-common-ignition-common3_3.14.2.orig/av/src/AudioDecoder.cc
++++ gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
+@@ -348,6 +348,7 @@ bool AudioDecoder::SetFile(const std::st
+     return false;
+   }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 60
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
+   if (this->data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+     this->data->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+@@ -355,6 +356,7 @@ bool AudioDecoder::SetFile(const std::st
+   if (this->data->codec->capabilities & CODEC_CAP_TRUNCATED)
+     this->data->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
+ #endif
++#endif
+ 
+   // Open codec
+   if (avcodec_open2(this->data->codecCtx, this->data->codec, nullptr) < 0)
+Index: gz-common-ignition-common3_3.14.2/av/src/Video.cc
+===================================================================
+--- gz-common-ignition-common3_3.14.2.orig/av/src/Video.cc
++++ gz-common-ignition-common3_3.14.2/av/src/Video.cc
+@@ -179,6 +179,7 @@ bool Video::Load(const std::string &_fil
+     this->dataPtr->videoStream]->codec;
+ #endif
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 60
+   // Inform the codec that we can handle truncated bitstreams -- i.e.,
+   // bitstreams where frame boundaries can fall in the middle of packets
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
+@@ -188,6 +189,7 @@ bool Video::Load(const std::string &_fil
+   if (codec->capabilities & CODEC_CAP_TRUNCATED)
+     this->dataPtr->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
+ #endif
++#endif
+ 
+   // Open codec
+   if (avcodec_open2(this->dataPtr->codecCtx, codec, nullptr) < 0)
diff --git a/sci-libs/ignition-common/ignition-common-3.14.2.ebuild b/sci-libs/ignition-common/ignition-common-3.14.2.ebuild
index b1328bf00fb2..122afd62eb9c 100644
--- a/sci-libs/ignition-common/ignition-common-3.14.2.ebuild
+++ b/sci-libs/ignition-common/ignition-common-3.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,10 @@ BDEPEND="
 	dev-util/ignition-cmake:2"
 
 S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}"
-PATCHES=( "${FILESDIR}/ffmpeg5.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg5.patch"
+	"${FILESDIR}/ffmpeg6.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(