From 7059f1727d6929d5cff9b82fe84dbffcb2b93e5f Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 3 Jan 2020 00:00:22 +0000
Subject: user/opencv: Bump to 4.2.0

---
 user/opencv/APKBUILD | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'user/opencv/APKBUILD')

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"
-- 
cgit v1.2.3-60-g2f50