* [ptxdist] [PATCH] zbar: version bump 0.23.93 -> 0.23.95
@ 2026-10-12 18:17 Sven Püschel
2026-10-15 5:58 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Sven Püschel @ 2026-10-12 18:17 UTC (permalink / raw)
To: ptxdist; +Cc: Sven Püschel
Autoconf has been replaced by meson, update it accordingly.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
rules/zbar.in | 1 +
rules/zbar.make | 58 ++++++++++++++++++++++++-------------------------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/rules/zbar.in b/rules/zbar.in
index bdf2ec3ac..dd3663d2c 100644
--- a/rules/zbar.in
+++ b/rules/zbar.in
@@ -3,5 +3,6 @@
config ZBAR
tristate
prompt "zbar"
+ select HOST_MESON
help
QR code / bar code scanner and decoder
diff --git a/rules/zbar.make b/rules/zbar.make
index 1eaa513db..cf8d7c58f 100644
--- a/rules/zbar.make
+++ b/rules/zbar.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_ZBAR) += zbar
#
# Paths and names
#
-ZBAR_VERSION := 0.23.93
-ZBAR_SHA256 := 83be8f85fc7c288fd91f98d52fc55db7eedbddcf10a83d9221d7034636683fa0
+ZBAR_VERSION := 0.23.95
+ZBAR_SHA256 := 7b0907a3114503e0a8fbd1c6bfdb61592e6ded79f68716d7ca673ddeb6a87e99
ZBAR := zbar-$(ZBAR_VERSION)
-ZBAR_SUFFIX := tar.bz2
+ZBAR_SUFFIX := tar.gz
ZBAR_URL := https://linuxtv.org/downloads/zbar/$(ZBAR).$(ZBAR_SUFFIX)
ZBAR_SOURCE := $(SRCDIR)/$(ZBAR).$(ZBAR_SUFFIX)
ZBAR_DIR := $(BUILDDIR)/$(ZBAR)
@@ -30,34 +30,34 @@ ZBAR_LICENSE_FILES := \
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-ZBAR_CONF_TOOL := autoconf
+ZBAR_CONF_TOOL := meson
ZBAR_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-static \
- --disable-rpath \
- --disable-nls \
- --enable-pthread \
- --disable-doc \
- --disable-video \
- --disable-introspection \
- --enable-assert \
- --without-directshow \
- --without-x \
- --without-xshm \
- --without-xv \
- --without-dbus \
- --without-jpeg \
- --without-imagemagick \
- --without-graphicsmagick \
- --without-npapi \
- --without-gtk \
- --without-gir \
- --without-python \
- --without-qt \
- --without-qt6 \
- --without-java
+ $(CROSS_MESON_USR) \
+ -Dbuild_tests=false \
+ -Dcodes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode \
+ -Ddbus=disabled \
+ -Ddirectshow=false \
+ -Ddoc=false \
+ -Dgir=false \
+ -Dgraphicsmagick=disabled \
+ -Dgtk=no \
+ -Dimagemagick=disabled \
+ -Djava=disabled \
+ -Djpeg=disabled \
+ -Dlibrary_type=shared \
+ -Dnls=disabled \
+ -Dnpapi=disabled \
+ -Dpthread=true \
+ -Dpython=no \
+ -Dqt=false \
+ -Dqt6=false \
+ -Dstatic_executables=false \
+ -Dvideo=false \
+ -Dx11=disabled \
+ -Dxshm=disabled \
+ -Dxv=disabled
$(STATEDIR)/zbar.targetinstall:
@$(call targetinfo)
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] zbar: version bump 0.23.93 -> 0.23.95
2026-10-12 18:17 [ptxdist] [PATCH] zbar: version bump 0.23.93 -> 0.23.95 Sven Püschel
@ 2026-10-15 5:58 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2026-10-15 5:58 UTC (permalink / raw)
To: ptxdist; +Cc: Sven Püschel
Thanks, applied as a214c9ab17e4e2c0fb03aa63f8fad3d328e2ab84.
Michael
[sent from post-receive hook]
On Thu, 15 Oct 2026 07:58:07 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Autoconf has been replaced by meson, update it accordingly.
>
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20261012181736.3193701-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/zbar.in b/rules/zbar.in
> index bdf2ec3ac1f5..dd3663d2cece 100644
> --- a/rules/zbar.in
> +++ b/rules/zbar.in
> @@ -3,5 +3,6 @@
> config ZBAR
> tristate
> prompt "zbar"
> + select HOST_MESON
> help
> QR code / bar code scanner and decoder
> diff --git a/rules/zbar.make b/rules/zbar.make
> index 1eaa513db9ab..cf8d7c58f39c 100644
> --- a/rules/zbar.make
> +++ b/rules/zbar.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_ZBAR) += zbar
> #
> # Paths and names
> #
> -ZBAR_VERSION := 0.23.93
> -ZBAR_SHA256 := 83be8f85fc7c288fd91f98d52fc55db7eedbddcf10a83d9221d7034636683fa0
> +ZBAR_VERSION := 0.23.95
> +ZBAR_SHA256 := 7b0907a3114503e0a8fbd1c6bfdb61592e6ded79f68716d7ca673ddeb6a87e99
> ZBAR := zbar-$(ZBAR_VERSION)
> -ZBAR_SUFFIX := tar.bz2
> +ZBAR_SUFFIX := tar.gz
> ZBAR_URL := https://linuxtv.org/downloads/zbar/$(ZBAR).$(ZBAR_SUFFIX)
> ZBAR_SOURCE := $(SRCDIR)/$(ZBAR).$(ZBAR_SUFFIX)
> ZBAR_DIR := $(BUILDDIR)/$(ZBAR)
> @@ -30,34 +30,34 @@ ZBAR_LICENSE_FILES := \
> # ----------------------------------------------------------------------------
>
> #
> -# autoconf
> +# meson
> #
> -ZBAR_CONF_TOOL := autoconf
> +ZBAR_CONF_TOOL := meson
> ZBAR_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --disable-static \
> - --disable-rpath \
> - --disable-nls \
> - --enable-pthread \
> - --disable-doc \
> - --disable-video \
> - --disable-introspection \
> - --enable-assert \
> - --without-directshow \
> - --without-x \
> - --without-xshm \
> - --without-xv \
> - --without-dbus \
> - --without-jpeg \
> - --without-imagemagick \
> - --without-graphicsmagick \
> - --without-npapi \
> - --without-gtk \
> - --without-gir \
> - --without-python \
> - --without-qt \
> - --without-qt6 \
> - --without-java
> + $(CROSS_MESON_USR) \
> + -Dbuild_tests=false \
> + -Dcodes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode \
> + -Ddbus=disabled \
> + -Ddirectshow=false \
> + -Ddoc=false \
> + -Dgir=false \
> + -Dgraphicsmagick=disabled \
> + -Dgtk=no \
> + -Dimagemagick=disabled \
> + -Djava=disabled \
> + -Djpeg=disabled \
> + -Dlibrary_type=shared \
> + -Dnls=disabled \
> + -Dnpapi=disabled \
> + -Dpthread=true \
> + -Dpython=no \
> + -Dqt=false \
> + -Dqt6=false \
> + -Dstatic_executables=false \
> + -Dvideo=false \
> + -Dx11=disabled \
> + -Dxshm=disabled \
> + -Dxv=disabled
>
> $(STATEDIR)/zbar.targetinstall:
> @$(call targetinfo)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-10-15 5:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-12 18:17 [ptxdist] [PATCH] zbar: version bump 0.23.93 -> 0.23.95 Sven Püschel
2026-10-15 5:58 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox