gentoo auto-resync : 14:09:2022 - 17:11:02

3 files changed, 24 insertions, 1 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d2a5e907bee6..03edde818e00 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,6 +3,7 @@ AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e30
 AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653
 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
 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
@@ -13,5 +14,5 @@ DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d2
 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.5.5-r2.ebuild 21327 BLAKE2B 3a9388932879709212610503a574b38b546bb534048c66e98f478fd8cebae11cf39b44ef856fb3bf4bccd51c2d579f95ec63079b353f3c466e572d04cc1e8e16 SHA512 d43f970665ff6861f14665e0b1541b2d86b0b5cf4277459209e75e0e43dc76373d160394ad204c8a964833c27a1a95a50a5c1a1df8299f5f696c13de84cd8ad5
-EBUILD opencv-4.6.0-r2.ebuild 21143 BLAKE2B e3902897ca5eb8f2857e8cb31732d05c17f8b5bab963d4f771ff2a6c554b320cdd1a5d3f4ce2ef82497510b4f9005a663ad3fac7508fe27508a943b14b54b42b SHA512 83822a0ea21787514005f004ef1254a8720c8fb385c26ad7a5cd612feb895fa7f1befb68a8f3ef6bccb0df00a9c8083dc5796851126a65ffd273784d18c6cf2e
+EBUILD opencv-4.6.0-r2.ebuild 21229 BLAKE2B 05e2c7422f8473bf037b777a5d4282d0f809c17455a645a937e10e1322b8cd66a8198960995880fec16dce1ba3f6d353aaf0f5c3d5851820c8c74649430b4157 SHA512 50755f7fc6ecf6575fe9cf262e9020c20be6395db7a5aa1f601fc861ea2171d9e532a0f0f4b5344e66b1b8fff9ebc385c38d0ca718cf9b280996c7d9c561c2a2
 MISC metadata.xml 3143 BLAKE2B 014a846a7843b1451b617a80a463342e66b1f204c0f67b84819105d5455968d57574f66d843b6207337e833cb8da161f893579e99fef5c33a4ab0e92c53b0fe6 SHA512 15f6e9fb6ab7ca886f8953dba3cf2b50a9ec9a9bd5b424a2c7af0382fbded7de6dcd3b83b7291a9d09f7a41d922ca7b5d8362786c98b8c6650ab02c1d6f23b1c
diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch b/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch
new file mode 100644
index 000000000000..3cc6328a2323
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch
@@ -0,0 +1,21 @@
+From 5acf351e4b9d099d446f401df690d559ed5dfdad Mon Sep 17 00:00:00 2001
+From: Prasanth R <prasanth.r@timesys.com>
+Date: Thu, 14 Jul 2022 13:34:54 +0530
+Subject: [PATCH] #21804 Add opencv_gapi as dep to samples/cpp
+
+---
+ samples/cpp/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index c9c4440f22c7..f23b333ca93a 100644
+--- a/samples/cpp/CMakeLists.txt
++++ b/samples/cpp/CMakeLists.txt
+@@ -15,6 +15,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS
+   opencv_calib3d
+   opencv_stitching
+   opencv_dnn
++  opencv_gapi
+   ${OPENCV_MODULES_PUBLIC}
+   ${OpenCV_LIB_COMPONENTS})
+ ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index 49f04357d294..8cca419b41eb 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -290,6 +290,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
 	"${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
 )
 
 pkg_pretend() {