gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/opencv: add 4.9.0

Browse Source 
Closes: https://bugs.gentoo.org/921968
Closes: https://bugs.gentoo.org/924005
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35322
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Paul Zander
2024-01-09 15:58:55 +01:00
committed by Sam James
parent 166fd98eec
commit 7553b19f7a
11 changed files with 1170 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-libs/opencv/Manifest
View File

@@ -1,9 +1,13 @@
DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 BLAKE2B f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533 SHA512 85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655
DIST ade-0.1.2a.tar.gz 116737 BLAKE2B 9ac2af2f21aab8cb5d599e0b653bb6126642588e508f55e5fbfe5ce9607267f25e5187fd31ed69349064551c06e15b2ba548319708ed5f70e7761470775cc6e0 SHA512 d3ed210ff25f4c05393b0039cb4a73a6ceb8b42ba3d776e0469da2362899d3f76564cc6a06965b7de91f38517e1cd4ff4b18c00185d2b1a0af5a34ecf0d9dd44
DIST ade-0.1.2d.tar.gz 117027 BLAKE2B c544b769c7b289342a469950ed047fa13719bafba29aa41167b588cf4f24ed6e596159ec19b65e61e09519a461a5e82ac07d63e2ea493279ee182fe658810abb SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
DIST opencv-4.8.1.tar.gz 92006711 BLAKE2B 54728a37e3e8a528bd8d2e6df5963a996820a51160d05ac72b350234ce5372f99c037af96e13c55de1452e517fffb478c2335b9e1cbc07a36c78f99351eabd58 SHA512 b98d89b8e7b8ae8138bce00c5226816b761b53fbeb8f28ca516e08c5d130f216f9388a81785cd6684034530f768e097cbe12f19a9361f362b7d2048bfc427a65
DIST opencv-4.8.1_contrib.tar.gz 59200293 BLAKE2B 8cf3ee60cb38a9fa2649013b9b4704022abe5cc65c331078dc7ea87028bc99df8b0de12f835905f5bb5c00a811f256754cac018ca8e02739ac5c6fe36aa4346d SHA512 e3df49e6a1411f55eebbc02f4534ddefabff961b4f63c69b21fe06ff3df894773a8643ab0cb123b83c2bdc8fa02698b332d3c243e8546c894e6c6c8ecaa65500
DIST opencv-4.9.0.tar.gz 92788647 BLAKE2B 257478b0f5e19abca5b3676767dacd40765c645eb455080160b8b9dc54e66fba4880200b483829fc9050bc3f9b3e815f8ee784d7b41261877784536778fe3c96 SHA512 1598ae59849e7805b3cbec5260bb501006f26edff452343b366b9262a0f48a6e09f4b2e760209cb677f2a64a7b22f4e70bc6195c104bcea74cc9fe04031d0292
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
DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BLAKE2B c13559569808db24105049e2081bc466c0e8b6dab58bcc69001e49ff82e03ec4701e25648b5e542b7df2c8e522abfbd82c9825e66c37d6a673847b41bf6effae SHA512 3fc44f12802aa1dad0b12372d53242ae2134a2d74ca0b6d8e4639551623426106781a41d77ebfce79ac625a49aec26b0d7425e0d31f09bab6a15e3d43caef8bc
DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043
DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa

18
media-libs/opencv/files/opencv-4.9.0-ade-0.1.2d.tar.gz.patch Normal file
View File

@@ -0,0 +1,18 @@
From: Paul Zander <negril.nx+gentoo@gmail.com>
Use tar.gz instead of zip to make CI happy.
diff --git a/modules/gapi/cmake/DownloadADE.cmake b/modules/gapi/cmake/DownloadADE.cmake
index e22c4f1..fb0c10a 100644
--- a/modules/gapi/cmake/DownloadADE.cmake
+++ b/modules/gapi/cmake/DownloadADE.cmake
@@ -1,7 +1,7 @@
set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade")
-set(ade_filename "v0.1.2d.zip")
+set(ade_filename "v0.1.2d.tar.gz")
set(ade_subdir "ade-0.1.2d")
-set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885")
+set(ade_md5 "a0fc51a1090100023316c08322e8b093")
ocv_download(FILENAME ${ade_filename}
HASH ${ade_md5}
URL

31
media-libs/opencv/files/opencv-4.9.0-cmake-cleanup.patch Normal file
View File

@@ -0,0 +1,31 @@
From: Paul Zander <negril.nx+gentoo@gmail.com>
don't check for deprecated libavresample
fix openjpeg version string
diff --git a/modules/videoio/cmake/detect_ffmpeg.cmake b/modules/videoio/cmake/detect_ffmpeg.cmake
index aa669f3..208dcc3 100644
--- a/modules/videoio/cmake/detect_ffmpeg.cmake
+++ b/modules/videoio/cmake/detect_ffmpeg.cmake
@@ -27,7 +27,7 @@ set(_used_ffmpeg_libraries ${_required_ffmpeg_libraries})
if(NOT HAVE_FFMPEG AND PKG_CONFIG_FOUND)
ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale)
if(FFMPEG_FOUND)
- ocv_check_modules(FFMPEG_libavresample libavresample) # optional
+ # ocv_check_modules(FFMPEG_libavresample libavresample) # optional
if(FFMPEG_libavresample_FOUND)
list(APPEND FFMPEG_LIBRARIES ${FFMPEG_libavresample_LIBRARIES})
list(APPEND _used_ffmpeg_libraries libavresample)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb302a..eab0a0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1472,7 +1472,7 @@ endif()
if(HAVE_OPENJPEG)
status(" JPEG 2000:" OpenJPEG_FOUND
- THEN "OpenJPEG (ver ${OPENJPEG_VERSION})"
+ THEN "OpenJPEG (ver ${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION})"
ELSE "build (ver ${OPENJPEG_VERSION})"
)
elseif(HAVE_JASPER)

66
media-libs/opencv/files/opencv-4.9.0-drop-python2-detection.patch Normal file
View File

@@ -0,0 +1,66 @@
From: Paul Zander <negril.nx+gentoo@gmail.com>
python-2 is dead, don't check for it.
diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
index a6aacb4..d893486 100644
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@@ -85,11 +85,7 @@ if(NOT ${found})
endif()
ocv_clear_vars(PYTHONINTERP_FOUND PYTHON_EXECUTABLE PYTHON_VERSION_STRING PYTHON_VERSION_MAJOR PYTHON_VERSION_MINOR PYTHON_VERSION_PATCH)
if(NOT CMAKE_VERSION VERSION_LESS "3.12")
- if(_python_version_major STREQUAL "2")
- set(__PYTHON_PREFIX Python2)
- else()
- set(__PYTHON_PREFIX Python3)
- endif()
+ set(__PYTHON_PREFIX Python3)
find_host_package(${__PYTHON_PREFIX} "${preferred_version}" COMPONENTS Interpreter)
if(${__PYTHON_PREFIX}_EXECUTABLE)
set(PYTHON_EXECUTABLE "${${__PYTHON_PREFIX}_EXECUTABLE}")
@@ -208,9 +204,6 @@ if(NOT ${found})
if(CMAKE_CROSSCOMPILING)
message(STATUS "Cannot probe for Python/Numpy support (because we are cross-compiling OpenCV)")
message(STATUS "If you want to enable Python/Numpy support, set the following variables:")
- message(STATUS " PYTHON2_INCLUDE_PATH")
- message(STATUS " PYTHON2_LIBRARIES (optional on Unix-like systems)")
- message(STATUS " PYTHON2_NUMPY_INCLUDE_DIRS")
message(STATUS " PYTHON3_INCLUDE_PATH")
message(STATUS " PYTHON3_LIBRARIES (optional on Unix-like systems)")
message(STATUS " PYTHON3_NUMPY_INCLUDE_DIRS")
@@ -268,20 +261,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION)
return()
endif()
-ocv_check_environment_variables(OPENCV_ENABLE_PYTHON2)
-ocv_check_environment_variables(PYTHON2_EXECUTABLE)
-if((OPENCV_ENABLE_PYTHON2 OR PYTHON2_EXECUTABLE OR BUILD_opencv_python2)
- AND NOT OPENCV_PYTHON2_SKIP_DETECTION
-)
- find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR
- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING
- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND
- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY
- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH
- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH
- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION)
-endif()
-
option(OPENCV_PYTHON3_VERSION "Python3 version" "")
find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
@@ -294,12 +273,8 @@ find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYT
if(PYTHON_DEFAULT_EXECUTABLE)
set(PYTHON_DEFAULT_AVAILABLE "TRUE")
-elseif(PYTHON2_EXECUTABLE AND PYTHON2INTERP_FOUND)
- # Use Python 2 as default Python interpreter
- set(PYTHON_DEFAULT_AVAILABLE "TRUE")
- set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON2_EXECUTABLE}")
elseif(PYTHON3_EXECUTABLE AND PYTHON3INTERP_FOUND)
- # Use Python 3 as fallback Python interpreter (if there is no Python 2)
+ # Use Python 3 as Python interpreter (there is no Python 2)
set(PYTHON_DEFAULT_AVAILABLE "TRUE")
set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON3_EXECUTABLE}")
endif()

4
media-libs/opencv/metadata.xml
View File

@@ -15,6 +15,7 @@
Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
</longdescription>
<use>
<flag name="atlas">Use <pkg>sci-libs/atlas</pkg> for blas, lapack and sparse blas routines</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>
@@ -33,8 +34,11 @@
<flag name="gflags">Use Google's C++ argument parsing library (<pkg>dev-cpp/gflags</pkg>)</flag>
<flag name="glog">Use Google's C++ logging library (<pkg>dev-cpp/glog</pkg>)</flag>
<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
<flag name="jasper">Use <pkg>media-libs/jasper</pkg> for jpeg2k support</flag>
<flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for blas, lapack and sparse blas routines</flag>
<flag name="non-free">Enable non-free components</flag>
<flag name="opencvapps">Enable compilation with opencvapps</flag>
<flag name="quirc">Enable qrcode decoding via <pkg>media-libs/quirc</pkg></flag>
<flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag>
<flag name="tesseract">Use Google's OCR Engine</flag>
<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>

1015
media-libs/opencv/opencv-4.9.0.ebuild Normal file
View File

File diff suppressed because it is too large Load Diff

8
profiles/arch/amd64/use.mask
View File

@@ -4,6 +4,14 @@
# Unmask the flag which corresponds to ARCH.
-amd64
# Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
# sci-libs/atlas works on x86_64
-atlas
# Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
# media-libs/jasper works on x86_64
-jasper
# Paul Zander <negril.nx+gentoo@gmail.com> (2023-12-10)
# cuDNN works here
-cudnn

8
profiles/arch/base/use.mask
View File

@@ -1,6 +1,14 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
# media-libs/jasper is only supported on specific architectures
jasper
# Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
# sci-libs/atlas is only supported on specific architectures
atlas
# Michał Górny <mgorny@gentoo.org> (2024-02-05)
# LLVM slots without keywords.
llvm_slot_18

8
profiles/arch/x86/use.mask
View File

@@ -4,6 +4,14 @@
# Unmask the flag which corresponds to ARCH.
-x86
# Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
# sci-libs/atlas works on x86
-atlas
# Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
# media-libs/jasper works on x86
-jasper
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-07-11)
# Unmask secureboot flag on arches where sbsigntools is keyworded
-secureboot

8
profiles/features/musl/package.use.mask
View File

@@ -22,11 +22,6 @@ gui-libs/gtk cpu_flags_x86_f16c
# possible on musl via systemd-utils[boot].
sys-kernel/installkernel -systemd
# Alfredo Tupone <tupone@gentoo.org> (2024-01-09)
# linked against glibc
sci-libs/caffe2 mkl
dev-libs/oneDNN mkl
# Michał Górny <mgorny@gentoo.org> (2023-12-31)
# Requires dev-libs/level-zero.
dev-lang/ispc gpu
@@ -80,13 +75,16 @@ net-irc/ngircd test
# Sam James <sam@gentoo.org> (2022-10-04)
# Rolling mask for all USE flags which pull in a masked binary package
# (linked against glibc). Use for all such packages.
dev-libs/oneDNN mkl
kde-apps/kdenetwork-meta dropbox
media-libs/opencv atlas mkl
media-video/ffmpeg amf
net-fs/openafs tsm
net-analyzer/nagios-plugin-check_raid megaraid-sas
sys-apps/hwloc gl
sci-chemistry/gromacs mkl
sci-libs/armadillo mkl
sci-libs/caffe2 mkl
sci-libs/dlib mkl
sci-libs/trilinos mkl
www-client/qutebrowser widevine

6
profiles/features/prefix/use.mask
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# prefix USE flag should always be unmasked in prefix profiles
@@ -13,6 +13,10 @@ systemd
# system authentication etc. not possible for non-privileged Prefix
pam
# Paul Zander <negril.nx+gentoo@gmail.com> (2024-02-14)
# sci-libs/atlas does not have prefix keywords
atlas
# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
# sci-libs/mkl does not have prefix keywords
mkl