mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-libs/opencv: add 4.12.0
Closes: https://bugs.gentoo.org/957618 Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43702 Closes: https://github.com/gentoo/gentoo/pull/43702 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -4,6 +4,8 @@ DIST ade-0.1.2e.tar.gz 117054 BLAKE2B 6f6b3bc39e45fff946f75f3b445b05b5a19b757459
|
||||
DIST opencv-4.10.0-protobuf-30.patch 2746 BLAKE2B 7a532d6b50878b4518b2b4342474b9115cb4d58898d8bd9d300520c9f84fd0bffb97b6796f89dee29b7ec6f9d526dff421dd82d4c034114da65d9900deea4d42 SHA512 b749aaa56426ba452bd0d0b54de2803e2b03ad14c9059ad4e32e689d9d0c9f9c97e5627b5db3204171ae32d8a6b88b036ab7b67093807c98607630d2b05669b5
|
||||
DIST opencv-4.10.0.tar.gz 94993429 BLAKE2B f16de226337ce1dabda4a52ae03257b0570af0e6212102c483dce61f2bcee1549150d0016b6ea20bae5d8c838e12db3d54bcb9c2ec5d3164639cdd56818f0b1b SHA512 b4f7248f89f1cd146dbbae7860a17131cd29bd3cb81db1e678abfcfbf2d8fa4a7633bfd0edbf50afae7b838c8700e8c0d0bb05828139d5cb5662df6bbf3eb92c
|
||||
DIST opencv-4.11.0.tar.gz 95051012 BLAKE2B a4195007513d82666f785b58bccce69158f81420d6519e162a122bc245f59db3118edb8cacb3b6cadce3c7df7823859f06a1d2cb33ad0a256b19c96629fecfb2 SHA512 3b6e0da8169449944715de9e66380977791069a1d8288534ec768eaa2fb68533821fd8e06eac925a26656baf42185258b13aa80579e1e9be3ebc18fcea66f24d
|
||||
DIST opencv-4.12.0.tar.gz 95254890 BLAKE2B 26a5258e0ef3fb37f0d5a67cc329a14e204080a636b94a8c9dd5cbd7e5e623528726af023f5aaf85fe8da952040f1f08593ac8093b9531c273eea47eb631e12c SHA512 8ac63ddd61e22cc0eaeafee4f30ae6e1cab05fc4929e2cea29070203b9ca8dfead12cc0fd7c4a87b65c1e20ec6b9ab4865a1b83fad33d114fc0708fdf107c51b
|
||||
DIST opencv-PR27737.patch 1182 BLAKE2B c58f157db58a8223717a110a254e876e838b548ca322ab10c240e32f39979a4afc6cd87a6581dea342ae02e30a65ba258f4c36f054ec76ae3ee2cd612343bfd0 SHA512 9b6a22ab21e040752ef8458605bc5ba1f4db45bf3f7a5a3afa5bd63d0d658459421099d383f10ad08e048c4ce6845863f3cf429df38c91f99426ac70241827d1
|
||||
DIST opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 BLAKE2B 9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169e2222f6 SHA512 8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3
|
||||
DIST opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 BLAKE2B 923dc944edfda4c292d42207290bee414bfe21998f6ffe341ea3b38b6f2f581f3a243653e2c1fd3fa86084068ad6e7acd5ca73ab43094aa15f124d379833a5d8 SHA512 68cce870da0846cbd12a093ec7896b510e34590dad2b91699be1df5d4f72d343f9789d54c45c1b801784f7e57e0e80b19ba65dd99855225da99b4193dae97aaa
|
||||
DIST opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz 920403 BLAKE2B 5f834e8ccef9d88d0650f8ae5d215a2d07d0a356aaad4de1622068e0b2a7def88fccc84bc4397f0182732e836fcd6e363ae25a2cdeaa4d458a7d8ef9afc81da5 SHA512 5611b9db40477759213ab35320570c198f1f224f92ca801ca3accd1f7620faf3d44f306e44abefd10be118acee9b56da643ca82abaa7c4d2102fe92e5b298a6e
|
||||
@@ -12,6 +14,8 @@ DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLA
|
||||
DIST opencv_contrib-4.10.0-3607.patch 29870 BLAKE2B cf43afbd24d0b32817e908c55ac3bf0d5da8b82b2c459bc04ef31414e16285eefe334c46eeee730bd3cad2bbec062f5bc212a82bd7f2ac83baca231d711545d4 SHA512 3fdd08cee6d7da8edf36411f30c8d6230ebd86a1c896a08f1dc86d3a0982e1f1f99797066722bc51ce4b1a60a2db55853c348441b3e6edc0d318fcb7bd5cf944
|
||||
DIST opencv_contrib-4.10.0.tar.gz 55387316 BLAKE2B 5d6f884817b6d45b86833fcab1e31cd0fd7be19885698e0aefe300fa570f93c446d7f564567cc08099d559a98a65e9c3dd0fd35ceeca7e0e9a1e56edc74a0fe9 SHA512 480df862250692a97ce6431cba00dbecb70332307a19c1c04aa9d7444e6e74ab4f8c798548dce76d2319a9877624b82e361fb22a71df14b996087ade448be501
|
||||
DIST opencv_contrib-4.11.0.tar.gz 55450097 BLAKE2B bcfa10a4cceb7990ff695593f7f1ba8a9eefd6530beab6b8d04a14fcb7f2612e6e9c5ac9f654f685337935a434d38c844b16c7f540b31acaf9c4fe639ae678a1 SHA512 a5ebb6810a3b5e40858b7fd533f9eb7b3d475dfda843a489bc5168e72c5eaad0a7a23629aace1f43e1b62d9c24e5e1923d841059c297728fac464e00759886c2
|
||||
DIST opencv_contrib-4.12.0.tar.gz 55475555 BLAKE2B 12ae7cc8b8e08b39cbc41ec48f078cd3546b868747cde7237bbfa5b60b2a8dff422352361d2d11d6569c065f979b0f2e8287d6f0a905241269bb01ab5a90fe44 SHA512 574121ca57328671741413df91fbf600cc04bb9a9beeacfb7bc20c15b2b4e8c9e031df30aafbcc34f82d85edfb098e5d008a744f4e6d833d6e47537a042045c6
|
||||
DIST opencv_extra-4.10.0.tar.gz 504349887 BLAKE2B 6e76860beb95cf00698980a19cfd2894e5bfe0d477d94352cbb2ff98688acbc1c404953cbc3baa95453588e7b9063175a067f24006c5d2719a6c75d15f2ef891 SHA512 1a581dad61bc1e5075af5afed2dd3d67793232a9e1219408448d08c518ae714cf0c4d5fec2c25791351a49a0d265fe051ea142b2170f82843e19e82f65abc8c6
|
||||
DIST opencv_extra-4.11.0.tar.gz 505587850 BLAKE2B 797de07ba1a6f1c2a772c8f72bb4fe21af5450bb9af5b2596163ccfc56f9bea0bb89fe88105278ef6ee1bbabe0896d36809521ed9125c84ff21157ed7d72462b SHA512 512afd1489fc224fcaffe4f91da2814e04163c83c17afcd42bd12ddc3b14470b10c24bd0e0f61a94537afb68158c1dffa00fd1d459c83fa11f52f02c681def06
|
||||
DIST opencv_extra-4.12.0.tar.gz 505622881 BLAKE2B 4090d64d1d6741c544af166da1f75b68df1fa4767e7360c9591c7a0623fc237cd5ca71a0ca954fd807228270ba51a44b1f16d742f18d6617494ef20fd989ec8d SHA512 aa6e4d3a4968004277ad4cfd69ae93457851d5ea06a5d582e40a16c9f83747f5c73feecfc4320d2c2c0fdff782a1ba30c3dddf98c37c3776c66e482ccac8d47b
|
||||
DIST yunet-202303.onnx 232589 BLAKE2B 1cd8eac1a254b35697f3b4c7d3d35ec8ed0ca2fc3ed39bc391e06713c039602141122858d4c29cf42f54994af967a22d470d39a547657b7c61f58db3733c9b7e SHA512 ffeec1ba6e45ad63bc10ad2e6d8af5d5a9b816ac1b0606e62f0d06fec611f1bfa23daea07cfd3934fad958ddb5de3042950103ea3066ce61d0a563f47cd4b2d9
|
||||
|
||||
@@ -16,7 +16,7 @@ Subject: [PATCH] FFmpeg 8.0 support.
|
||||
#endif
|
||||
video_st = NULL;
|
||||
}
|
||||
@@ -2005,7 +2008,18 @@ void CvCapture_FFMPEG::get_rotation_angle()
|
||||
@@ -2005,7 +2008,21 @@ void CvCapture_FFMPEG::get_rotation_angle()
|
||||
rotation_angle = 0;
|
||||
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(57, 68, 100)
|
||||
const uint8_t *data = 0;
|
||||
@@ -29,7 +29,10 @@ Subject: [PATCH] FFmpeg 8.0 support.
|
||||
+ if (sd && nb_sd > 0)
|
||||
+ {
|
||||
+ const AVPacketSideData* mtx = av_packet_side_data_get(sd, nb_sd, AV_PKT_DATA_DISPLAYMATRIX);
|
||||
+ data = mtx->data;
|
||||
+ if ( mtx != NULL )
|
||||
+ {
|
||||
+ data = mtx->data;
|
||||
+ }
|
||||
+ }
|
||||
+# endif
|
||||
if (data)
|
||||
|
||||
23
media-libs/opencv/files/opencv-4.12.0-cmake-4.patch
Normal file
23
media-libs/opencv/files/opencv-4.12.0-cmake-4.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
From 48e5cddb04156cba8b8dba694af8dbec245c743d Mon Sep 17 00:00:00 2001
|
||||
From: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
Date: Wed, 3 Sep 2025 15:42:17 +0200
|
||||
Subject: [PATCH] cmake-4
|
||||
|
||||
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
|
||||
diff --git a/modules/gapi/CMakeLists.txt b/modules/gapi/CMakeLists.txt
|
||||
index 29b20ca..1db3d5a 100644
|
||||
--- a/modules/gapi/CMakeLists.txt
|
||||
+++ b/modules/gapi/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# FIXME: Rework standalone build in more generic maner
|
||||
# (Restructure directories, add common pass, etc)
|
||||
if(NOT DEFINED OPENCV_INITIAL_PASS)
|
||||
- cmake_minimum_required(VERSION 3.3)
|
||||
+ cmake_minimum_required(VERSION 3.5)
|
||||
project(gapi_standalone)
|
||||
include("cmake/standalone.cmake")
|
||||
return()
|
||||
--
|
||||
2.51.0
|
||||
|
||||
115
media-libs/opencv/files/opencv-4.12.0-cuda-13.0.patch
Normal file
115
media-libs/opencv/files/opencv-4.12.0-cuda-13.0.patch
Normal file
@@ -0,0 +1,115 @@
|
||||
From 5a1306ddccb709cc5c8c4bb503125ab49a6a95b3 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
Date: Wed, 6 Aug 2025 14:27:28 +0200
|
||||
Subject: [PATCH] cuda 13.0 support
|
||||
|
||||
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
|
||||
diff --git a/modules/core/src/cuda_info.cpp b/modules/core/src/cuda_info.cpp
|
||||
index 2558ec8..35b76e7 100644
|
||||
--- a/modules/core/src/cuda_info.cpp
|
||||
+++ b/modules/core/src/cuda_info.cpp
|
||||
@@ -424,7 +424,9 @@ int cv::cuda::DeviceInfo::clockRate() const
|
||||
#ifndef HAVE_CUDA
|
||||
throw_no_cuda();
|
||||
#else
|
||||
- return deviceProps().get(device_id_)->clockRate;
|
||||
+ int i32value;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&i32value, cudaDevAttrClockRate, device_id_) );
|
||||
+ return i32value;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -487,7 +489,9 @@ bool cv::cuda::DeviceInfo::kernelExecTimeoutEnabled() const
|
||||
#ifndef HAVE_CUDA
|
||||
throw_no_cuda();
|
||||
#else
|
||||
- return deviceProps().get(device_id_)->kernelExecTimeoutEnabled != 0;
|
||||
+ int i32value;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&i32value, cudaDevAttrKernelExecTimeout, device_id_) );
|
||||
+ return (i32value != 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -522,7 +526,9 @@ DeviceInfo::ComputeMode cv::cuda::DeviceInfo::computeMode() const
|
||||
ComputeModeExclusiveProcess
|
||||
};
|
||||
|
||||
- return tbl[deviceProps().get(device_id_)->computeMode];
|
||||
+ int i32value;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&i32value, cudaDevAttrComputeMode, device_id_) );
|
||||
+ return tbl[i32value];
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -554,7 +560,10 @@ int cv::cuda::DeviceInfo::maxTexture1DLinear() const
|
||||
#ifndef HAVE_CUDA
|
||||
throw_no_cuda();
|
||||
#else
|
||||
- return deviceProps().get(device_id_)->maxTexture1DLinear;
|
||||
+ std::size_t i32value;
|
||||
+ cudaChannelFormatDesc format;
|
||||
+ cudaSafeCall( cudaDeviceGetTexture1DLinearMaxWidth(&i32value, &format, device_id_) );
|
||||
+ return i32value;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -793,7 +802,9 @@ int cv::cuda::DeviceInfo::memoryClockRate() const
|
||||
#ifndef HAVE_CUDA
|
||||
throw_no_cuda();
|
||||
#else
|
||||
- return deviceProps().get(device_id_)->memoryClockRate;
|
||||
+ int i32value;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&i32value, cudaDevAttrClockRate, device_id_) );
|
||||
+ return i32value;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -924,6 +935,15 @@ void cv::cuda::printCudaDeviceInfo(int device)
|
||||
cudaDeviceProp prop;
|
||||
cudaSafeCall( cudaGetDeviceProperties(&prop, dev) );
|
||||
|
||||
+ int clockRate;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&clockRate, cudaDevAttrClockRate, dev) );
|
||||
+
|
||||
+ int KernelExecTimeout;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&KernelExecTimeout, cudaDevAttrKernelExecTimeout, dev) );
|
||||
+
|
||||
+ int ComputeMode;
|
||||
+ cudaSafeCall( cudaDeviceGetAttribute(&ComputeMode, cudaDevAttrComputeMode, dev) );
|
||||
+
|
||||
printf("\nDevice %d: \"%s\"\n", dev, prop.name);
|
||||
printf(" CUDA Driver Version / Runtime Version %d.%d / %d.%d\n", driverVersion/1000, driverVersion%100, runtimeVersion/1000, runtimeVersion%100);
|
||||
printf(" CUDA Capability Major/Minor version number: %d.%d\n", prop.major, prop.minor);
|
||||
@@ -933,7 +953,7 @@ void cv::cuda::printCudaDeviceInfo(int device)
|
||||
if (cores > 0)
|
||||
printf(" (%2d) Multiprocessors x (%2d) CUDA Cores/MP: %d CUDA Cores\n", prop.multiProcessorCount, cores, cores * prop.multiProcessorCount);
|
||||
|
||||
- printf(" GPU Clock Speed: %.2f GHz\n", prop.clockRate * 1e-6f);
|
||||
+ printf(" GPU Clock Speed: %.2f GHz\n", clockRate * 1e-6f);
|
||||
|
||||
printf(" Max Texture Dimension Size (x,y,z) 1D=(%d), 2D=(%d,%d), 3D=(%d,%d,%d)\n",
|
||||
prop.maxTexture1D, prop.maxTexture2D[0], prop.maxTexture2D[1],
|
||||
@@ -952,8 +972,8 @@ void cv::cuda::printCudaDeviceInfo(int device)
|
||||
printf(" Maximum memory pitch: %u bytes\n", (int)prop.memPitch);
|
||||
printf(" Texture alignment: %u bytes\n", (int)prop.textureAlignment);
|
||||
|
||||
- printf(" Concurrent copy and execution: %s with %d copy engine(s)\n", (prop.deviceOverlap ? "Yes" : "No"), prop.asyncEngineCount);
|
||||
- printf(" Run time limit on kernels: %s\n", prop.kernelExecTimeoutEnabled ? "Yes" : "No");
|
||||
+ printf(" Concurrent copy and execution: %s with %d copy engine(s)\n", (prop.asyncEngineCount ? "Yes" : "No"), prop.asyncEngineCount);
|
||||
+ printf(" Run time limit on kernels: %s\n", (KernelExecTimeout != 0) ? "Yes" : "No");
|
||||
printf(" Integrated GPU sharing Host Memory: %s\n", prop.integrated ? "Yes" : "No");
|
||||
printf(" Support host page-locked memory mapping: %s\n", prop.canMapHostMemory ? "Yes" : "No");
|
||||
|
||||
@@ -964,7 +984,7 @@ void cv::cuda::printCudaDeviceInfo(int device)
|
||||
printf(" Device supports Unified Addressing (UVA): %s\n", prop.unifiedAddressing ? "Yes" : "No");
|
||||
printf(" Device PCI Bus ID / PCI location ID: %d / %d\n", prop.pciBusID, prop.pciDeviceID );
|
||||
printf(" Compute Mode:\n");
|
||||
- printf(" %s \n", computeMode[prop.computeMode]);
|
||||
+ printf(" %s \n", computeMode[ComputeMode]);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 94e5c643baaae1c942e0d6abf749ec4828a8e3dc Mon Sep 17 00:00:00 2001
|
||||
From: Paul Zander <negril.nx@gmail.com>
|
||||
Date: Wed, 6 Aug 2025 15:05:27 +0200
|
||||
Subject: [PATCH] cuda 13.0
|
||||
|
||||
Signed-off-by: Paul Zander <negril.nx@gmail.com>
|
||||
|
||||
diff --git a/modules/videostab/src/cuda/global_motion.cu b/modules/videostab/src/cuda/global_motion.cu
|
||||
index 7eca6ff..6152f7d 100644
|
||||
--- a/modules/videostab/src/cuda/global_motion.cu
|
||||
+++ b/modules/videostab/src/cuda/global_motion.cu
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
#include <thrust/device_ptr.h>
|
||||
#include <thrust/remove.h>
|
||||
-#include <thrust/functional.h>
|
||||
+#include <cuda/std/functional>
|
||||
#include "opencv2/core/cuda/common.hpp"
|
||||
|
||||
namespace cv { namespace cuda { namespace device { namespace globmotion {
|
||||
@@ -60,7 +60,7 @@ int compactPoints(int N, float *points0, float *points1, const uchar *mask)
|
||||
|
||||
return (int)(thrust::remove_if(thrust::make_zip_iterator(thrust::make_tuple(dpoints0, dpoints1)),
|
||||
thrust::make_zip_iterator(thrust::make_tuple(dpoints0 + N, dpoints1 + N)),
|
||||
- dmask, thrust::not1(thrust::identity<uchar>()))
|
||||
+ dmask, ::cuda::std::not_fn(::cuda::std::identity()))
|
||||
- thrust::make_zip_iterator(make_tuple(dpoints0, dpoints1)));
|
||||
}
|
||||
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -17,8 +17,9 @@
|
||||
<use>
|
||||
<flag name="atlas">Use <pkg>sci-libs/atlas</pkg> for blas, lapack and sparse blas routines (Experimental!)</flag>
|
||||
<flag name="contrib">Install user contributed scripts from opencv_contrib (Experimental!)</flag>
|
||||
<flag name="contribcvv">Enable CVV in contrib (requires Qt5)</flag>
|
||||
<flag name="contribdnn">Enable DNN module contrib (requires tinydnn)</flag>
|
||||
<flag name="contribcvv">Enable CVV in contrib</flag>
|
||||
<flag name="contribdnn" restrict=">media-libs/opencv-4.11">Enable DNN module contrib (requires tinydnn)</flag>
|
||||
<flag name="contribdnn" restrict="<media-libs/opencv-4.11">Enable DNN module</flag>
|
||||
<flag name="contribfreetype">Enable Drawing UTF-8 strings with <pkg>media-libs/freetype</pkg>&<pkg>media-libs/harfbuzz</pkg></flag>
|
||||
<flag name="contribhdf">Enable HDF module (requires <pkg>sci-libs/hdf5</pkg>)</flag>
|
||||
<flag name="contribovis">Enable OGRE vision module support (<pkg>dev-games/ogre</pkg>)</flag>
|
||||
@@ -49,6 +50,7 @@
|
||||
<flag name="video_cards_intel">Enable Video Acceleration API for hardware decoding for Intel cards</flag>
|
||||
<flag name="vtk">Build new 3D visualization module viz based on <pkg>sci-libs/vtk</pkg></flag>
|
||||
<flag name="vulkan">Enable experimental Vulkan backend</flag>
|
||||
<flag name="wechat_qrcode">Enable wechat_qrcode module</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<changelog>https://github.com/opencv/opencv/wiki/ChangeLog</changelog>
|
||||
|
||||
1657
media-libs/opencv/opencv-4.12.0.ebuild
Normal file
1657
media-libs/opencv/opencv-4.12.0.ebuild
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user