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/opencv3: bump to version 4.2.0

Browse Source 
We need to set -DPROTOBUF_UPDATE_FILES=ON otherwise our protobuf
headers will be incompatible.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
James Hilliard 2020-03-02 07:35:16 -07:00 committed by Thomas Petazzoni
parent cb619c5831
commit 5e51bb2756
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/opencv3/opencv3.hash
View File

@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz sha256 9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec opencv3-4.2.0.tar.gz
sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE

6
package/opencv3/opencv3.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
OPENCV3_VERSION = 3.4.9 OPENCV3_VERSION = 4.2.0
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES OPENCV3_INSTALL_STAGING = YES
OPENCV3_LICENSE = BSD-3-Clause OPENCV3_LICENSE = BSD-3-Clause
@ -282,10 +282,10 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y) ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y)
OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON -DPROTOBUF_UPDATE_FILES=ON
OPENCV3_DEPENDENCIES += protobuf OPENCV3_DEPENDENCIES += protobuf
else else
OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y) ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)