From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 12 Oct 2026 20:17:52 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xGKau-00CtWZ-0Z for lore@lore.pengutronix.de; Mon, 12 Oct 2026 20:17:52 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xGKat-0003cY-JA; Mon, 12 Oct 2026 20:17:51 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xGKaf-0003cI-Tq; Mon, 12 Oct 2026 20:17:37 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Mon, 12 Oct 2026 20:17:23 +0200 Message-ID: <20261012181736.3193701-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] zbar: version bump 0.23.93 -> 0.23.95 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Autoconf has been replaced by meson, update it accordingly. Signed-off-by: Sven Püschel --- 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