From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76C3D15802F for ; Wed, 29 Mar 2023 16:38:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F7032BC009; Wed, 29 Mar 2023 16:38:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 490DA2BC009 for ; Wed, 29 Mar 2023 16:38:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BA0933BE25 for ; Wed, 29 Mar 2023 16:38:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8F888E6 for ; Wed, 29 Mar 2023 16:38:53 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1680107926.f5229d7d812b1b9e66eb5556eae4803edd1a4943.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/gazebo/files/ffmpeg6.patch sci-electronics/gazebo/gazebo-11.12.0.ebuild X-VCS-Directories: sci-electronics/gazebo/files/ sci-electronics/gazebo/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: f5229d7d812b1b9e66eb5556eae4803edd1a4943 X-VCS-Branch: master Date: Wed, 29 Mar 2023 16:38:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f869be65-5d1d-4c92-b5d4-5cabe4a1ad64 X-Archives-Hash: 0e9845e0c20fd2d8baa6f5e2aecf2b1f commit: f5229d7d812b1b9e66eb5556eae4803edd1a4943 Author: Alexis Ballier gentoo org> AuthorDate: Wed Mar 29 16:38:42 2023 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Wed Mar 29 16:38:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5229d7d sci-electronics/gazebo: fix build with ffmpeg6 Signed-off-by: Alexis Ballier gentoo.org> sci-electronics/gazebo/files/ffmpeg6.patch | 40 ++++++++++++++++++++++++++++ sci-electronics/gazebo/gazebo-11.12.0.ebuild | 1 + 2 files changed, 41 insertions(+) diff --git a/sci-electronics/gazebo/files/ffmpeg6.patch b/sci-electronics/gazebo/files/ffmpeg6.patch new file mode 100644 index 000000000000..932d1e31c9d1 --- /dev/null +++ b/sci-electronics/gazebo/files/ffmpeg6.patch @@ -0,0 +1,40 @@ +Index: gazebo-11.12.0/gazebo/common/AudioDecoder.cc +=================================================================== +--- gazebo-11.12.0.orig/gazebo/common/AudioDecoder.cc ++++ gazebo-11.12.0/gazebo/common/AudioDecoder.cc +@@ -364,6 +364,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->codec->capabilities & AV_CODEC_CAP_TRUNCATED) + this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED; +@@ -371,6 +372,7 @@ bool AudioDecoder::SetFile(const std::st + if (this->codec->capabilities & CODEC_CAP_TRUNCATED) + this->codecCtx->flags |= CODEC_FLAG_TRUNCATED; + #endif ++#endif + + // Open codec + if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0) +Index: gazebo-11.12.0/gazebo/common/Video.cc +=================================================================== +--- gazebo-11.12.0.orig/gazebo/common/Video.cc ++++ gazebo-11.12.0/gazebo/common/Video.cc +@@ -214,6 +214,7 @@ bool Video::Load(const std::string &_fil + return false; + } + ++#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) +@@ -223,6 +224,7 @@ bool Video::Load(const std::string &_fil + if (codec->capabilities & CODEC_CAP_TRUNCATED) + this->codecCtx->flags |= CODEC_FLAG_TRUNCATED; + #endif ++#endif + + // Open codec + if (avcodec_open2(this->codecCtx, codec, nullptr) < 0) diff --git a/sci-electronics/gazebo/gazebo-11.12.0.ebuild b/sci-electronics/gazebo/gazebo-11.12.0.ebuild index 79c54a12daca..3eaa4232a79e 100644 --- a/sci-electronics/gazebo/gazebo-11.12.0.ebuild +++ b/sci-electronics/gazebo/gazebo-11.12.0.ebuild @@ -65,6 +65,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo PATCHES=( "${FILESDIR}/qwt2.patch" "${FILESDIR}/cmake.patch" + "${FILESDIR}/ffmpeg6.patch" ) src_configure() {