summaryrefslogtreecommitdiffstats
path: root/rules/modemmanager.make
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2022-10-28 23:47:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2022-11-04 10:14:04 +0100
commit624008063d1185a2fcf7e543c3050ead4c46073d (patch)
tree921968c888bf79533d2be34895bc2d1c0008f1d8 /rules/modemmanager.make
parent4e1125737bce586c01afe6bde411a1dcab9afe87 (diff)
downloadptxdist-624008063d1185a2fcf7e543c3050ead4c46073d.tar.gz
ptxdist-624008063d1185a2fcf7e543c3050ead4c46073d.tar.xz
modemmanager: version bump 1.18.12 -> 1.20.0
There is no longer an upstream-provided source tarball. This is the last stable release with autoconf support which is considered deprecated and will be removed in future releases in favour of meson, so do the change now. dbus-1 is now mandatory dependency. This release comes with lots of new features, see announcement: https://lists.freedesktop.org/archives/modemmanager-devel/2022-October/009481.html Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Message-Id: <Y1xN4Fyv93f6PNOK@lenoch> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/modemmanager.make')
-rw-r--r--rules/modemmanager.make60
1 files changed, 27 insertions, 33 deletions
diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index f942b5a65..58427ff8a 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
#
# Paths and names
#
-MODEMMANAGER_VERSION := 1.18.12
-MODEMMANAGER_MD5 := 9f014dfc59f1bd8bc230bb2c2974d104
+MODEMMANAGER_VERSION := 1.20.0
+MODEMMANAGER_MD5 := 900b2e707a2095a4b476b68d1efb1c34
MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION)
-MODEMMANAGER_SUFFIX := tar.xz
-MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
+MODEMMANAGER_SUFFIX := tar.bz2
+MODEMMANAGER_URL := https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEMMANAGER_VERSION)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
MODEMMANAGER_SOURCE := $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
MODEMMANAGER_DIR := $(BUILDDIR)/$(MODEMMANAGER)
MODEMMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -30,38 +30,32 @@ MODEMMANAGER_LICENSE_FILES := \
# Prepare
# ----------------------------------------------------------------------------
-#MODEMMANAGER_CONF_ENV := $(CROSS_ENV)
-
#
-# autoconf
+# meson
#
-MODEMMANAGER_CONF_TOOL := autoconf
+MODEMMANAGER_CONF_TOOL := meson
MODEMMANAGER_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-compile-warnings \
- --disable-Werror \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-nls \
- --disable-rpath \
- --disable-code-coverage \
- --disable-introspection \
- --disable-vala \
- --enable-all-plugins \
- --with-gnu-ld \
- --without-gcov \
- --without-qrtr \
- --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
- --with-udev-base-dir=/usr/lib/udev \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --with-udev \
- --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \
- --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \
- --without-polkit \
- --$(call ptx/wwo, PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS)-at-command-via-dbus \
- --with-mbim \
- --with-qmi
+ $(CROSS_MESON_USR) \
+ -Dudev=true \
+ -Dudevdir=/usr/lib/udev \
+ -Dtests=true \
+ -Ddbus_policy_dir=/usr/share/dbus-1/system.d \
+ -Dsystemdsystemunitdir=/usr/lib/systemd/system \
+ -Dsystemd_suspend_resume=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \
+ -Dpowerd_suspend_resume=false \
+ -Dsystemd_journal=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \
+ -Dpolkit=no \
+ -Dat_command_via_dbus=$(call ptx/truefalse, PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS) \
+ -Dmbim=true \
+ -Dqmi=true \
+ -Dqrtr=false \
+ -Dintrospection=false \
+ -Dvapi=false \
+ -Dgtk_doc=false \
+ -Dman=false \
+ -Dbash_completion=false
+
+# sadly, ModemManager does not build with -Dtests=false
# ----------------------------------------------------------------------------
# Target-Install