From 72cfdb0d6b7ea58596a4d06213d392ba74105333 Mon Sep 17 00:00:00 2001
From: kwizart <kwizart@gmail.com>
Date: Tue, 31 Dec 2019 11:24:14 +0100
Subject: [PATCH] Update to 4.2.0

---
 opencv-clean.sh |  4 +++-
 opencv.spec     | 21 +++++++--------------
 sources         |  5 ++---
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/opencv-clean.sh b/opencv-clean.sh
index 8014a3e..089b3a1 100755
--- a/opencv-clean.sh
+++ b/opencv-clean.sh
@@ -1,4 +1,6 @@
-export VERSION=4.1.2
+#!/bin/bash
+
+VERSION=4.2.0
 
 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
 tar xf opencv-${VERSION}.tar.gz
diff --git a/opencv.spec b/opencv.spec
index c50e526..0328d5c 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -49,8 +49,8 @@
 %bcond_without  vulkan
 
 %global srcname opencv
-%global abiver  4.1
-%global javaver 412
+%global abiver  4.2
+%global javaver 420
 
 # Required because opencv-core has lot of spurious dependencies
 # (despite supposed to be "-core")
@@ -59,8 +59,8 @@
 %global optflags %(echo %{optflags} -Wl,--as-needed )
 
 Name:           opencv
-Version:        4.1.2
-Release:        3%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD
@@ -73,11 +73,8 @@ URL:            https://opencv.org
 Source0:        %{name}-clean-%{version}.tar.gz
 Source1:        %{name}_contrib-clean-%{version}.tar.gz
 Source3:        face_landmark_model.dat.xz
-# Deprecated headers from 3.x adapted for 4.x
-Source4:        opencv-4.x-deprecated-headers.tar.xz
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
-Patch1:         opencv-4.1.2-includes.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -250,7 +247,6 @@ mkdir 3rdparty/
 mv quirc/ 3rdparty/
 
 %patch0 -p1 -b .install_3rdparty_licenses
-%patch1 -p1 -b .inc2
 
 pushd %{name}_contrib-%{version}
 popd
@@ -344,10 +340,6 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 ln -s opencv4/opencv2 %{buildroot}%{_includedir}
 ln -s opencv4 %{buildroot}%{_datadir}/opencv
 
-# Deprecated headers from 3.x adapted for 4.x
-mkdir -p %{buildroot}%{_includedir}/opencv
-tar Jxf %{SOURCE4} -C %{buildroot}%{_includedir}/opencv
-
 
 %check
 # Check fails since we don't support most video
@@ -405,8 +397,6 @@ popd
 %endif
 
 %files devel
-# Deprecated headers from 3.x
-%{_includedir}/opencv
 # Symlink for compatibilty with older version
 %{_includedir}/opencv2
 %dir %{_includedir}/opencv4
@@ -465,6 +455,9 @@ popd
 %{_libdir}/libopencv_xphoto.so.%{abiver}*
 
 %changelog
+* Tue Dec 31 2019 Nicolas Chauvet <kwizart@gmail.com> - 4.2.0-1
+- Update to 4.2.0
+
 * Sat Dec 28 2019 Sandro Mani <manisandro@gmail.com> - 4.1.2-3
 - Rebuild (tesseract)
 
diff --git a/sources b/sources
index 4b3732b..e4e3e1c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (opencv-4.x-deprecated-headers.tar.xz) = 224354952f78948d0cefaa8f1e4d760ab17cc3765bd41cb1560865230551cdac69522556d23600f5dec9170a66f7adef0a341710ca2eb05f566eeef124ebacd9
+SHA512 (opencv_contrib-clean-4.2.0.tar.gz) = ef3dfb826817b5e9b1102e7fe834d1b2fe9691c6dc41fe2207dabf6d793310c05fa6263374399315cfda9453d01a1c4b1953c74db52e6f141f3bfc853fb748ad
+SHA512 (opencv-clean-4.2.0.tar.gz) = eaf5196ff9db70b50c2146cf9eb61c06a95900413480f32f76d72596e3e606343c93af73956822ccfd81132c879d5d611c8b824f7882041d306d46bbc313a5c9
 SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
-SHA512 (opencv-clean-4.1.2.tar.gz) = baa1250178e6e2cf96004fc64c2b667eb970f2420109b4c00e80cbed640faa3e21f5d1f78beb50dddd9cbccd028c49796504c7a18f7c412bf090f34511901cdf
-SHA512 (opencv_contrib-clean-4.1.2.tar.gz) = 72f7a4c46d44ab19ad3ec8569c1d1b77f41128609ccf3779ff6080be6144e6dd123f3590b37ab577d57631814186f1b0917973b660baaabbb5a7249051240c5a