Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
From ac9ec55b37b2dd3b224144b4f20857a80719b750 Mon Sep 17 00:00:00 2001
|
||||
From: Loic Devulder <ldevulder@suse.de>
|
||||
Date: Fri, 28 Sep 2018 15:33:18 +0200
|
||||
Subject: [PATCH] 3rdparty/protobuf: fix compilation issue on s390
|
||||
|
||||
This commit fixes an issue while trying to compile
|
||||
on s390x architecture.
|
||||
|
||||
This is simply a backport of a fixe already applied
|
||||
in official protobuf code:
|
||||
- https://github.com/protocolbuffers/protobuf/pull/3955
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/opencv/opencv/commit/ac9ec55b37b2dd3b224144b4f20857a80719b750]
|
||||
---
|
||||
.../protobuf/stubs/atomicops_internals_generic_gcc.h | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
|
||||
index 0b0b06ce6cf..075c406abab 100644
|
||||
--- a/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
|
||||
+++ b/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
|
||||
@@ -146,6 +146,14 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
|
||||
return __atomic_load_n(ptr, __ATOMIC_RELAXED);
|
||||
}
|
||||
|
||||
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
|
||||
+ Atomic64 old_value,
|
||||
+ Atomic64 new_value) {
|
||||
+ __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
|
||||
+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
|
||||
+ return old_value;
|
||||
+}
|
||||
+
|
||||
#endif // defined(__LP64__)
|
||||
|
||||
} // namespace internal
|
||||
@@ -82,20 +82,6 @@ comment "gtk3 support needs libgtk3"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_PACKAGE_LIBGTK3
|
||||
|
||||
config BR2_PACKAGE_OPENCV3_WITH_QT
|
||||
bool "qt4"
|
||||
depends on BR2_PACKAGE_QT
|
||||
select BR2_PACKAGE_QT_STL
|
||||
select BR2_PACKAGE_QT_GUI_MODULE
|
||||
select BR2_PACKAGE_QT_TEST
|
||||
help
|
||||
Use Qt4 with QtTest and QtGui modules and STL support, as
|
||||
GUI toolkit.
|
||||
|
||||
comment "qt4 support needs qt"
|
||||
depends on BR2_USE_MMU # qt
|
||||
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
|
||||
|
||||
config BR2_PACKAGE_OPENCV3_WITH_QT5
|
||||
bool "qt5"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
@@ -108,7 +94,7 @@ config BR2_PACKAGE_OPENCV3_WITH_QT5
|
||||
components, as GUI toolkit.
|
||||
|
||||
comment "qt5 support needs qt5"
|
||||
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
|
||||
depends on !BR2_PACKAGE_QT5
|
||||
|
||||
endchoice
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 opencv3-3.3.0.tar.gz
|
||||
# License files, locally calculated
|
||||
sha256 e974db937899a2505f0eb43ece9d2f2eb36e8580ad88785e3ffac0d697ebaf5d LICENSE
|
||||
sha256 4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec opencv3-3.4.3.tar.gz
|
||||
sha256 fea311907cb6271b05ff5843b238e0f2edb6f204a3432975211030d20704b321 LICENSE
|
||||
|
||||
@@ -4,20 +4,28 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENCV3_VERSION = 3.3.0
|
||||
OPENCV3_VERSION = 3.4.3
|
||||
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
|
||||
OPENCV3_INSTALL_STAGING = YES
|
||||
OPENCV3_LICENSE = BSD-3-Clause
|
||||
OPENCV3_LICENSE_FILES = LICENSE
|
||||
OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
|
||||
# Uses __atomic_fetch_add_4
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
OPENCV3_CXXFLAGS += -latomic
|
||||
endif
|
||||
|
||||
# Fix c++11 build with missing std::exception_ptr
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y)
|
||||
OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0
|
||||
endif
|
||||
|
||||
# OpenCV component options
|
||||
OPENCV3_CONF_OPTS += \
|
||||
-DCMAKE_CXX_FLAGS="$(OPENCV3_CXXFLAGS)" \
|
||||
-DBUILD_DOCS=OFF \
|
||||
-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),ON,OFF) \
|
||||
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_TESTS),ON,OFF) \
|
||||
@@ -99,7 +107,14 @@ OPENCV3_CONF_OPTS += \
|
||||
# * PowerPC support is turned off since its only effect is altering CFLAGS,
|
||||
# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
|
||||
OPENCV3_CONF_OPTS += \
|
||||
-DENABLE_POWERPC=OFF
|
||||
-DENABLE_POWERPC=OFF \
|
||||
-DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF)
|
||||
|
||||
ifeq ($(BR2_ARCH_IS_64):$(BR2_ARM_CPU_HAS_VFPV3),:y)
|
||||
OPENCV3_CONF_OPTS += -DENABLE_VFPV3=ON
|
||||
else
|
||||
OPENCV3_CONF_OPTS += -DENABLE_VFPV3=OFF
|
||||
endif
|
||||
|
||||
# Cuda stuff
|
||||
OPENCV3_CONF_OPTS += \
|
||||
@@ -273,18 +288,11 @@ else
|
||||
OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT)$(BR2_PACKAGE_OPENCV3_WITH_QT5),)
|
||||
OPENCV3_CONF_OPTS += -DWITH_QT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT),y)
|
||||
OPENCV3_CONF_OPTS += -DWITH_QT=4
|
||||
OPENCV3_DEPENDENCIES += qt
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
|
||||
OPENCV3_CONF_OPTS += -DWITH_QT=5
|
||||
OPENCV3_DEPENDENCIES += qt5base
|
||||
else
|
||||
OPENCV3_CONF_OPTS += -DWITH_QT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y)
|
||||
|
||||
Reference in New Issue
Block a user