gentoo auto-resync : 13:01:2024 - 01:09:33

2 files changed, 152 insertions, 3 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c510aeb1eeee..900ec18dfd80 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -32,5 +32,5 @@ DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BL
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.8.0-r3.ebuild 21551 BLAKE2B dc795690c4d8672c82ce44ba3e7fb67c32206155cc18624109da4106b0eee16d03fd3591d843af6bd1b5caf0c5050c4ee75201758e8a0d764ffdb4195844f301 SHA512 f9d927735bdd34d41b0dcc9a2a7ce5944c7f40f75934b0e93574ce2619d06a0d01527a20c1320a9cfd907ce11f51dddb3de2e413796ddf9f2f90d3932db5bbac
-EBUILD opencv-4.8.1-r1.ebuild 21641 BLAKE2B 066ba03a545f0952f15b2061e183beb8ab6fafebbd8ae9c6d13f687189889abcb5158e8baffc106dd5e2ee2971ad2b658aa3699cf64c8f5adead3a266d6553ec SHA512 453233aa0c6075722810ba736c5f04bfb0eefdb852c51185aeea19f62d254a667e4b46757cbcb393024114cb9bbd16bbd0fe172241156a53dfc1a7cca9d49b8f
+EBUILD opencv-4.8.1-r1.ebuild 29111 BLAKE2B 14c3f8dd665800c7b9c2ddaf2c555729e0cff22e953d9a780d1dc53a06ee56d9221e8e4942f511b652f9dcfeea0cc9241a59806828453df945b86f19bccbcf9d SHA512 c9b534968a863e763d585077dea64a56f5251a0c0dac710f91ceab0deaa39de3f44e41cc7b03183a996d20d4c47584493ce15cec75636cf6fb4766e7104464c1
 MISC metadata.xml 3428 BLAKE2B 17df3db9dc912981f85b6dd7e500b593504fe6d17c85d1ebc07afa8ab04266489550b03aa20ee80615f52f8e2a206c77b00d9bfc9096bf77239378fa0874a0db SHA512 15e6dc56efd85d9b6d173979ef5edc38978cf31f0b2700674ffda5fb53923df77453234b431c21ff61943c57218f8fe4fe611701abb630c9867ed990cf953d49
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 643ae918665e..1a7df1d12747 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -369,7 +369,7 @@ multilib_src_configure() {
 		-DENABLE_DOWNLOAD=yes
 		-DOPENCV_ENABLE_NONFREE=$(usex non-free)
 		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_FLATBUFFERS=$(usex contribdnn)
+		-DWITH_FLATBUFFERS=$(multilib_native_usex contribdnn)
 		-DWITH_1394=$(usex ieee1394)
 	#	-DWITH_AVFOUNDATION=OFF # IOS
 		-DWITH_VTK=$(multilib_native_usex vtk)
@@ -545,7 +545,7 @@ multilib_src_configure() {
 	# ===================================================
 	if use contrib; then
 		mycmakeargs+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DBUILD_opencv_dnn=$(multilib_native_usex contribdnn ON OFF)
 			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
 			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
 			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
@@ -637,6 +637,155 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
+	if use abi_x86_64 && use abi_x86_32; then
+		MULTILIB_WRAPPED_HEADERS=(
+			# [opencv4]
+			/usr/include/opencv4/opencv2/cvconfig.h
+			/usr/include/opencv4/opencv2/opencv_modules.hpp
+
+			/usr/include/opencv4/opencv2/core_detect.hpp
+
+			/usr/include/opencv4/opencv2/cudaarithm.hpp
+			/usr/include/opencv4/opencv2/cudabgsegm.hpp
+			/usr/include/opencv4/opencv2/cudacodec.hpp
+			/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+			/usr/include/opencv4/opencv2/cudafilters.hpp
+			/usr/include/opencv4/opencv2/cudaimgproc.hpp
+			/usr/include/opencv4/opencv2/cudalegacy.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+			/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+			/usr/include/opencv4/opencv2/cudaoptflow.hpp
+			/usr/include/opencv4/opencv2/cudastereo.hpp
+			/usr/include/opencv4/opencv2/cudawarping.hpp
+			# [cudev]
+			/usr/include/opencv4/opencv2/cudev.hpp
+			/usr/include/opencv4/opencv2/cudev/block/block.hpp
+			/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+			/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+			/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+			/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+			/usr/include/opencv4/opencv2/cudev/common.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+			/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+			/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+			/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+			/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+			/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+			/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+			/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+			/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+			/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+			/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+			# [contribcvv]
+			/usr/include/opencv4/opencv2/cvv.hpp
+			/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+			/usr/include/opencv4/opencv2/cvv/cvv.hpp
+			/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+			/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+			/usr/include/opencv4/opencv2/cvv/filter.hpp
+			/usr/include/opencv4/opencv2/cvv/final_show.hpp
+			/usr/include/opencv4/opencv2/cvv/show_image.hpp
+			# [contribdnn]
+			/usr/include/opencv4/opencv2/dnn.hpp
+			/usr/include/opencv4/opencv2/dnn/all_layers.hpp
+			/usr/include/opencv4/opencv2/dnn/dict.hpp
+			/usr/include/opencv4/opencv2/dnn/dnn.hpp
+			/usr/include/opencv4/opencv2/dnn/dnn.inl.hpp
+			/usr/include/opencv4/opencv2/dnn/layer.details.hpp
+			/usr/include/opencv4/opencv2/dnn/layer.hpp
+			/usr/include/opencv4/opencv2/dnn/shape_utils.hpp
+			/usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp
+			/usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+			/usr/include/opencv4/opencv2/dnn/version.hpp
+			/usr/include/opencv4/opencv2/dnn_superres.hpp
+			# [contribhdf]
+			/usr/include/opencv4/opencv2/hdf.hpp
+			/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+
+			/usr/include/opencv4/opencv2/mcc.hpp
+			/usr/include/opencv4/opencv2/mcc/ccm.hpp
+			/usr/include/opencv4/opencv2/mcc/checker_detector.hpp
+			/usr/include/opencv4/opencv2/mcc/checker_model.hpp
+
+			/usr/include/opencv4/opencv2/text.hpp
+			/usr/include/opencv4/opencv2/text/erfilter.hpp
+			/usr/include/opencv4/opencv2/text/ocr.hpp
+			/usr/include/opencv4/opencv2/text/swt_text_detection.hpp
+			/usr/include/opencv4/opencv2/text/textDetector.hpp
+
+			# [qt5,qt6]
+			/usr/include/opencv4/opencv2/viz.hpp
+			/usr/include/opencv4/opencv2/viz/types.hpp
+			/usr/include/opencv4/opencv2/viz/viz3d.hpp
+			/usr/include/opencv4/opencv2/viz/vizcore.hpp
+			/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+			/usr/include/opencv4/opencv2/viz/widgets.hpp
+
+			/usr/include/opencv4/opencv2/wechat_qrcode.hpp
+		)
+	fi
 	if multilib_is_native_abi && use python; then
 		python_foreach_impl cmake_src_install
 		python_foreach_impl python_optimize