From a9eea039176d779534b375bc1337bebfc6545a43 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 20 Jul 2019 20:31:21 +0000
Subject: user/opencv: unmaintained bump to 4.1.0 (Adopt me today)

---
 user/opencv/APKBUILD            | 22 +++++++++-------------
 user/opencv/cmake-license.patch | 12 ++++++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 user/opencv/cmake-license.patch

(limited to 'user')

diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD
index 0745f8a6a..235847209 100644
--- a/user/opencv/APKBUILD
+++ b/user/opencv/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=opencv
-pkgver=4.0.1
+pkgver=4.1.0
 pkgrel=0
 pkgdesc="Computer vision and machine learning software library"
 url="https://opencv.org"
@@ -13,7 +13,9 @@ makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev
 	gtk+3.0-dev jasper-dev libdc1394-dev libgomp libgphoto2-dev
 	libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev v4l-utils-dev"
 subpackages="$pkgname-dev $pkgname-libs"
-source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz"
+source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz
+	cmake-license.patch
+	"
 
 prepare() {
 	default_prepare
@@ -31,7 +33,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"/build
 	if [ "$CARCH" != "x86_64" ]; then
 		local _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF"
 	fi
@@ -48,18 +49,13 @@ build() {
 		-DWITH_OPENEXR=OFF \
 		-DWITH_IPP=OFF \
 		$_sse \
-		..
-	make
-}
-
-check() {
-	cd "$builddir"/build
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+		-Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
-sha512sums="d74dd325029a67676dd2c7fdbecb2b14cb531441b2a1b74fc1ebe6db096ea87c12801c8b997ebbe280fbd401311c0220133a0c29911b0dae82cb93453be0b2b0  opencv-4.0.1.tar.gz"
+sha512sums="492168c1260cd30449393c4b266d75202e751493a8f1e184af6c085d8f4a38800ee954d84fe8c36fcceb690b1ebb5e511b68c05901f64be79a0915f3f8a46dc0  opencv-4.1.0.tar.gz
+ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6  cmake-license.patch"
diff --git a/user/opencv/cmake-license.patch b/user/opencv/cmake-license.patch
new file mode 100644
index 000000000..be40f4edf
--- /dev/null
+++ b/user/opencv/cmake-license.patch
@@ -0,0 +1,12 @@
+We remove the 3rdparty dir in build, and we don't need the OpenCL license.
+
+--- opencv-4.1.0/cmake/OpenCVDetectOpenCL.cmake.old	2019-04-07 17:09:10.000000000 +0000
++++ opencv-4.1.0/cmake/OpenCVDetectOpenCL.cmake	2019-07-20 20:21:37.467680107 +0000
+@@ -5,7 +5,6 @@
+ else()
+   set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
+   set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory")
+-  ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
+ endif()
+ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+ 
-- 
cgit v1.2.3-60-g2f50