Skip to contentSkip to conversation

package/opencv3: add protobuf option

PATCH New Fabrice Fontaine 2 participants 4 messages Jan 11, 2020 – Jan 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/opencv3: add protobuf option

Currently, protobuf is built unconditionnally since version 3.3.0 and
https://github.com/opencv/opencv/commit/1c4c58d1b5b7430463281e8c8072e04245f561b0

---
 package/opencv3/Config.in  | 12 ++++++++++++
 package/opencv3/opencv3.mk |  8 ++++++++
 2 files changed, 20 insertions(+)
package/opencv3/Config.in +12 -0
index cf7763d4ae..fdd7152ee6 100644
@@ -307,6 +307,18 @@ config BR2_PACKAGE_OPENCV3_WITH_PNG
 	help
 	  Use shared libpng from the target system.
 
+config BR2_PACKAGE_OPENCV3_WITH_PROTOBUF
+	bool "protobuf support"
+	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf
+	select BR2_PACKAGE_PROTOBUF
+	help
+	  Use shared protobuf from the target system.
+
+comment "protobuf support needs a toolchain w/ gcc >= 4.8"
+	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
 config BR2_PACKAGE_OPENCV3_WITH_TIFF
 	bool "tiff support"
 	select BR2_PACKAGE_TIFF
package/opencv3/opencv3.mk +8 -0
index d38107f6e7..bac4c2fa11 100644
@@ -198,6 +198,7 @@ OPENCV3_CONF_OPTS += \
 	-DBUILD_JPEG=OFF \
 	-DBUILD_OPENEXR=OFF \
 	-DBUILD_PNG=OFF \
+	-DBUILD_PROTOBUF=OFF \
 	-DBUILD_TIFF=OFF \
 	-DBUILD_ZLIB=OFF \
 	-DINSTALL_C_EXAMPLES=OFF \
@@ -293,6 +294,13 @@ else
 OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y)
+OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON
+OPENCV3_DEPENDENCIES += protobuf
+else
+OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
 OPENCV3_CONF_OPTS += -DWITH_QT=5
 OPENCV3_DEPENDENCIES += qt5base
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/opencv3: add protobuf option

Quoted 2 lines · On Sat, 11 Jan 2020 16:01:43 +0100 Fabrice Fontaine…

Currently, protobuf is built unconditionnally since version 3.3.0 and
https://github.com/opencv/opencv/commit/1c4c58d1b5b7430463281e8c8072e04245f561b0

If I understand correctly, what you meant is:

Since version 3.3.0 and its commit
https://github.com/opencv/opencv/commit/1c4c58d1b5b7430463281e8c8072e04245f561b0,
opencv3 bundles its own copy of protobuf. Instead of using the bundled protobuf library, this commit disables building protobuf (BUILD_PROTOBUF=OFF) and instead uses the protobuf Buildroot package (using the WITH_PROTOBUF=ON/OFF option).

Is that correct ?

Thanks,

Thomas

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

PATCH 1/1 package/opencv3: add protobuf option

Le sam. 11 janv. 2020 ? 17:14, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 9 lines
Quoted 2 lines · On Sat, 11 Jan 2020 16:01:43 +0100 Fabrice Fontaine…

Currently, protobuf is built unconditionnally since version 3.3.0 and
https://github.com/opencv/opencv/commit/1c4c58d1b5b7430463281e8c8072e04245f561b0

If I understand correctly, what you meant is:

Quoted 8 lines

Since version 3.3.0 and its commit
https://github.com/opencv/opencv/commit/1c4c58d1b5b7430463281e8c8072e04245f561b0,
opencv3 bundles its own copy of protobuf. Instead of using the bundled protobuf library, this commit disables building protobuf (BUILD_PROTOBUF=OFF) and instead uses the protobuf Buildroot package (using the WITH_PROTOBUF=ON/OFF option).

Is that correct ?

Yes, this is correct. I should have take more time in writing this commit message.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 package/opencv3: add protobuf option

In reply to Fabrice Fontaine
Quoted 8 lines · On Sat, 11 Jan 2020 16:01:43 +0100 Fabrice Fontaine…

Currently, protobuf is built unconditionnally since version 3.3.0 and
https://github.com/opencv/opencv/commit/1c4c58d1b5b7430463281e8c8072e04245f561b0

---
 package/opencv3/Config.in  | 12 ++++++++++++
 package/opencv3/opencv3.mk |  8 ++++++++
 2 files changed, 20 insertions(+)

I've applied after improving the commit title and commit log, as we discussed.

Thanks!

Thomas

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