From f887c0896ec03b086d9a2c996eb5c21c6a662669 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sat, 29 Dec 2018 10:45:32 +0100
Subject: [PATCH] upgrading package: opencv 4.0.0 -> 4.0.1

---
 opencv/opencv.patch | 47 ++++-----------------------------------------
 opencv/opencv.spec  |  8 ++++----
 2 files changed, 8 insertions(+), 47 deletions(-)

diff --git a/opencv/opencv.patch b/opencv/opencv.patch
index e0acdae5fa..a79e426b92 100644
--- a/opencv/opencv.patch
+++ b/opencv/opencv.patch
@@ -1,6 +1,6 @@
 Index: cmake/OpenCVCompilerOptions.cmake
---- cmake/OpenCVCompilerOptions.cmake.orig	2018-11-19 07:21:32.292476000 +0100
-+++ cmake/OpenCVCompilerOptions.cmake	2018-11-19 07:22:48.095203000 +0100
+--- cmake/OpenCVCompilerOptions.cmake.orig	2018-12-22 08:03:30.000000000 +0100
++++ cmake/OpenCVCompilerOptions.cmake	2018-12-29 10:13:20.145291000 +0100
 @@ -84,39 +84,6 @@
  endif()
  
@@ -41,48 +41,9 @@ Index: cmake/OpenCVCompilerOptions.cmake
    if(ENABLE_NOISY_WARNINGS)
      add_extra_compiler_option(-Wcast-align)
      add_extra_compiler_option(-Wstrict-aliasing=2)
-Index: modules/core/src/utils/filesystem.cpp
---- modules/core/src/utils/filesystem.cpp.orig	2018-11-18 10:19:28.000000000 +0100
-+++ modules/core/src/utils/filesystem.cpp	2018-11-19 07:21:32.292768000 +0100
-@@ -34,7 +34,7 @@
- #include <errno.h>
- #include <io.h>
- #include <stdio.h>
--#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__
-+#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__ || defined __FreeBSD__
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -178,7 +178,7 @@
-     sz = GetCurrentDirectoryA((DWORD)buf.size(), buf.data());
-     return cv::String(buf.data(), (size_t)sz);
- #endif
--#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__
-+#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__ || defined __FreeBSD__
-     for(;;)
-     {
-         char* p = ::getcwd(buf.data(), buf.size());
-@@ -212,7 +212,7 @@
- #else
-     int result = _mkdir(path.c_str());
- #endif
--#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__
-+#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__ || defined __FreeBSD__
-     int result = mkdir(path.c_str(), 0777);
- #else
-     int result = -1;
-@@ -327,7 +327,7 @@
-     Impl& operator=(const Impl&); // disabled
- };
- 
--#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__
-+#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__ || defined __FreeBSD__
- 
- struct FileLock::Impl
- {
 Index: modules/dnn/src/torch/THGeneral.cpp
---- modules/dnn/src/torch/THGeneral.cpp.orig	2018-11-18 10:19:28.000000000 +0100
-+++ modules/dnn/src/torch/THGeneral.cpp	2018-11-19 07:21:32.292893000 +0100
+--- modules/dnn/src/torch/THGeneral.cpp.orig	2018-12-22 08:03:30.000000000 +0100
++++ modules/dnn/src/torch/THGeneral.cpp	2018-12-29 10:13:23.859370000 +0100
 @@ -2,7 +2,7 @@
  
  #if defined(TH_DISABLE_HEAP_TRACKING)
diff --git a/opencv/opencv.spec b/opencv/opencv.spec
index d5b4439b97..45c18beb52 100644
--- a/opencv/opencv.spec
+++ b/opencv/opencv.spec
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg 4.0.0
-%define       V_dist 4.0.0
+%define       V_opkg 4.0.1
+%define       V_dist 4.0.1
 
 #   package information
 Name:         opencv
@@ -36,14 +36,14 @@ Class:        PLUS
 Group:        Graphics
 License:      BSD
 Version:      %{V_opkg}
-Release:      20181119
+Release:      20181229
 
 #   package options
 %option       with_contrib  no
 
 #   list of sources
 Source0:      https://github.com/Itseez/opencv/archive/%{V_dist}.tar.gz
-Source1:      http://download.openpkg.org/components/versioned/opencv/opencv-contrib-%{V_dist}.tar.gz
+Source1:      http://download.openpkg.org/components/versioned/opencv/opencv_contrib-%{V_dist}.tar.gz
 Patch0:       opencv.patch
 
 #   build information