gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sci-libs/ignition-common: fix build with ffmpeg6

Browse Source 
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2023-03-29 18:16:27 +02:00
parent 909822b6b6
commit 2671860189
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sci-libs/ignition-common/files/ffmpeg6.patch Normal file
View File

@@ -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)

7
sci-libs/ignition-common/ignition-common-3.14.2.ebuild
View File

@@ -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=(