| 1 |
commit: 84fde63799f57375e4dc9d9f6ecb07e5aaf55c8a |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 27 07:32:18 2017 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 07:32:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84fde637 |
| 7 |
|
| 8 |
media-libs/opencv: drop old vulnerable version |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
media-libs/opencv/Manifest | 7 +- |
| 13 |
media-libs/opencv/opencv-2.4.13.ebuild | 240 --------------------------------- |
| 14 |
2 files changed, 3 insertions(+), 244 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest |
| 17 |
index 0e8ded1a6aa..f6394c76737 100644 |
| 18 |
--- a/media-libs/opencv/Manifest |
| 19 |
+++ b/media-libs/opencv/Manifest |
| 20 |
@@ -1,10 +1,9 @@ |
| 21 |
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 SHA256 5d1ef31142ed42e06b2bb71134da7e5fae5e94e70896aae26ac2dc0baa74a161 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 WHIRLPOOL fbf18817a3f6e82d2ce1ecad237b223244328208fe9926033133c2126e785a1ad3fbf06b69113a94996d624e73003564ea9ce2314ffbdecfb0ea3fd67308084d |
| 22 |
+DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 |
| 23 |
DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6 |
| 24 |
-DIST opencv-2.4.13.zip 94319943 SHA256 fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b WHIRLPOOL 86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455 |
| 25 |
DIST opencv-3.1.0.tar.gz 76135587 SHA256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f WHIRLPOOL b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4 |
| 26 |
DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a WHIRLPOOL 18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353 |
| 27 |
DIST opencv-3.2.0.tar.gz 78861546 SHA256 b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d WHIRLPOOL 092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3 |
| 28 |
DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a WHIRLPOOL eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8 |
| 29 |
-DIST opencv-3.3.0.tar.gz 81238534 SHA256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb WHIRLPOOL 211496e559fa3a78b662329a5e21613fdc39b616155584311f82f3d7c733676bcb58d8e04ffda2d73658933240e16122212413fa1c2e6dfe764439c9460d7c41 |
| 30 |
-DIST opencv-3.3.0_contrib.tar.gz 54848519 SHA256 e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444 SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e WHIRLPOOL b186f673e276c4b8c4c5253fd17181f0e1b7bd4a0e0c74f15ab55ea5f2ee54a72fc295247c7bfcbfbedba1fc01b4c5e2a53a2a4eff79ab0480977a6eefc90c58 |
| 31 |
+DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb |
| 32 |
+DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e |
| 33 |
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 WHIRLPOOL 5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12 |
| 34 |
|
| 35 |
diff --git a/media-libs/opencv/opencv-2.4.13.ebuild b/media-libs/opencv/opencv-2.4.13.ebuild |
| 36 |
deleted file mode 100644 |
| 37 |
index b267fe7783b..00000000000 |
| 38 |
--- a/media-libs/opencv/opencv-2.4.13.ebuild |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,240 +0,0 @@ |
| 41 |
-# Copyright 1999-2017 Gentoo Foundation |
| 42 |
-# Distributed under the terms of the GNU General Public License v2 |
| 43 |
- |
| 44 |
-EAPI=6 |
| 45 |
-PYTHON_COMPAT=( python2_7 ) |
| 46 |
- |
| 47 |
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2 |
| 48 |
- |
| 49 |
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" |
| 50 |
-HOMEPAGE="https://opencv.org" |
| 51 |
- |
| 52 |
-SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip" |
| 53 |
- |
| 54 |
-LICENSE="BSD" |
| 55 |
-SLOT="0/2.4" |
| 56 |
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux" |
| 57 |
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine" |
| 58 |
-REQUIRED_USE=" |
| 59 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 60 |
- ?? ( qt4 qt5 ) |
| 61 |
-" |
| 62 |
- |
| 63 |
-# The following logic is intrinsic in the build system, but we do not enforce |
| 64 |
-# it on the useflags since this just blocks emerging pointlessly: |
| 65 |
-# gtk? ( !qt4 ) |
| 66 |
-# opengl? ( || ( gtk qt4 ) ) |
| 67 |
-# openmp? ( !threads ) |
| 68 |
- |
| 69 |
-RDEPEND=" |
| 70 |
- app-arch/bzip2 |
| 71 |
- sys-libs/zlib |
| 72 |
- cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) |
| 73 |
- ffmpeg? ( |
| 74 |
- libav? ( media-video/libav:0= ) |
| 75 |
- !libav? ( media-video/ffmpeg:0= ) |
| 76 |
- ) |
| 77 |
- gstreamer? ( |
| 78 |
- media-libs/gstreamer:1.0 |
| 79 |
- media-libs/gst-plugins-base:1.0 |
| 80 |
- ) |
| 81 |
- gtk? ( |
| 82 |
- dev-libs/glib:2 |
| 83 |
- x11-libs/gtk+:2 |
| 84 |
- opengl? ( x11-libs/gtkglext ) |
| 85 |
- ) |
| 86 |
- java? ( >=virtual/jre-1.6:* ) |
| 87 |
- jpeg? ( virtual/jpeg:0 ) |
| 88 |
- jpeg2k? ( media-libs/jasper:= ) |
| 89 |
- ieee1394? ( |
| 90 |
- media-libs/libdc1394 |
| 91 |
- sys-libs/libraw1394 |
| 92 |
- ) |
| 93 |
- ipp? ( sci-libs/ipp ) |
| 94 |
- opencl? ( virtual/opencl ) |
| 95 |
- openexr? ( media-libs/openexr ) |
| 96 |
- opengl? ( virtual/opengl virtual/glu ) |
| 97 |
- png? ( media-libs/libpng:0= ) |
| 98 |
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) |
| 99 |
- qt4? ( |
| 100 |
- dev-qt/qtgui:4 |
| 101 |
- dev-qt/qttest:4 |
| 102 |
- opengl? ( dev-qt/qtopengl:4 ) |
| 103 |
- ) |
| 104 |
- qt5? ( |
| 105 |
- dev-qt/qtgui:5 |
| 106 |
- dev-qt/qttest:5 |
| 107 |
- dev-qt/qtconcurrent:5 |
| 108 |
- opengl? ( dev-qt/qtopengl:5 ) |
| 109 |
- ) |
| 110 |
- threads? ( dev-cpp/tbb ) |
| 111 |
- tiff? ( media-libs/tiff:0 ) |
| 112 |
- v4l? ( >=media-libs/libv4l-0.8.3 ) |
| 113 |
- vtk? ( sci-libs/vtk[rendering] ) |
| 114 |
- xine? ( media-libs/xine-lib ) |
| 115 |
-" |
| 116 |
-DEPEND="${RDEPEND} |
| 117 |
- virtual/pkgconfig |
| 118 |
- eigen? ( dev-cpp/eigen:3 ) |
| 119 |
- java? ( >=virtual/jdk-1.6 ) |
| 120 |
-" |
| 121 |
- |
| 122 |
-PATCHES=( |
| 123 |
- "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" |
| 124 |
- "${FILESDIR}/${PN}-2.4.3-gcc47.patch" |
| 125 |
- "${FILESDIR}/${PN}-2.4.2-cflags.patch" |
| 126 |
- "${FILESDIR}/${PN}-2.4.8-javamagic.patch" |
| 127 |
- "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" |
| 128 |
- "${FILESDIR}/${PN}-3.0.0-gles.patch" |
| 129 |
- ) |
| 130 |
- |
| 131 |
-#"${FILESDIR}/${P}-git-autodetect.patch |
| 132 |
- |
| 133 |
-pkg_setup() { |
| 134 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 135 |
- use python && python-single-r1_pkg_setup |
| 136 |
- java-pkg-opt-2_pkg_setup |
| 137 |
-} |
| 138 |
- |
| 139 |
-src_prepare() { |
| 140 |
- cmake-utils_src_prepare |
| 141 |
- |
| 142 |
- # remove bundled stuff |
| 143 |
- rm -rf 3rdparty || die "Removing 3rd party components failed" |
| 144 |
- sed -i \ |
| 145 |
- -e '/add_subdirectory(3rdparty)/ d' \ |
| 146 |
- CMakeLists.txt || die |
| 147 |
- |
| 148 |
- java-pkg-opt-2_src_prepare |
| 149 |
-} |
| 150 |
- |
| 151 |
-src_configure() { |
| 152 |
- |
| 153 |
- JAVA_ANT_ENCODING="iso-8859-1" |
| 154 |
- # set encoding so even this cmake build will pick it up. |
| 155 |
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" |
| 156 |
- java-ant-2_src_configure |
| 157 |
- |
| 158 |
- # please dont sort here, order is the same as in CMakeLists.txt |
| 159 |
- local mycmakeargs=( |
| 160 |
- # the optinal dependency libraries |
| 161 |
- -DWITH_1394=$(usex ieee1394) |
| 162 |
- -DWITH_AVFOUNDATION=OFF |
| 163 |
- -DWITH_VTK=$(usex vtk) |
| 164 |
- -DWITH_EIGEN=$(usex eigen) |
| 165 |
- -DWITH_VFW=OFF |
| 166 |
- -DWITH_FFMPEG=$(usex ffmpeg) |
| 167 |
- -DWITH_GSTREAMER=$(usex gstreamer) |
| 168 |
- -DWITH_GSTREAMER_0_10=OFF |
| 169 |
- -DWITH_GTK=$(usex gtk) |
| 170 |
- -DWITH_IMAGEIO=OFF |
| 171 |
- -DWITH_IPP=$(usex ipp) |
| 172 |
- -DWITH_JASPER=$(usex jpeg2k) |
| 173 |
- -DWITH_JPEG=$(usex jpeg) |
| 174 |
- -DWITH_OPENEXR=$(usex openexr) |
| 175 |
- -DWITH_OPENGL=$(usex opengl) |
| 176 |
- -DWITH_OPENCL=$(usex opencl) |
| 177 |
- -DWITH_OPENNI=OFF |
| 178 |
- -DWITH_PNG=$(usex png) |
| 179 |
- -DWITH_PVAPI=OFF |
| 180 |
- -DWITH_GIGEAPI=OFF |
| 181 |
- -DWITH_WIN32UI=OFF |
| 182 |
- -DWITH_QUICKTIME=OFF |
| 183 |
- -DWITH_TBB=$(usex threads) |
| 184 |
- -DWITH_OPENMP=$(usex openmp) |
| 185 |
- -DWITH_CSTRIPES=OFF |
| 186 |
- -DWITH_TIFF=$(usex tiff) |
| 187 |
- -DWITH_UNICAP=OFF |
| 188 |
- -DWITH_V4L=$(usex v4l) |
| 189 |
- -DWITH_LIBV4L=$(usex v4l) |
| 190 |
- -DWITH_DSHOW=ON |
| 191 |
- -DWITH_MSMF=OFF |
| 192 |
- -DWITH_XIMEA=OFF |
| 193 |
- -DWITH_XINE=$(usex xine) |
| 194 |
- -DWITH_OPENCL=$(usex opencl) |
| 195 |
- -DWITH_OPENCLAMDFFT=$(usex opencl) |
| 196 |
- -DWITH_OPENCLAMDBLAS=$(usex opencl) |
| 197 |
- -DWITH_INTELPERC=OFF |
| 198 |
- -DWITH_JAVA=$(usex java) |
| 199 |
- |
| 200 |
- # the build components |
| 201 |
- -DBUILD_SHARED_LIBS=ON |
| 202 |
- -DBUILD_ANDROID_EXAMPLES=OFF |
| 203 |
- -DBUILD_DOCS=OFF #too much dark magic in cmakelists |
| 204 |
- -DBUILD_EXAMPLES=$(usex examples) |
| 205 |
- -DBUILD_PERF_TESTS=OFF |
| 206 |
- -DBUILD_TESTS=$(usex testprograms) |
| 207 |
- |
| 208 |
- # install examples |
| 209 |
- -DINSTALL_C_EXAMPLES=$(usex examples) |
| 210 |
- -DINSTALL_TESTS=$(usex testprograms) |
| 211 |
- |
| 212 |
- # build options |
| 213 |
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch) |
| 214 |
- -DENABLE_SOLUTION_FOLDERS=OFF |
| 215 |
- -DENABLE_PROFILING=OFF |
| 216 |
- -DENABLE_COVERAGE=OFF |
| 217 |
- -DENABLE_OMIT_FRAME_POINTER=OFF |
| 218 |
- -DENABLE_FAST_MATH=OFF # |
| 219 |
- -DENABLE_SSE=OFF # these options do nothing but |
| 220 |
- -DENABLE_SSE2=OFF # add params to CFLAGS |
| 221 |
- -DENABLE_SSE3=OFF |
| 222 |
- -DENABLE_SSSE3=OFF |
| 223 |
- -DENABLE_SSE41=OFF |
| 224 |
- -DENABLE_SSE42=OFF |
| 225 |
- |
| 226 |
- -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic |
| 227 |
- ) |
| 228 |
- |
| 229 |
- if use qt4; then |
| 230 |
- mycmakeargs+=( -DWITH_QT=4 ) |
| 231 |
- elif use qt5; then |
| 232 |
- mycmakeargs+=( -DWITH_QT=5 ) |
| 233 |
- else |
| 234 |
- mycmakeargs+=( -DWITH_QT=OFF ) |
| 235 |
- fi |
| 236 |
- |
| 237 |
- if use cuda; then |
| 238 |
- if [[ "$(gcc-version)" > "4.8" ]]; then |
| 239 |
- # bug 577410 |
| 240 |
- # #error -- unsupported GNU version! gcc 4.9 and up are not supported! |
| 241 |
- ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support." |
| 242 |
- mycmakeargs+=( -DWITH_CUDA=OFF ) |
| 243 |
- mycmakeargs+=( -DWITH_CUBLAS=OFF ) |
| 244 |
- mycmakeargs+=( -DWITH_CUFFT=OFF ) |
| 245 |
- |
| 246 |
- else |
| 247 |
- mycmakeargs+=( -DWITH_CUDA=ON ) |
| 248 |
- mycmakeargs+=( -DWITH_CUBLAS=ON ) |
| 249 |
- mycmakeargs+=( -DWITH_CUFFT=ON ) |
| 250 |
- mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda ) |
| 251 |
- fi |
| 252 |
- else |
| 253 |
- mycmakeargs+=( -DWITH_CUDA=OFF ) |
| 254 |
- mycmakeargs+=( -DWITH_CUBLAS=OFF ) |
| 255 |
- mycmakeargs+=( -DWITH_CUFFT=OFF ) |
| 256 |
- fi |
| 257 |
- |
| 258 |
- if use examples && use python; then |
| 259 |
- mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON ) |
| 260 |
- else |
| 261 |
- mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF ) |
| 262 |
- fi |
| 263 |
- |
| 264 |
- # things we want to be hard off or not yet figured out |
| 265 |
- mycmakeargs+=( |
| 266 |
- -DOPENCV_BUILD_3RDPARTY_LIBS=OFF |
| 267 |
- -DBUILD_PACKAGE=OFF |
| 268 |
- ) |
| 269 |
- |
| 270 |
- # things we want to be hard enabled not worth useflag |
| 271 |
- mycmakeargs+=( |
| 272 |
- -DCMAKE_SKIP_RPATH=ON |
| 273 |
- -DOPENCV_DOC_INSTALL_PATH= |
| 274 |
- ) |
| 275 |
- |
| 276 |
- # workaround for bug 413429 |
| 277 |
- tc-export CC CXX |
| 278 |
- |
| 279 |
- cmake-utils_src_configure |
| 280 |
-} |
Archives