rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/buildroot/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

12
bsp/buildroot/package/opencv/Config.in
View File

@@ -266,18 +266,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
help
Use shared libpng from the target system.
config BR2_PACKAGE_OPENCV_WITH_QT
bool "qt backend support"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # qt
depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
select BR2_PACKAGE_QT
select BR2_PACKAGE_QT_STL
select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_TEST
help
Use Qt with QtTest module and STL support
config BR2_PACKAGE_OPENCV_WITH_TIFF
bool "tiff support"
select BR2_PACKAGE_TIFF

2
bsp/buildroot/package/opencv/opencv.hash
View File

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

10
bsp/buildroot/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_INSTALL_STAGING = YES
OPENCV_LICENSE = BSD-3-Clause
@@ -160,6 +160,7 @@ OPENCV_CONF_OPTS += \
-DWITH_OPENGL=OFF \
-DWITH_OPENMP=OFF \
-DWITH_OPENNI=OFF \
-DWITH_QT=OFF \
-DWITH_UNICAP=OFF \
-DWITH_XINE=OFF
@@ -215,13 +216,6 @@ else
OPENCV_CONF_OPTS += -DWITH_PNG=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y)
OPENCV_CONF_OPTS += -DWITH_QT=4
OPENCV_DEPENDENCIES += qt
else
OPENCV_CONF_OPTS += -DWITH_QT=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y)
OPENCV_CONF_OPTS += -DWITH_TIFF=ON
OPENCV_DEPENDENCIES += tiff