* [ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0
2022-10-28 21:45 [ptxdist] [PATCH 0/3] ModemManager update Ladislav Michl
@ 2022-10-28 21:46 ` Ladislav Michl
2022-11-11 14:31 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-28 21:46 ` [ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0 Ladislav Michl
2022-10-28 21:47 ` [ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0 Ladislav Michl
2 siblings, 1 reply; 7+ messages in thread
From: Ladislav Michl @ 2022-10-28 21:46 UTC (permalink / raw)
To: ptxdist
From: Ladislav Michl <ladis@linux-mips.org>
There is no longer an upstream-provided source tarball.
Autoconf support was dropped and package uses meson.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/libmbim.in | 2 +-
rules/libmbim.make | 29 ++++++++++++-----------------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/rules/libmbim.in b/rules/libmbim.in
index 2f5e21f02..01e222533 100644
--- a/rules/libmbim.in
+++ b/rules/libmbim.in
@@ -2,7 +2,7 @@
config LIBMBIM
tristate
- select HOST_SYSTEM_PYTHON3
+ select HOST_MESON
select GLIB
select UDEV
select LIBGUDEV
diff --git a/rules/libmbim.make b/rules/libmbim.make
index f2f8e5801..095b16e36 100644
--- a/rules/libmbim.make
+++ b/rules/libmbim.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim
#
# Paths and names
#
-LIBMBIM_VERSION := 1.26.4
-LIBMBIM_MD5 := 58dea20cad346f31d2873b68385a9973
+LIBMBIM_VERSION := 1.28.0
+LIBMBIM_MD5 := c3ffcb573b7de1a5509b2d222303f1ec
LIBMBIM := libmbim-$(LIBMBIM_VERSION)
-LIBMBIM_SUFFIX := tar.xz
-LIBMBIM_URL := https://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
+LIBMBIM_SUFFIX := tar.bz2
+LIBMBIM_URL := https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
LIBMBIM_DIR := $(BUILDDIR)/$(LIBMBIM)
LIBMBIM_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -27,22 +27,17 @@ LIBMBIM_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
# Prepare
# ----------------------------------------------------------------------------
-LIBMBIM_CONF_ENV := \
- $(CROSS_ENV) \
- ac_cv_path_PYTHON=$(SYSTEMPYTHON3)
#
-# autoconf
+# meson
#
-LIBMBIM_CONF_TOOL := autoconf
+LIBMBIM_CONF_TOOL := meson
LIBMBIM_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-compile-warnings \
- --disable-Werror \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-introspection \
- --with-udev-base-dir=/usr/lib/udev
+ $(CROSS_MESON_USR) \
+ -Dudevdir=/usr/lib/udev \
+ -Dintrospection=false \
+ -Dgtk_doc=false \
+ -Dman=false \
+ -Dbash_completion=false
# ----------------------------------------------------------------------------
# Target-Install
--
2.32.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [APPLIED] libmbim: version bump 1.26.4 -> 1.28.0
2022-10-28 21:46 ` [ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0 Ladislav Michl
@ 2022-11-11 14:31 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2022-11-11 14:31 UTC (permalink / raw)
To: ptxdist; +Cc: Ladislav Michl
Thanks, applied as c5ea24736ff513303c2bbb68123ab5bfa87c2065.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 15:31:18 +0100, Ladislav Michl <oss-lists@triops.cz> wrote:
> There is no longer an upstream-provided source tarball.
> Autoconf support was dropped and package uses meson.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <Y1xNq8fcQU5jXQvw@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libmbim.in b/rules/libmbim.in
> index 2f5e21f02dbf..01e222533580 100644
> --- a/rules/libmbim.in
> +++ b/rules/libmbim.in
> @@ -2,7 +2,7 @@
>
> config LIBMBIM
> tristate
> - select HOST_SYSTEM_PYTHON3
> + select HOST_MESON
> select GLIB
> select UDEV
> select LIBGUDEV
> diff --git a/rules/libmbim.make b/rules/libmbim.make
> index f2f8e5801e9a..095b16e3622e 100644
> --- a/rules/libmbim.make
> +++ b/rules/libmbim.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim
> #
> # Paths and names
> #
> -LIBMBIM_VERSION := 1.26.4
> -LIBMBIM_MD5 := 58dea20cad346f31d2873b68385a9973
> +LIBMBIM_VERSION := 1.28.0
> +LIBMBIM_MD5 := c3ffcb573b7de1a5509b2d222303f1ec
> LIBMBIM := libmbim-$(LIBMBIM_VERSION)
> -LIBMBIM_SUFFIX := tar.xz
> -LIBMBIM_URL := https://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
> +LIBMBIM_SUFFIX := tar.bz2
> +LIBMBIM_URL := https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
> LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
> LIBMBIM_DIR := $(BUILDDIR)/$(LIBMBIM)
> LIBMBIM_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
> @@ -27,22 +27,17 @@ LIBMBIM_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
> # Prepare
> # ----------------------------------------------------------------------------
>
> -LIBMBIM_CONF_ENV := \
> - $(CROSS_ENV) \
> - ac_cv_path_PYTHON=$(SYSTEMPYTHON3)
> #
> -# autoconf
> +# meson
> #
> -LIBMBIM_CONF_TOOL := autoconf
> +LIBMBIM_CONF_TOOL := meson
> LIBMBIM_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --disable-compile-warnings \
> - --disable-Werror \
> - --disable-gtk-doc \
> - --disable-gtk-doc-html \
> - --disable-gtk-doc-pdf \
> - --disable-introspection \
> - --with-udev-base-dir=/usr/lib/udev
> + $(CROSS_MESON_USR) \
> + -Dudevdir=/usr/lib/udev \
> + -Dintrospection=false \
> + -Dgtk_doc=false \
> + -Dman=false \
> + -Dbash_completion=false
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0
2022-10-28 21:45 [ptxdist] [PATCH 0/3] ModemManager update Ladislav Michl
2022-10-28 21:46 ` [ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0 Ladislav Michl
@ 2022-10-28 21:46 ` Ladislav Michl
2022-11-11 14:31 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-28 21:47 ` [ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0 Ladislav Michl
2 siblings, 1 reply; 7+ messages in thread
From: Ladislav Michl @ 2022-10-28 21:46 UTC (permalink / raw)
To: ptxdist
From: Ladislav Michl <ladis@linux-mips.org>
There is no longer an upstream-provided source tarball.
Autoconf support was dropped and package uses meson.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/libqmi.in | 2 +-
rules/libqmi.make | 40 +++++++++++++++++++---------------------
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/rules/libqmi.in b/rules/libqmi.in
index 9fe39036a..571bfa3a0 100644
--- a/rules/libqmi.in
+++ b/rules/libqmi.in
@@ -2,7 +2,7 @@
menuconfig LIBQMI
tristate
- select HOST_SYSTEM_PYTHON3
+ select HOST_MESON
select GLIB
select LIBMBIM if LIBQMI_MBIM_QMUX
prompt "libqmi "
diff --git a/rules/libqmi.make b/rules/libqmi.make
index 4607cf778..cfdfb65b1 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
#
# Paths and names
#
-LIBQMI_VERSION := 1.30.8
-LIBQMI_MD5 := 5ec8838914f80e1dfa4d2fa8cc2f186d
+LIBQMI_VERSION := 1.32.0
+LIBQMI_MD5 := c3a279461dc71ebc596c1cbae4bad19c
LIBQMI := libqmi-$(LIBQMI_VERSION)
-LIBQMI_SUFFIX := tar.xz
-LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
+LIBQMI_SUFFIX := tar.bz2
+LIBQMI_URL := https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)/$(LIBQMI).$(LIBQMI_SUFFIX)
LIBQMI_SOURCE := $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX)
LIBQMI_DIR := $(BUILDDIR)/$(LIBQMI)
LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -31,25 +31,23 @@ LIBQMI_LICENSE_FILES := \
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-LIBQMI_CONF_TOOL := autoconf
+LIBQMI_CONF_TOOL := meson
LIBQMI_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-compile-warnings \
- --disable-Werror \
- --disable-introspection \
- --enable-collection=full \
- --disable-firmware-update \
- --disable-mm-runtime-check \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-qmi-username \
- --$(call ptx/endis, PTXCONF_LIBQMI_MBIM_QMUX)-mbim-qmux \
- --disable-qrtr \
- --without-udev \
- --with-udev-base-dir=/usr/lib/udev
+ $(CROSS_MESON_USR) \
+ -Dfirmware_update=false \
+ -Dcollection=full \
+ -Dmbim_qmux=$(call ptx/truefalse, PTXCONF_LIBQMI_MBIM_QMUX) \
+ -Dmm_runtime_check=false \
+ -Dqrtr=false \
+ -Drmnet=false \
+ -Dudev=false \
+ -Dudevdir=/usr/lib/udev \
+ -Dintrospection=false \
+ -Dgtk_doc=false \
+ -Dman=false \
+ -Dbash_completion=false
# ----------------------------------------------------------------------------
# Target-Install
--
2.32.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [APPLIED] libqmi: version bump 1.30.8 -> 1.32.0
2022-10-28 21:46 ` [ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0 Ladislav Michl
@ 2022-11-11 14:31 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2022-11-11 14:31 UTC (permalink / raw)
To: ptxdist; +Cc: Ladislav Michl
Thanks, applied as 4e1125737bce586c01afe6bde411a1dcab9afe87.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 15:31:19 +0100, Ladislav Michl <oss-lists@triops.cz> wrote:
> There is no longer an upstream-provided source tarball.
> Autoconf support was dropped and package uses meson.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <Y1xNxCsVXzx6GAdL@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libqmi.in b/rules/libqmi.in
> index 9fe39036ab2a..571bfa3a0aa6 100644
> --- a/rules/libqmi.in
> +++ b/rules/libqmi.in
> @@ -2,7 +2,7 @@
>
> menuconfig LIBQMI
> tristate
> - select HOST_SYSTEM_PYTHON3
> + select HOST_MESON
> select GLIB
> select LIBMBIM if LIBQMI_MBIM_QMUX
> prompt "libqmi "
> diff --git a/rules/libqmi.make b/rules/libqmi.make
> index 4607cf7785a9..cfdfb65b189c 100644
> --- a/rules/libqmi.make
> +++ b/rules/libqmi.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
> #
> # Paths and names
> #
> -LIBQMI_VERSION := 1.30.8
> -LIBQMI_MD5 := 5ec8838914f80e1dfa4d2fa8cc2f186d
> +LIBQMI_VERSION := 1.32.0
> +LIBQMI_MD5 := c3a279461dc71ebc596c1cbae4bad19c
> LIBQMI := libqmi-$(LIBQMI_VERSION)
> -LIBQMI_SUFFIX := tar.xz
> -LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
> +LIBQMI_SUFFIX := tar.bz2
> +LIBQMI_URL := https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)/$(LIBQMI).$(LIBQMI_SUFFIX)
> LIBQMI_SOURCE := $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX)
> LIBQMI_DIR := $(BUILDDIR)/$(LIBQMI)
> LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
> @@ -31,25 +31,23 @@ LIBQMI_LICENSE_FILES := \
> # ----------------------------------------------------------------------------
>
> #
> -# autoconf
> +# meson
> #
> -LIBQMI_CONF_TOOL := autoconf
> +LIBQMI_CONF_TOOL := meson
> LIBQMI_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --disable-compile-warnings \
> - --disable-Werror \
> - --disable-introspection \
> - --enable-collection=full \
> - --disable-firmware-update \
> - --disable-mm-runtime-check \
> - --disable-gtk-doc \
> - --disable-gtk-doc-html \
> - --disable-gtk-doc-pdf \
> - --disable-qmi-username \
> - --$(call ptx/endis, PTXCONF_LIBQMI_MBIM_QMUX)-mbim-qmux \
> - --disable-qrtr \
> - --without-udev \
> - --with-udev-base-dir=/usr/lib/udev
> + $(CROSS_MESON_USR) \
> + -Dfirmware_update=false \
> + -Dcollection=full \
> + -Dmbim_qmux=$(call ptx/truefalse, PTXCONF_LIBQMI_MBIM_QMUX) \
> + -Dmm_runtime_check=false \
> + -Dqrtr=false \
> + -Drmnet=false \
> + -Dudev=false \
> + -Dudevdir=/usr/lib/udev \
> + -Dintrospection=false \
> + -Dgtk_doc=false \
> + -Dman=false \
> + -Dbash_completion=false
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0
2022-10-28 21:45 [ptxdist] [PATCH 0/3] ModemManager update Ladislav Michl
2022-10-28 21:46 ` [ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0 Ladislav Michl
2022-10-28 21:46 ` [ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0 Ladislav Michl
@ 2022-10-28 21:47 ` Ladislav Michl
2022-11-11 14:31 ` [ptxdist] [APPLIED] " Michael Olbrich
2 siblings, 1 reply; 7+ messages in thread
From: Ladislav Michl @ 2022-10-28 21:47 UTC (permalink / raw)
To: ptxdist
From: Ladislav Michl <ladis@linux-mips.org>
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>
---
rules/modemmanager.in | 3 ++-
rules/modemmanager.make | 60 +++++++++++++++++++----------------------
2 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/rules/modemmanager.in b/rules/modemmanager.in
index 5b8d03016..bac104699 100644
--- a/rules/modemmanager.in
+++ b/rules/modemmanager.in
@@ -2,7 +2,8 @@
menuconfig MODEMMANAGER
tristate
- select DBUS if MODEMMANAGER_ALLOW_DBUS_AT_CMDS && RUNTIME
+ select HOST_MESON
+ select DBUS
select GLIB
select UDEV
select LIBGUDEV
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
--
2.32.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [APPLIED] modemmanager: version bump 1.18.12 -> 1.20.0
2022-10-28 21:47 ` [ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0 Ladislav Michl
@ 2022-11-11 14:31 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2022-11-11 14:31 UTC (permalink / raw)
To: ptxdist; +Cc: Ladislav Michl
Thanks, applied as 624008063d1185a2fcf7e543c3050ead4c46073d.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 15:31:20 +0100, Ladislav Michl <oss-lists@triops.cz> wrote:
> 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>
>
> diff --git a/rules/modemmanager.in b/rules/modemmanager.in
> index 5b8d03016506..bac104699943 100644
> --- a/rules/modemmanager.in
> +++ b/rules/modemmanager.in
> @@ -2,7 +2,8 @@
>
> menuconfig MODEMMANAGER
> tristate
> - select DBUS if MODEMMANAGER_ALLOW_DBUS_AT_CMDS && RUNTIME
> + select HOST_MESON
> + select DBUS
> select GLIB
> select UDEV
> select LIBGUDEV
> diff --git a/rules/modemmanager.make b/rules/modemmanager.make
> index f942b5a65b6c..58427ff8a326 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
^ permalink raw reply [flat|nested] 7+ messages in thread