Revert "package/opencv3: bump to version 4.2.0"
This reverts commit5e51bb2756
. Indeed, version 4.x is not backward with opencv 3.x, most of the C API has been removed as stated in https://opencv.org/opencv-4-0. Moreover, these issues should also be fixed: - pkg-config file is not installed by default sincee755a2a6e4
- layout of include files and pkg-config file name are different sincea956732874
As a result, ffmpeg fails to build with opencv 4.2.0. Moreover, it should be noted that -DPROTOBUF_UPDATE_FILES=ON should be applied in a separate patch to fix existing build failure with 3.4.9 as stated in https://patchwork.ozlabs.org/patch/1222308 Fixes: - http://autobuild.buildroot.org/results/ef1d09d8b234807dcd993422f9557e5c34506013 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
1e45234ef9
commit
d3000df092
|
@ -1,3 +1,3 @@
|
|||
# Locally calculated
|
||||
sha256 9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec opencv3-4.2.0.tar.gz
|
||||
sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE
|
||||
sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz
|
||||
sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
OPENCV3_VERSION = 4.2.0
|
||||
OPENCV3_VERSION = 3.4.9
|
||||
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
|
||||
OPENCV3_INSTALL_STAGING = YES
|
||||
OPENCV3_LICENSE = BSD-3-Clause
|
||||
|
@ -282,10 +282,10 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
|
|||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y)
|
||||
OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON -DPROTOBUF_UPDATE_FILES=ON
|
||||
OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON
|
||||
OPENCV3_DEPENDENCIES += protobuf
|
||||
else
|
||||
OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=OFF
|
||||
OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
|
||||
|
|
Loading…
Reference in a new issue