[Buildroot] [PATCH 1/3] package/stb: new package

[Buildroot] [PATCH 1/3] package/stb: new package

[James Hilliard]

This is a header only library which is required by the latest version
of zxing-cpp.

Include paths and pc file are based off of debian libstb package.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 DEVELOPERS            |  1 +
 package/Config.in     |  1 +
 package/stb/Config.in |  6 ++++++
 package/stb/stb.hash  |  3 +++
 package/stb/stb.mk    | 21 +++++++++++++++++++++
 package/stb/stb.pc    |  8 ++++++++
 6 files changed, 40 insertions(+)
 create mode 100644 package/stb/Config.in
 create mode 100644 package/stb/stb.hash
 create mode 100644 package/stb/stb.mk
 create mode 100644 package/stb/stb.pc

diff --git a/DEVELOPERS b/DEVELOPERS
index 9bd98da5ef..b5665b7eb8 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1419,6 +1419,7 @@ F:	package/rtl8192eu/
 F:	package/serd/
 F:	package/sord/
 F:	package/sratom/
+F:	package/stb/
 F:	package/zchunk/
 F:	support/testing/tests/package/sample_python_rtoml.py
 F:	support/testing/tests/package/test_python_rtoml.py
diff --git a/package/Config.in b/package/Config.in
index aef80f9ab0..5e9a3ec1b2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1600,6 +1600,7 @@ menu "Graphics"
 	source "package/pixman/Config.in"
 	source "package/poppler/Config.in"
 	source "package/powervr/Config.in"
+	source "package/stb/Config.in"
 	source "package/tiff/Config.in"
 	source "package/unclutter-xfixes/Config.in"
 	source "package/waffle/Config.in"
diff --git a/package/stb/Config.in b/package/stb/Config.in
new file mode 100644
index 0000000000..41014d242b
--- /dev/null
+++ b/package/stb/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_STB
+	bool "stb"
+	help
+	  Single-file image and audio processing libraries for C/C++.
+
+	  https://github.com/nothings/stb
diff --git a/package/stb/stb.hash b/package/stb/stb.hash
new file mode 100644
index 0000000000..097ad3424f
--- /dev/null
+++ b/package/stb/stb.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  c47cf5abe21e1d620afccd159c23fe71dfa86eb270015a7646a4f79e9bfd5503  stb-8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55.tar.gz
+sha256  bebfe904b14301657e4e5d655c811d51fd31b97c455b9cc2d8600d6bac6cff63  LICENSE
diff --git a/package/stb/stb.mk b/package/stb/stb.mk
new file mode 100644
index 0000000000..59358aec26
--- /dev/null
+++ b/package/stb/stb.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# stb
+#
+################################################################################
+
+STB_VERSION = 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55
+STB_SITE = $(call github,nothings,stb,$(STB_VERSION))
+STB_LICENSE = Public Domain or MIT
+STB_LICENSE_FILES = LICENSE
+STB_INSTALL_STAGING = YES
+STB_INSTALL_TARGET = NO
+
+define STB_INSTALL_STAGING_CMDS
+	mkdir -p $(STAGING_DIR)/usr/include/stb
+	$(INSTALL) -m 0644 $(@D)/*.h $(STAGING_DIR)/usr/include/stb
+	$(INSTALL) -D -m 0644 $(STB_PKGDIR)/stb.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/stb.pc
+endef
+
+$(eval $(generic-package))
diff --git a/package/stb/stb.pc b/package/stb/stb.pc
new file mode 100644
index 0000000000..165b6da94a
--- /dev/null
+++ b/package/stb/stb.pc
@@ -0,0 +1,8 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: stb
+Description: single-file image and audio processing libraries for C/C++
+Version: 0.0
+Cflags: -I${includedir}/stb
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/3] package/zxing-cpp: bump to version 1.4.0

[James Hilliard]

Drop patches which are no longer required.

Verified license remains Apache-2.0 after hash change.

Rework config options for 1.4.0.

Add new host-pkgconf and stb build dependency.

Drop optional libiconv dependency which is no longer used.

Add optional python module support.

Add optional qt5 support.

Add optional opencv4 support.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...bs-private-not-exported-to-the-users.patch | 43 -----------------
 ...akeLists-txt-add-BUILD_OPENCV-option.patch | 39 ---------------
 package/zxing-cpp/Config.in                   |  2 +
 package/zxing-cpp/zxing-cpp.hash              |  4 +-
 package/zxing-cpp/zxing-cpp.mk                | 47 +++++++++++++++----
 5 files changed, 41 insertions(+), 94 deletions(-)
 delete mode 100644 package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch
 delete mode 100644 package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch

diff --git a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch
deleted file mode 100644
index 90b2320384..0000000000
--- a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001
-From: Yuri <yuri@rawbw.com>
-Date: Sat, 20 Apr 2019 07:28:26 -0700
-Subject: [PATCH] Link library with OpenCV, not only the executable, make libs
- PRIVATE.
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86]
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 738f4e1..efe3aee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,10 +60,12 @@ include_directories(core/src)
- add_library(libzxing ${LIBZXING_FILES})
- set_target_properties(libzxing PROPERTIES PREFIX "")
- 
-+set(libzxing_LIBS "")
-+
- find_package(Iconv)
- if(ICONV_FOUND)
-     include_directories(${ICONV_INCLUDE_DIR})
--    target_link_libraries(libzxing ${ICONV_LIBRARIES})
-+    set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES})
- else()
-     add_definitions(-DNO_ICONV=1)
- endif()
-@@ -75,9 +77,12 @@ if(OpenCV_FOUND)
-         "./opencv-cli/src/*.h"
-     )
-     add_executable(zxing-cv ${OPENCV_ZXING_FILES})
-+    set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES})
-     target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES})
- endif()
- 
-+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS})
-+
- # Add cli executable.
- file(GLOB_RECURSE ZXING_FILES
-     "./cli/src/*.cpp"
diff --git a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch
deleted file mode 100644
index 31753d7c24..0000000000
--- a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 9 Nov 2019 17:21:13 +0100
-Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option
-
-Add BUILD_OPENCV option to allow the user to disable OpenCV. It is
-especially useful as opencv library can be built without highgui support
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90]
----
- CMakeLists.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 738f4e1..12913cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0)
- project(zxing)
- 
- option(BUILD_TESTING "Enable generation of test targets" OFF)
-+option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON)
- 
- set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
- 
-@@ -44,8 +45,10 @@ else()
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
- 
--# OpenCV classes
--find_package(OpenCV)
-+if (BUILD_OPENCV)
-+    # OpenCV classes
-+    find_package(OpenCV)
-+endif()
- if(OpenCV_FOUND)
-     list(APPEND LIBZXING_FILES
-         opencv/src/zxing/MatSource.cpp
diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in
index c1109219a0..6c17565d2a 100644
--- a/package/zxing-cpp/Config.in
+++ b/package/zxing-cpp/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_ZXING_CPP
 	bool "zxing-cpp"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_STB
+	select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3
 	help
 	  ZXing-cpp (pronounced "zebra crossing") is an open-source,
 	  multi-format 1D/2D barcode image processing library
diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash
index cabe3e70d4..5457ede44a 100644
--- a/package/zxing-cpp/zxing-cpp.hash
+++ b/package/zxing-cpp/zxing-cpp.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6  zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz
+sha256  126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862  zxing-cpp-1.4.0.tar.gz
 
 # License files
-sha256  c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4  COPYING
+sha256  c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08  LICENSE
diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk
index e9c80b4453..a728e3c352 100644
--- a/package/zxing-cpp/zxing-cpp.mk
+++ b/package/zxing-cpp/zxing-cpp.mk
@@ -4,23 +4,50 @@
 #
 ################################################################################
 
-ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10
-ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION))
+ZXING_CPP_VERSION = 1.4.0
+ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION))
 ZXING_CPP_LICENSE = Apache-2.0
-ZXING_CPP_LICENSE_FILES = COPYING
+ZXING_CPP_LICENSE_FILES = LICENSE
 ZXING_CPP_INSTALL_STAGING = YES
 ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO
-ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF
+ZXING_CPP_DEPENDENCIES = host-pkgconf stb
+ZXING_CPP_CONF_OPTS = \
+	-DBUILD_READERS=ON \
+	-DBUILD_WRITERS=ON \
+	-DBUILD_EXAMPLES=ON \
+	-DBUILD_BLACKBOX_TESTS=OFF \
+	-DBUILD_UNIT_TESTS=OFF \
+	-DBUILD_DEPENDENCIES=LOCAL
 
-ifeq ($(BR2_PACKAGE_LIBICONV),y)
-ZXING_CPP_DEPENDENCIES += libiconv
+ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y)
+ifeq ($(BR2_PACKAGE_OPENCV3),y)
+ZXING_CPP_DEPENDENCIES += opencv3
+endif
+ifeq ($(BR2_PACKAGE_OPENCV4),y)
+ZXING_CPP_DEPENDENCIES += opencv4
+endif
+ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE
+else
+ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE
 endif
 
-ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y)
-ZXING_CPP_DEPENDENCIES += opencv3
-ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON
+ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),y)
+ZXING_CPP_DEPENDENCIES += python3 python-pybind
+ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON
+else
+ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE),y)
+ZXING_CPP_DEPENDENCIES += qt5base
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy)
+ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia
+endif
+ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy)
+ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE
+endif
 else
-ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF
+ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
 endif
 
 $(eval $(cmake-package))
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/3] package/gstreamer1/gst1-plugins-bad: add zxing plugin support

[James Hilliard]

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/gstreamer1/gst1-plugins-bad/Config.in           | 9 +++++++++
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index bcb4cb1545..83dcf37b76 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -727,6 +727,15 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING
+	bool "zxing"
+	depends on !BR2_STATIC_LIBS # zxing-cpp
+	depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp
+	select BR2_PACKAGE_ZXING_CPP
+
+comment "zxing plugin needs a toolchain w/ C++, dynamic library"
+	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP
+
 endif
 
 comment "gst1-plugins-bad needs a toolchain w/ C++"
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 14710a2501..78b5096639 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
 	-Dsvthevcenc=disabled \
 	-Dtranscode=disabled \
 	-Dwasapi2=disabled \
-	-Dzxing=disabled \
 	-Dmagicleap=disabled \
 	-Disac=disabled \
 	-Diqa=disabled \
@@ -802,6 +801,13 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y)
+GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled
+GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp
+else
+GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled
+endif
+
 # Add GPL license if GPL licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
 GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/stb: new package

[Thomas Petazzoni via buildroot]

On Sun,  6 Nov 2022 19:24:56 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> This is a header only library which is required by the latest version
> of zxing-cpp.
> 
> Include paths and pc file are based off of debian libstb package.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  DEVELOPERS            |  1 +
>  package/Config.in     |  1 +
>  package/stb/Config.in |  6 ++++++
>  package/stb/stb.hash  |  3 +++
>  package/stb/stb.mk    | 21 +++++++++++++++++++++
>  package/stb/stb.pc    |  8 ++++++++
>  6 files changed, 40 insertions(+)
>  create mode 100644 package/stb/Config.in
>  create mode 100644 package/stb/stb.hash
>  create mode 100644 package/stb/stb.mk
>  create mode 100644 package/stb/stb.pc

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/zxing-cpp: bump to version 1.4.0

[Thomas Petazzoni via buildroot]

Hello James,

On Sun,  6 Nov 2022 19:24:57 -0700
James Hilliard <james.hilliard1@gmail.com> wrote:

> -ifeq ($(BR2_PACKAGE_LIBICONV),y)
> -ZXING_CPP_DEPENDENCIES += libiconv
> +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y)
> +ifeq ($(BR2_PACKAGE_OPENCV3),y)
> +ZXING_CPP_DEPENDENCIES += opencv3
> +endif
> +ifeq ($(BR2_PACKAGE_OPENCV4),y)
> +ZXING_CPP_DEPENDENCIES += opencv4
> +endif
> +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE
> +else
> +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE
>  endif
>  
> -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y)
> -ZXING_CPP_DEPENDENCIES += opencv3
> -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON
> +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),y)

Are you sure this is correct? I believe it should be:

ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy)

or:

ifeq ($(BR2_PACKAGE_PYTHON3),y)

since anyway pybind is guaranteed to be available when python3 is
enabled, since you select it.

> +ZXING_CPP_DEPENDENCIES += python3 python-pybind
> +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON
> +else
> +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_QT5BASE),y)
> +ZXING_CPP_DEPENDENCIES += qt5base
> +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy)
> +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia
> +endif
> +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy)
> +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE

it's a bit confusing what's happening here. Why are the dependencies
different than the condition used to enable Qt support?

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/zxing-cpp: bump to version 1.4.0

[James Hilliard]

[-- Attachment #1.1: Type: text/plain, Size: 2191 bytes --]

On Mon, Nov 14, 2022, 6:45 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com>
wrote:

> Hello James,
>
> On Sun,  6 Nov 2022 19:24:57 -0700
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > -ifeq ($(BR2_PACKAGE_LIBICONV),y)
> > -ZXING_CPP_DEPENDENCIES += libiconv
> > +ifeq
> ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y)
> > +ifeq ($(BR2_PACKAGE_OPENCV3),y)
> > +ZXING_CPP_DEPENDENCIES += opencv3
> > +endif
> > +ifeq ($(BR2_PACKAGE_OPENCV4),y)
> > +ZXING_CPP_DEPENDENCIES += opencv4
> > +endif
> > +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE
> > +else
> > +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE
> >  endif
> >
> > -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y)
> > -ZXING_CPP_DEPENDENCIES += opencv3
> > -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON
> > +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),y)
>
> Are you sure this is correct? I believe it should be:
>
> ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy)
>
> or:
>
> ifeq ($(BR2_PACKAGE_PYTHON3),y)
>
> since anyway pybind is guaranteed to be available when python3 is
> enabled, since you select it.
>
> > +ZXING_CPP_DEPENDENCIES += python3 python-pybind
> > +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON
> > +else
> > +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_QT5BASE),y)
> > +ZXING_CPP_DEPENDENCIES += qt5base
> > +ifeq
> ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy)
> > +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia
> > +endif
> > +ifeq
> ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy)
> > +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE
>
> it's a bit confusing what's happening here. Why are the dependencies
> different than the condition used to enable Qt support?
>

This variable makes all optional qt deps required, so we only set it when
all optional
qt deps are present.

Some features only need some qt deps.


> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
>

[-- Attachment #1.2: Type: text/html, Size: 3234 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/zxing-cpp: bump to version 1.4.0

[James Hilliard]

On Mon, Nov 14, 2022 at 6:45 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello James,
>
> On Sun,  6 Nov 2022 19:24:57 -0700
> James Hilliard <james.hilliard1@gmail.com> wrote:
>
> > -ifeq ($(BR2_PACKAGE_LIBICONV),y)
> > -ZXING_CPP_DEPENDENCIES += libiconv
> > +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y)
> > +ifeq ($(BR2_PACKAGE_OPENCV3),y)
> > +ZXING_CPP_DEPENDENCIES += opencv3
> > +endif
> > +ifeq ($(BR2_PACKAGE_OPENCV4),y)
> > +ZXING_CPP_DEPENDENCIES += opencv4
> > +endif
> > +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE
> > +else
> > +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE
> >  endif
> >
> > -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y)
> > -ZXING_CPP_DEPENDENCIES += opencv3
> > -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON
> > +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),y)
>
> Are you sure this is correct? I believe it should be:
>
> ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy)

Fixed in v2:
https://patchwork.ozlabs.org/project/buildroot/patch/20221114232254.3970611-1-james.hilliard1@gmail.com/

>
> or:
>
> ifeq ($(BR2_PACKAGE_PYTHON3),y)
>
> since anyway pybind is guaranteed to be available when python3 is
> enabled, since you select it.
>
> > +ZXING_CPP_DEPENDENCIES += python3 python-pybind
> > +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON
> > +else
> > +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_QT5BASE),y)
> > +ZXING_CPP_DEPENDENCIES += qt5base
> > +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy)
> > +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia
> > +endif
> > +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy)
> > +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE

This makes all the qt5 components here required:
https://github.com/zxing-cpp/zxing-cpp/blob/v1.4.0/example/CMakeLists.txt#L29

One qt5 feature requires BR2_PACKAGE_QT5BASE_GUI:
https://github.com/zxing-cpp/zxing-cpp/blob/v1.4.0/example/CMakeLists.txt#L33

The other requires BR2_PACKAGE_QT5DECLARATIVE_QUICK and
BR2_PACKAGE_QT5MULTIMEDIA but not BR2_PACKAGE_QT5BASE_GUI:
https://github.com/zxing-cpp/zxing-cpp/blob/v1.4.0/example/CMakeLists.txt#L38

>
> it's a bit confusing what's happening here. Why are the dependencies
> different than the condition used to enable Qt support?

Also added a comment in v2:
https://patchwork.ozlabs.org/project/buildroot/patch/20221114232254.3970611-1-james.hilliard1@gmail.com/

>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot