All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/zxing-cpp: drop opencv and qt dependencies
@ 2024-03-07 10:25 Fabrice Fontaine
  2024-05-10 21:35 ` Thomas Petazzoni via buildroot
  2024-06-08  7:27 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2024-03-07 10:25 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

opencv and qt handling can be dropped since switch to an active fork in
commit 456a7398316655ad0b669635f580e4887c24a700 as they are only used
when examples are enabled resulting in the following warning:

CMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_DOC
    BUILD_DOCS
    BUILD_EXAMPLE
    BUILD_TEST
    BUILD_TESTING
    BUILD_TESTS
    CMAKE_DISABLE_FIND_PACKAGE_OpenCV
    CMAKE_DISABLE_FIND_PACKAGE_Qt5

While at it, also drop BUILD_EXAMPLES which is already passed by
pkg-cmake.mk

Fixes: 456a7398316655ad0b669635f580e4887c24a700

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/zxing-cpp/zxing-cpp.mk | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk
index b0cadf1b1f..86a1ef9680 100644
--- a/package/zxing-cpp/zxing-cpp.mk
+++ b/package/zxing-cpp/zxing-cpp.mk
@@ -14,23 +14,10 @@ ZXING_CPP_DEPENDENCIES = host-pkgconf stb
 ZXING_CPP_CONF_OPTS = \
 	-DBUILD_READERS=ON \
 	-DBUILD_WRITERS=ON \
-	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_BLACKBOX_TESTS=OFF \
 	-DBUILD_UNIT_TESTS=OFF \
 	-DBUILD_DEPENDENCIES=LOCAL
 
-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_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy)
 ZXING_CPP_DEPENDENCIES += python3 python-pybind
 ZXING_CPP_CONF_OPTS += \
@@ -41,17 +28,4 @@ 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
-# Only set qt5 as required when all optional qt5 dependencies are present
-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 += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
-endif
-
 $(eval $(cmake-package))
-- 
2.43.0

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/zxing-cpp: drop opencv and qt dependencies
  2024-03-07 10:25 [Buildroot] [PATCH 1/1] package/zxing-cpp: drop opencv and qt dependencies Fabrice Fontaine
@ 2024-05-10 21:35 ` Thomas Petazzoni via buildroot
  2024-06-08  7:27 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-10 21:35 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

On Thu,  7 Mar 2024 11:25:35 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> opencv and qt handling can be dropped since switch to an active fork in
> commit 456a7398316655ad0b669635f580e4887c24a700 as they are only used
> when examples are enabled resulting in the following warning:
> 
> CMake Warning:
>   Manually-specified variables were not used by the project:
> 
>     BUILD_DOC
>     BUILD_DOCS
>     BUILD_EXAMPLE
>     BUILD_TEST
>     BUILD_TESTING
>     BUILD_TESTS
>     CMAKE_DISABLE_FIND_PACKAGE_OpenCV
>     CMAKE_DISABLE_FIND_PACKAGE_Qt5
> 
> While at it, also drop BUILD_EXAMPLES which is already passed by
> pkg-cmake.mk
> 
> Fixes: 456a7398316655ad0b669635f580e4887c24a700
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/zxing-cpp/zxing-cpp.mk | 26 --------------------------
>  1 file changed, 26 deletions(-)

Applied to master, 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/zxing-cpp: drop opencv and qt dependencies
  2024-03-07 10:25 [Buildroot] [PATCH 1/1] package/zxing-cpp: drop opencv and qt dependencies Fabrice Fontaine
  2024-05-10 21:35 ` Thomas Petazzoni via buildroot
@ 2024-06-08  7:27 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2024-06-08  7:27 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > opencv and qt handling can be dropped since switch to an active fork in
 > commit 456a7398316655ad0b669635f580e4887c24a700 as they are only used
 > when examples are enabled resulting in the following warning:

 > CMake Warning:
 >   Manually-specified variables were not used by the project:

 >     BUILD_DOC
 >     BUILD_DOCS
 >     BUILD_EXAMPLE
 >     BUILD_TEST
 >     BUILD_TESTING
 >     BUILD_TESTS
 >     CMAKE_DISABLE_FIND_PACKAGE_OpenCV
 >     CMAKE_DISABLE_FIND_PACKAGE_Qt5

 > While at it, also drop BUILD_EXAMPLES which is already passed by
 > pkg-cmake.mk

 > Fixes: 456a7398316655ad0b669635f580e4887c24a700

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2024.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-06-08  7:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-07 10:25 [Buildroot] [PATCH 1/1] package/zxing-cpp: drop opencv and qt dependencies Fabrice Fontaine
2024-05-10 21:35 ` Thomas Petazzoni via buildroot
2024-06-08  7:27 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.