From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 18 Feb 2022 17:04:33 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nL5kH-00323A-JX for lore@lore.pengutronix.de; Fri, 18 Feb 2022 17:04:33 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nL5kG-0000L0-UK; Fri, 18 Feb 2022 17:04:32 +0100 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nL5k0-0000Ks-P2 for ptxdist@pengutronix.de; Fri, 18 Feb 2022 17:04:16 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Fri, 18 Feb 2022 17:04:15 +0100 Message-Id: <20220218160415.348601-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH] json-glib: version bump 1.2.8 -> 1.6.6 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.ext.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Philipp Zabel --- rules/json-glib.in | 1 + rules/json-glib.make | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/rules/json-glib.in b/rules/json-glib.in index 03e3743697ce..9230f4001bee 100644 --- a/rules/json-glib.in +++ b/rules/json-glib.in @@ -3,6 +3,7 @@ config JSON_GLIB tristate prompt "json-glib" + select HOST_MESON select GLIB select HOST_GLIB # for glib-mkenums select GOBJECT_INTROSPECTION if JSON_GLIB_INTROSPECTION diff --git a/rules/json-glib.make b/rules/json-glib.make index 507560e283f0..d36edc7d2cf6 100644 --- a/rules/json-glib.make +++ b/rules/json-glib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_GLIB) += json-glib # # Paths and names # -JSON_GLIB_VERSION := 1.2.8 -JSON_GLIB_MD5 := ff31e7d0594df44318e12facda3d086e +JSON_GLIB_VERSION := 1.6.6 +JSON_GLIB_MD5 := 9c40fcd8cdbf484dd1704480afefae14 JSON_GLIB := json-glib-$(JSON_GLIB_VERSION) JSON_GLIB_SUFFIX := tar.xz JSON_GLIB_URL := $(call ptx/mirror, GNOME, json-glib/$(basename $(JSON_GLIB_VERSION))/$(JSON_GLIB).$(JSON_GLIB_SUFFIX)) @@ -28,25 +28,15 @@ JSON_GLIB_LICENSE := LGPL-2.1-only # ---------------------------------------------------------------------------- # -# autoconf +# meson # -JSON_GLIB_CONF_TOOL := autoconf +JSON_GLIB_CONF_TOOL := meson JSON_GLIB_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-glibtest \ - --enable-debug=minimum \ - --enable-maintainer-flags=no \ - --disable-installed-tests \ - --disable-always-build-tests \ - --disable-gcov \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-man \ - --$(call ptx/endis, PTXCONF_JSON_GLIB_INTROSPECTION)-introspection \ - --disable-nls \ - --disable-rpath - + $(CROSS_MESON_USR) \ + -Dintrospection=$(call ptx/endis, PTXCONF_JSON_GLIB_INTROSPECTION)d \ + -Dgtk_doc=disabled \ + -Dman=false \ + -Dtests=false # ---------------------------------------------------------------------------- # Target-Install -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de