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 53E2C158020 for ; Sat, 15 Oct 2022 00:44:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A2D5E07C7; Sat, 15 Oct 2022 00:44:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 6B9DBE07C7 for ; Sat, 15 Oct 2022 00:44:57 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 846B2340F4E for ; Sat, 15 Oct 2022 00:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCE5F608 for ; Sat, 15 Oct 2022 00:44:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665794687.2df30a8bd2f70b44639ed94b5ff8b1680944dae1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch media-libs/opencv/opencv-4.6.0-r2.ebuild X-VCS-Directories: media-libs/opencv/ media-libs/opencv/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2df30a8bd2f70b44639ed94b5ff8b1680944dae1 X-VCS-Branch: master Date: Sat, 15 Oct 2022 00:44:54 +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: d4395c5a-6f6a-463a-940f-d41178139772 X-Archives-Hash: 21cacfbdfe295ae70beb88e2e517411e commit: 2df30a8bd2f70b44639ed94b5ff8b1680944dae1 Author: Sam James gentoo org> AuthorDate: Sat Oct 15 00:44:35 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 15 00:44:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df30a8b media-libs/opencv: fix build with ffmpeg 5 Closes: https://bugs.gentoo.org/876748 Signed-off-by: Sam James gentoo.org> .../opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch | 19 +++++++++++++++++++ media-libs/opencv/opencv-4.6.0-r2.ebuild | 1 + 2 files changed, 20 insertions(+) diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch new file mode 100644 index 000000000000..557576a8747a --- /dev/null +++ b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch @@ -0,0 +1,19 @@ +https://github.com/opencv/opencv/issues/22418 +https://github.com/opencv/opencv/commit/496eed950f6d0e7fd92619d47e3cec8f06e96ace +https://bugs.gentoo.org/876748 + +From: Jochen Sprickerhof +Date: Mon, 8 Aug 2022 21:10:13 +0200 +Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT + +--- a/modules/videoio/src/ffmpeg_codecs.hpp ++++ b/modules/videoio/src/ffmpeg_codecs.hpp +@@ -60,6 +60,7 @@ extern "C" { + #include + #endif + ++#include + #include + + #ifdef __cplusplus + diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild index a02ff7760364..4f475dc6f45e 100644 --- a/media-libs/opencv/opencv-4.6.0-r2.ebuild +++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild @@ -291,6 +291,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch "${FILESDIR}"/${P}-fix-build-examples.patch # bug 830163, pending upstream PR #22245 + "${FILESDIR}"/${P}-fix-ffmpeg-5.patch ) pkg_pretend() {