jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv: bump version to 2.4.13.7

Browse Source 
Removed patch applied upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2018-07-30 18:00:51 +02:00 committed by Thomas Petazzoni
parent 141cf77903
commit b7afa9ae96
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
View File

@ -1,32 +0,0 @@
From 126de0cd95418811e302996161e03195bf7e631a Mon Sep 17 00:00:00 2001
From: neok-m4700 <neok-m4700@users.noreply.github.com>
Date: Tue, 25 Jul 2017 10:25:20 +0200
Subject: [PATCH] Update OpenCVCompilerOptions.cmake
misplaced else
[Upstream commit: https://github.com/opencv/opencv/commit/126de0cd95418811e302996161e03195bf7e631a]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
cmake/OpenCVCompilerOptions.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
index 9b2a4e42e..7b079c5f9 100644
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@@ -18,9 +18,9 @@ if(ENABLE_CCACHE AND NOT CMAKE_COMPILER_IS_CCACHE)
message(STATUS "Unable to compile program with enabled ccache, reverting...")
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}")
endif()
- else()
- message(STATUS "Looking for ccache - not found")
endif()
+ else()
+ message(STATUS "Looking for ccache - not found")
endif()
endif()
--
2.15.0

2
package/opencv/opencv.hash
View File

@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41 opencv-2.4.13.3.tar.gz sha256 192d903588ae2cdceab3d7dc5a5636b023132c8369f184ca89ccec0312ae33d0 opencv-2.4.13.7.tar.gz
sha256 46e42877dfc3ac65769292cb4dc1a04b204ad9e40859a390f4c035d6179fbcc4 LICENSE sha256 46e42877dfc3ac65769292cb4dc1a04b204ad9e40859a390f4c035d6179fbcc4 LICENSE

2
package/opencv/opencv.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
OPENCV_VERSION = 2.4.13.3 OPENCV_VERSION = 2.4.13.7
OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION)) OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
OPENCV_INSTALL_STAGING = YES OPENCV_INSTALL_STAGING = YES
OPENCV_LICENSE = BSD-3-Clause OPENCV_LICENSE = BSD-3-Clause