Thomas Bonnefille
bf7d413339
This commit bumps the zxing-cpp version to 2.3.0.
For the release note, see:
https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.3.0
The compilation of this package has been broken since the bump to v2.2.1
when it is compiled with reader support, due to the added patch.
This patch was not added upstream, but another set of more generic
patches [1] that do not change the API were added instead. The error
that the Buildroot patch was fixing no longer exists in 2.3.0.
[1]:
- https://github.com/zxing-cpp/zxing-cpp/commit/d0c8f226e22cd978fd42a25a6cff6d65b47ab6e9
- https://github.com/zxing-cpp/zxing-cpp/commit/d979b765a14423f6d7747827b72193a0da9f3030
Fixes:
https://autobuild.buildroot.org/results/ba4573a1bcc0110d4d0b45642e07009ec949d66a/build-end.log
Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com>
Reviewed-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
[Julien: add link to release note]
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit fb032bd34a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
42 lines
1.2 KiB
Makefile
42 lines
1.2 KiB
Makefile
################################################################################
|
|
#
|
|
# zxing-cpp
|
|
#
|
|
################################################################################
|
|
|
|
ZXING_CPP_VERSION = 2.3.0
|
|
ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION))
|
|
ZXING_CPP_LICENSE = Apache-2.0
|
|
ZXING_CPP_LICENSE_FILES = LICENSE
|
|
ZXING_CPP_INSTALL_STAGING = YES
|
|
ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO
|
|
ZXING_CPP_DEPENDENCIES = host-pkgconf stb
|
|
ZXING_CPP_CONF_OPTS = \
|
|
-DBUILD_BLACKBOX_TESTS=OFF \
|
|
-DBUILD_UNIT_TESTS=OFF \
|
|
-DBUILD_DEPENDENCIES=LOCAL
|
|
|
|
ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy)
|
|
ZXING_CPP_DEPENDENCIES += python3 python-pybind
|
|
ZXING_CPP_CONF_OPTS += \
|
|
-DBUILD_PYTHON_MODULE=ON \
|
|
-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \
|
|
-DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
|
|
else
|
|
ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZXING_CPP_READERS),y)
|
|
ZXING_CPP_CONF_OPTS += -DBUILD_READERS=ON
|
|
else
|
|
ZXING_CPP_CONF_OPTS += -DBUILD_READERS=OFF
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZXING_CPP_WRITERS),y)
|
|
ZXING_CPP_CONF_OPTS += -DBUILD_WRITERS=ON
|
|
else
|
|
ZXING_CPP_CONF_OPTS += -DBUILD_WRITERS=OFF
|
|
endif
|
|
|
|
$(eval $(cmake-package))
|