gentoo auto-resync : 15:10:2022 - 07:50:10

3 files changed, 22 insertions, 1 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 16ef6d9f011b..a14b91eb2eb5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,11 +4,12 @@ AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0
 AUX opencv-4.4.0-disable-native-cpuflag-detect.patch 1218 BLAKE2B 06569f6b7d33eccb11cae74624a2cc7d7e1eb788145813509220dc8436d2380892392be8c4af03fec845f3eade74b6277985cf80e38785317b15f17890bcaa4c SHA512 3be60f7ee28e3b001ef0c791e3ce1c849ff6fa9fdb70731716668b2698eed9abb24ee3aead1dbc857ed68fc46a645c70a1e3831e8a3e5a5b1791aa06bd2f9ee1
 AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf810e13fe20705352ff506a653c1d55bb0687c03d8daf9e05aed0f2ba9cd6e306c625837d6ddf64eeb99dc6cbf2b15fae833f4a7eea6aad0 SHA512 4c3108e304721c2cd78eb82f5d7bccc18831db5f47bc628a98ae6a37da389deef30e7e9b6dc5644e3bc0e0fafdd907dc37822a58a25555999698527d2ac364b0
 AUX opencv-4.6.0-fix-build-examples.patch 700 BLAKE2B 4560255001cde7e8071d2ee93a437f01a9f745e825b92b1a9f66fab143f5e060a01c706d180e8ee5449e4ca1a0eec591c71215df18ba3f49fab683124f577007 SHA512 02c51e755c98b2b51f11f1d34a88ec77f727f91d5af91426a5c625215ccde28ca57de356f2187df003fa2bc97ef9304a2d95b8aca0e71b999341b0d258e8bc0b
+AUX opencv-4.6.0-fix-ffmpeg-5.patch 547 BLAKE2B a1257e21f8c9ae5255c9155d913c304907e9af0ba8ca1d2d2bb10e2cbe54c9c98aa495f15c6c7b999bbfe2ee9c47c2898859ed84a121fcdd1549c1d122779cc4 SHA512 75961c301082e21839ade53a9ec3adb8d8f2b150e1a87effa7a0d7de3b30ccc7f1506d94311740fc2c933666317e32953626cdd38acecfaff854124b1f8d4163
 DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
 DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
 DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
 DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.6.0-r2.ebuild 21226 BLAKE2B a17cbdc46dbfc21ec5f8197f64afa2346942413ef0dcb2b58a2badaa265068cf9b0219c0bff1962d6cc2f2c9973ad956a14836e4d4cab041d105ab5750a7f143 SHA512 cc8cd32a006a63bf3ab6f40e5df874d193375b3e629d58de233c6d641b5b9a2d5ed82992d60726953002526ae514b8c3f6d97d75476d1faec584f8a499a96e63
+EBUILD opencv-4.6.0-r2.ebuild 21265 BLAKE2B 2efea43929caf99bccaa596dcbfe14a508347c538f17d6b9d8dd004287da5568868f97d84b0ab25208be91a26430694734153c9a4145b90d4da999c08bc612d6 SHA512 64dd47e1061492b48a63a91681eadb8370f2aad0e5dd85b4c44dbfe0a5bc9fd1ec4c82dd794af3f4305ea69ae4ecfe7a60d6d5d3e0e0f8ef462adacbe513c109
 MISC metadata.xml 3143 BLAKE2B 014a846a7843b1451b617a80a463342e66b1f204c0f67b84819105d5455968d57574f66d843b6207337e833cb8da161f893579e99fef5c33a4ab0e92c53b0fe6 SHA512 15f6e9fb6ab7ca886f8953dba3cf2b50a9ec9a9bd5b424a2c7af0382fbded7de6dcd3b83b7291a9d09f7a41d922ca7b5d8362786c98b8c6650ab02c1d6f23b1c
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 <jspricke@debian.org>
+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 <errno.h>
+ #endif
+ 
++#include <libavcodec/version.h>
+ #include <libavformat/avformat.h>
+ 
+ #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() {