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 B996A158086 for ; Sat, 4 Dec 2021 19:09:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E920CE07C7; Sat, 4 Dec 2021 19:09:38 +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 34F02E07C7 for ; Sat, 4 Dec 2021 19:09:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1A0E6342F84 for ; Sat, 4 Dec 2021 19:09:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBF801C6 for ; Sat, 4 Dec 2021 19:09:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1638644968.41392ff39110c7b29a954737c0050d008e12fbaf.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-4.5.4.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 41392ff39110c7b29a954737c0050d008e12fbaf X-VCS-Branch: master Date: Sat, 4 Dec 2021 19:09:35 +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: 1c3565ca-c36c-4ee4-b47b-ea85c14d3005 X-Archives-Hash: cefaac1736dcd0fc5afb5e15e41b3e17 commit: 41392ff39110c7b29a954737c0050d008e12fbaf Author: David Seifert gentoo org> AuthorDate: Sat Dec 4 19:09:28 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Dec 4 19:09:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41392ff3 media-libs/opencv: fix USE=contribsfm multilib header clash Closes: https://bugs.gentoo.org/828132 Signed-off-by: David Seifert gentoo.org> media-libs/opencv/opencv-4.5.4.ebuild | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild index ca4d84d5a815..55c89688fe82 100644 --- a/media-libs/opencv/opencv-4.5.4.ebuild +++ b/media-libs/opencv/opencv-4.5.4.ebuild @@ -268,6 +268,17 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/opencv4/opencv2/hdf.hpp # [contrib_ovis] /usr/include/opencv4/opencv2/ovis.hpp + # [contrib_sfm] + /usr/include/opencv4/opencv2/sfm.hpp + /usr/include/opencv4/opencv2/sfm/conditioning.hpp + /usr/include/opencv4/opencv2/sfm/fundamental.hpp + /usr/include/opencv4/opencv2/sfm/io.hpp + /usr/include/opencv4/opencv2/sfm/numeric.hpp + /usr/include/opencv4/opencv2/sfm/projection.hpp + /usr/include/opencv4/opencv2/sfm/reconstruct.hpp + /usr/include/opencv4/opencv2/sfm/robust.hpp + /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp + /usr/include/opencv4/opencv2/sfm/triangulation.hpp # [vtk] /usr/include/opencv4/opencv2/viz.hpp /usr/include/opencv4/opencv2/viz/types.hpp