Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/, media-libs/opencv/files/
Date: Wed, 14 Sep 2022 09:19:37
Message-Id: 1663147139.118a0104ca9c4a75c1caf1b2c9eff1e7f9d7b02d.asturm@gentoo
1 commit: 118a0104ca9c4a75c1caf1b2c9eff1e7f9d7b02d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 14 08:34:27 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 14 09:18:59 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118a0104
7
8 media-libs/opencv: Fix IUSE=examples
9
10 Closes: https://bugs.gentoo.org/830163
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/opencv-4.6.0-fix-build-examples.patch | 21 +++++++++++++++++++++
14 media-libs/opencv/opencv-4.6.0-r2.ebuild | 1 +
15 2 files changed, 22 insertions(+)
16
17 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
18 new file mode 100644
19 index 000000000000..3cc6328a2323
20 --- /dev/null
21 +++ b/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch
22 @@ -0,0 +1,21 @@
23 +From 5acf351e4b9d099d446f401df690d559ed5dfdad Mon Sep 17 00:00:00 2001
24 +From: Prasanth R <prasanth.r@×××××××.com>
25 +Date: Thu, 14 Jul 2022 13:34:54 +0530
26 +Subject: [PATCH] #21804 Add opencv_gapi as dep to samples/cpp
27 +
28 +---
29 + samples/cpp/CMakeLists.txt | 1 +
30 + 1 file changed, 1 insertion(+)
31 +
32 +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
33 +index c9c4440f22c7..f23b333ca93a 100644
34 +--- a/samples/cpp/CMakeLists.txt
35 ++++ b/samples/cpp/CMakeLists.txt
36 +@@ -15,6 +15,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS
37 + opencv_calib3d
38 + opencv_stitching
39 + opencv_dnn
40 ++ opencv_gapi
41 + ${OPENCV_MODULES_PUBLIC}
42 + ${OpenCV_LIB_COMPONENTS})
43 + ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
44
45 diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
46 index 49f04357d294..8cca419b41eb 100644
47 --- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
48 +++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
49 @@ -290,6 +290,7 @@ PATCHES=(
50 "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
51 "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
52 "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
53 + "${FILESDIR}"/${P}-fix-build-examples.patch # bug 830163, pending upstream PR #22245
54 )
55
56 pkg_pretend() {