diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-03 00:00:22 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-03 00:00:22 +0000 |
| commit | 7059f1727d6929d5cff9b82fe84dbffcb2b93e5f (patch) | |
| tree | 0b84bbef16d0c898e678bae19afdd73776df77b8 /user | |
| parent | a384dd1c64a52ce29d5900956d9eead99ed176d3 (diff) | |
| download | packages-7059f1727d6929d5cff9b82fe84dbffcb2b93e5f.tar.gz packages-7059f1727d6929d5cff9b82fe84dbffcb2b93e5f.tar.bz2 packages-7059f1727d6929d5cff9b82fe84dbffcb2b93e5f.tar.xz packages-7059f1727d6929d5cff9b82fe84dbffcb2b93e5f.zip | |
user/opencv: Bump to 4.2.0
Diffstat (limited to 'user')
| -rw-r--r-- | user/opencv/APKBUILD | 19 | ||||
| -rw-r--r-- | user/opencv/CVE-2019-16249.patch | 57 |
2 files changed, 9 insertions, 67 deletions
diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD index a8a38c149..b8739c3be 100644 --- a/user/opencv/APKBUILD +++ b/user/opencv/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=opencv -pkgver=4.1.1 -pkgrel=1 +pkgver=4.2.0 +pkgrel=0 pkgdesc="Computer vision and machine learning software library" url="https://opencv.org" arch="all" @@ -15,7 +15,6 @@ makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev subpackages="$pkgname-dev $pkgname-libs" source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz cmake-license.patch - CVE-2019-16249.patch " # secfixes: @@ -38,19 +37,20 @@ prepare() { } build() { + _sse="" if [ "$CARCH" != "x86_64" ]; then - local _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF" + _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF" fi if [ "$CARCH" = "ppc" ]; then - LDFLAGS="-latomic" + export LDFLAGS="$LDFLAGS -latomic" fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -U_FORTIFY_SOURCE" \ - -DCMAKE_C_FLAGS="$CFLAGS -U_FORTIFY_SOURCE" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DWITH_OPENMP=ON \ -DWITH_OPENCL=ON \ @@ -65,6 +65,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="80fa48d992ca06a2a4ab6740df6d8c21f4926165486b393969da2c5bbe2f3a0b799fb76dee5e3654e90c743e49bbd2b5b02ad59a4766896bbf4cd5b4e3251e0f opencv-4.1.1.tar.gz -ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch -39f2f9abb1051220d6b842e9337c3636ee229781c7efcc92e987dae47ac82072dc95568e6a766e01329ee61c0a3be4efdd82aa3b56c011b44e175444d81c134d CVE-2019-16249.patch" +sha512sums="2629d548384c81a786ab2620e089539b4b2f4ae5e1d837e5fe7f75ddadb909b65b65d0319226ae4726675f105ceb5adb88616ca6399c7660d3021ca4b9a06531 opencv-4.2.0.tar.gz +ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch" diff --git a/user/opencv/CVE-2019-16249.patch b/user/opencv/CVE-2019-16249.patch deleted file mode 100644 index a7f0027ac..000000000 --- a/user/opencv/CVE-2019-16249.patch +++ /dev/null @@ -1,57 +0,0 @@ -From cd7fa04985b10db5e66de542725d0da57f0d10b6 Mon Sep 17 00:00:00 2001 -From: Vitaly Tuzov <terfendail@mediana.jetos.com> -Date: Tue, 17 Sep 2019 15:53:18 +0300 -Subject: [PATCH] Fixed out of bound reading in DIS optical flow evaluation - implementation - ---- - modules/video/src/dis_flow.cpp | 18 +++++------------- - 1 file changed, 5 insertions(+), 13 deletions(-) - -diff --git a/modules/video/src/dis_flow.cpp b/modules/video/src/dis_flow.cpp -index 85400c71ca7..a260b8726bb 100644 ---- a/modules/video/src/dis_flow.cpp -+++ b/modules/video/src/dis_flow.cpp -@@ -494,7 +494,6 @@ DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOp - v_float32x4 w10v = v_setall_f32(w10); \ - v_float32x4 w11v = v_setall_f32(w11); \ - \ -- v_uint8x16 I0_row_16, I1_row_16, I1_row_shifted_16, I1_row_next_16, I1_row_next_shifted_16; \ - v_uint16x8 I0_row_8, I1_row_8, I1_row_shifted_8, I1_row_next_8, I1_row_next_shifted_8, tmp; \ - v_uint32x4 I0_row_4_left, I1_row_4_left, I1_row_shifted_4_left, I1_row_next_4_left, I1_row_next_shifted_4_left; \ - v_uint32x4 I0_row_4_right, I1_row_4_right, I1_row_shifted_4_right, I1_row_next_4_right, \ -@@ -502,29 +501,22 @@ DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOp - v_float32x4 I_diff_left, I_diff_right; \ - \ - /* Preload and expand the first row of I1: */ \ -- I1_row_16 = v_load(I1_ptr); \ -- I1_row_shifted_16 = v_extract<1>(I1_row_16, I1_row_16); \ -- v_expand(I1_row_16, I1_row_8, tmp); \ -- v_expand(I1_row_shifted_16, I1_row_shifted_8, tmp); \ -+ I1_row_8 = v_load_expand(I1_ptr); \ -+ I1_row_shifted_8 = v_load_expand(I1_ptr + 1); \ - v_expand(I1_row_8, I1_row_4_left, I1_row_4_right); \ - v_expand(I1_row_shifted_8, I1_row_shifted_4_left, I1_row_shifted_4_right); \ - I1_ptr += I1_stride; - - #define HAL_PROCESS_BILINEAR_8x8_PATCH_EXTRACTION \ - /* Load the next row of I1: */ \ -- I1_row_next_16 = v_load(I1_ptr); \ -- /* Circular shift left by 1 element: */ \ -- I1_row_next_shifted_16 = v_extract<1>(I1_row_next_16, I1_row_next_16); \ -- /* Expand to 8 ushorts (we only need the first 8 values): */ \ -- v_expand(I1_row_next_16, I1_row_next_8, tmp); \ -- v_expand(I1_row_next_shifted_16, I1_row_next_shifted_8, tmp); \ -+ I1_row_next_8 = v_load_expand(I1_ptr); \ -+ I1_row_next_shifted_8 = v_load_expand(I1_ptr + 1); \ - /* Separate the left and right halves: */ \ - v_expand(I1_row_next_8, I1_row_next_4_left, I1_row_next_4_right); \ - v_expand(I1_row_next_shifted_8, I1_row_next_shifted_4_left, I1_row_next_shifted_4_right); \ - \ - /* Load current row of I0: */ \ -- I0_row_16 = v_load(I0_ptr); \ -- v_expand(I0_row_16, I0_row_8, tmp); \ -+ I0_row_8 = v_load_expand(I0_ptr); \ - v_expand(I0_row_8, I0_row_4_left, I0_row_4_right); \ - \ - /* Compute diffs between I0 and bilinearly interpolated I1: */ \ |