Revert "package/opencv3: bump to version 4.2.0"
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Tue, 10 Mar 2020 22:31:32 +0000 (23:31 +0100)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Mon, 30 Mar 2020 06:53:54 +0000 (08:53 +0200)
This reverts commit 5e51bb2756ee5063eff9a45a46033a449e2a6195.
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 since
 https://github.com/opencv/opencv/commit/e755a2a6e48ae02dd5136a628cc4148566a08225
 - layout of include files and pkg-config file name are different since
 https://github.com/opencv/opencv/commit/a95673287433fc810eda2d88b94bb234298c4cd5

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>
package/opencv3/opencv3.hash
package/opencv3/opencv3.mk

index ef95f24ad340519b1927de73057a10440d26c6ab..4953d01a1c0b07340454cbf0b963b23160fcfcd8 100644 (file)
@@ -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
index 8a8257b3872518a4a95a45d891aa602f0399dd96..2c5d6b041d0f215ed61ae6b7db48e6e8568ab0d1 100644 (file)
@@ -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)