Skip to contentSkip to conversation

Revert "package/opencv3: bump to version 4.2.0"

PATCH New Fabrice Fontaine 3 participants 6 messages Mar 10, 2020 – Mar 30, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "package/opencv3: bump to version 4.2.0"

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

---
 package/opencv3/opencv3.hash | 4 ++--
 package/opencv3/opencv3.mk   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
package/opencv3/opencv3.hash +2 -2
index ef95f24ad3..4953d01a1c 100644
@@ -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
package/opencv3/opencv3.mk +3 -3
index 300631ce51..d37cd45adf 100644
@@ -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
@@ -283,10 +283,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)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 Revert "package/opencv3: bump to version 4.2.0"

Quoted 4 lines · Fabrice Fontaine

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.

I guess we need a separate opencv4 package then for this?

Quoted 65 lines

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

---
 package/opencv3/opencv3.hash | 4 ++--
 package/opencv3/opencv3.mk   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
package/opencv3/opencv3.hash +2 -2
index ef95f24ad3..4953d01a1c 100644
@@ -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
package/opencv3/opencv3.mk +3 -4
index 300631ce51..d37cd45adf 100644
@@ -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
@@ -283,10 +283,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)
--

2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#2 lore raw

PATCH 1/1 Revert "package/opencv3: bump to version 4.2.0"

Hi James,

Le mer. 11 mars 2020 ? 00:11, James Hilliard
<[email protected]> a ?crit :

Quoted 8 lines
Quoted 4 lines · Fabrice Fontaine

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.

I guess we need a separate opencv4 package then for this?

Yes, I think this is the best course of action.

Quoted 57 lines
Quoted 57 lines

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

---
 package/opencv3/opencv3.hash | 4 ++--
 package/opencv3/opencv3.mk   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
package/opencv3/opencv3.hash +2 -2
index ef95f24ad3..4953d01a1c 100644
@@ -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
package/opencv3/opencv3.mk +3 -3
index 300631ce51..d37cd45adf 100644
@@ -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
@@ -283,10 +283,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
 
Quoted 8 lines
Quoted 8 lines
package/opencv3/opencv3.mk +0 -1
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
--

2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 Revert "package/opencv3: bump to version 4.2.0"

Hello,

Quoted 5 lines · On Wed, 11 Mar 2020 08:41:42 +0100 Fabrice Fontaine…
Quoted 4 lines
Quoted 3 lines

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.

I guess we need a separate opencv4 package then for this?

Yes, I think this is the best course of action.

What is the plan then with package/opencv ? Indeed, adding package/opencv4 would mean having 3 different versions of OpenCV supported. Does that make sense? Should we drop support for OpenCV 2.x ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 Revert "package/opencv3: bump to version 4.2.0"

In reply to Fabrice Fontaine
Quoted 3 lines · On Tue, 10 Mar 2020 23:31:32 +0100 Fabrice Fontaine…

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.

Note that this doesn't say that "most of the C API has been removed". It says "A lot of C API from OpenCV 1.x has been removed.". The 1.x is important!

It means that programs that are breaking are using really legacy OpenCV APIs.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/1 Revert "package/opencv3: bump to version 4.2.0"

In reply to Fabrice Fontaine
Quoted 16 lines · On Tue, 10 Mar 2020 23:31:32 +0100 Fabrice Fontaine…

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

Quoted 8 lines

Fixes:
- http://autobuild.buildroot.org/results/ef1d09d8b234807dcd993422f9557e5c34506013

---
 package/opencv3/opencv3.hash | 4 ++--
 package/opencv3/opencv3.mk   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com