1 |
commit: e402fc2e336e59a514557c6c1bdb014cb590fad1 |
2 |
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Dec 24 06:05:46 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 04:34:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e402fc2e |
7 |
|
8 |
media-libs/opencv: version bump, remove old |
9 |
|
10 |
- Added constraint on CPU flags on x86 |
11 |
|
12 |
- Also closed out bugs that wasn't reported reproducible on newer versions |
13 |
|
14 |
Closes: https://bugs.gentoo.org/751781 |
15 |
Closes: https://bugs.gentoo.org/703658 |
16 |
Closes: https://bugs.gentoo.org/706040 |
17 |
Closes: https://bugs.gentoo.org/721706 |
18 |
Closes: https://bugs.gentoo.org/689838 |
19 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
20 |
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com> |
21 |
Closes: https://github.com/gentoo/gentoo/pull/18801 |
22 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
23 |
|
24 |
media-libs/opencv/Manifest | 4 ++-- |
25 |
...{opencv-4.4.0-r1.ebuild => opencv-4.5.1.ebuild} | 26 +++++++++++++++------- |
26 |
2 files changed, 20 insertions(+), 10 deletions(-) |
27 |
|
28 |
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest |
29 |
index 0e480d0b4bd..4943bff54f2 100644 |
30 |
--- a/media-libs/opencv/Manifest |
31 |
+++ b/media-libs/opencv/Manifest |
32 |
@@ -2,9 +2,9 @@ DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b |
33 |
DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b |
34 |
DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f |
35 |
DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622 |
36 |
-DIST opencv-4.4.0.tar.gz 88887103 BLAKE2B 87838e2c837074c445eeead11b76b0ab6f433873195169fe288dfb5e4844f27b13126ef9c0d973857693c77db82168826df698ee7f34bc10eec3bda869b30d32 SHA512 ce4bada7b57c1a00439eca02abcba262732d5eabfd26090f6f83642d747a9a1a7908230bcd01a2b999c509e0c43c8b0dcb2b93ac824518b79cffe533f22652bb |
37 |
-DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adfbce96e6185a4b5fda82cfdd1e7899b3ca7e7615c4dce508082fcf94a10cfa160154ac0aa7a90ce2635f566a65176678dcd SHA512 d1a29a4a343f55fe2ae04966d2fc2d20765de719619bea68b84ee72f432777062727d8105b0aa168f359e468544b2ea930b1a4f8dc059e51de27d8af229c6b6b |
38 |
DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e |
39 |
DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f |
40 |
DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17 |
41 |
+DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0 |
42 |
+DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7 |
43 |
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 |
44 |
|
45 |
diff --git a/media-libs/opencv/opencv-4.4.0-r1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild |
46 |
similarity index 96% |
47 |
rename from media-libs/opencv/opencv-4.4.0-r1.ebuild |
48 |
rename to media-libs/opencv/opencv-4.5.1.ebuild |
49 |
index df2a210f927..311c9925d59 100644 |
50 |
--- a/media-libs/opencv/opencv-4.4.0-r1.ebuild |
51 |
+++ b/media-libs/opencv/opencv-4.5.1.ebuild |
52 |
@@ -12,14 +12,14 @@ HOMEPAGE="https://opencv.org" |
53 |
TINY_DNN_PV="1.0.0a3" |
54 |
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
55 |
dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) |
56 |
- download? ( https://github.com/rossbridger/opencv-extdep/archive/${PV}.tar.gz -> ${P}_extdep.tar.gz ) |
57 |
+ download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz ) |
58 |
contrib? ( |
59 |
https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz |
60 |
contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz ) |
61 |
contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) |
62 |
)" |
63 |
|
64 |
-LICENSE="BSD" |
65 |
+LICENSE="Apache-2.0" |
66 |
SLOT="0/${PV}" # subslot = libopencv* soname version |
67 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
68 |
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" |
69 |
@@ -59,6 +59,8 @@ IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}" |
70 |
# will silently disable it Wwithout the user knowing, which defeats the |
71 |
# purpose of the opengl use flag. |
72 |
REQUIRED_USE=" |
73 |
+ cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) |
74 |
+ cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) |
75 |
cuda? ( tesseract? ( opencl ) ) |
76 |
dnnsamples? ( examples ) |
77 |
gflags? ( contrib ) |
78 |
@@ -70,6 +72,7 @@ REQUIRED_USE=" |
79 |
contribovis? ( contrib ) |
80 |
contribsfm? ( contrib eigen gflags glog ) |
81 |
contribxfeatures2d? ( contrib download ) |
82 |
+ examples? ( contribdnn ) |
83 |
java? ( python ) |
84 |
opengl? ( qt5 ) |
85 |
python? ( ${PYTHON_REQUIRED_USE} ) |
86 |
@@ -111,7 +114,11 @@ RDEPEND=" |
87 |
java? ( >=virtual/jre-1.6:* ) |
88 |
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) |
89 |
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) |
90 |
- lapack? ( virtual/lapack ) |
91 |
+ lapack? ( |
92 |
+ virtual/cblas |
93 |
+ virtual/lapack |
94 |
+ virtual/lapacke |
95 |
+ ) |
96 |
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) |
97 |
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) |
98 |
opengl? ( |
99 |
@@ -274,6 +281,7 @@ PATCHES=( |
100 |
"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch |
101 |
"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch |
102 |
"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch |
103 |
+ "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch |
104 |
) |
105 |
|
106 |
pkg_pretend() { |
107 |
@@ -289,7 +297,7 @@ src_prepare() { |
108 |
cmake_src_prepare |
109 |
|
110 |
# remove bundled stuff |
111 |
- rm -rf 3rdparty || die "Removing 3rd party components failed" |
112 |
+ rm -r 3rdparty || die "Removing 3rd party components failed" |
113 |
sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ |
114 |
-i CMakeLists.txt cmake/*cmake || die |
115 |
|
116 |
@@ -305,7 +313,7 @@ src_prepare() { |
117 |
fi |
118 |
|
119 |
if use download; then |
120 |
- mv "${WORKDIR}/${PN}-extdep-${PV}" "${WORKDIR}/${P}/.cache/" || die |
121 |
+ mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die |
122 |
fi |
123 |
|
124 |
java-pkg-opt-2_src_prepare |
125 |
@@ -463,7 +471,9 @@ multilib_src_configure() { |
126 |
#=================================================== |
127 |
local CPU_BASELINE="" |
128 |
for i in "${CPU_FEATURES_MAP[@]}" ; do |
129 |
- use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" |
130 |
+ if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163 |
131 |
+ use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" |
132 |
+ fi |
133 |
done |
134 |
|
135 |
GLOBALCMAKEARGS+=( |
136 |
@@ -535,7 +545,7 @@ python_module_compile() { |
137 |
|
138 |
# Regenerate cache file. Can't use rebuild_cache as it won't |
139 |
# have the Gentoo specific options. |
140 |
- rm -rf CMakeCache.txt || die "rm failed" |
141 |
+ rm CMakeCache.txt || die "rm failed" |
142 |
cmake_src_configure |
143 |
cmake_src_compile |
144 |
cmake_src_install |
145 |
@@ -543,7 +553,7 @@ python_module_compile() { |
146 |
# Remove compiled binary so new version compiles |
147 |
# Avoid conflicts with new module builds as build system doesn't |
148 |
# really support it. |
149 |
- rm -rf modules/python2 || die "rm failed" |
150 |
+ rm -r modules/python3 || die "rm failed" |
151 |
|
152 |
python_optimize "${ED}"/$(python_get_sitedir) |
153 |
} |