diff mbox series

package/libqmi: bump to version 1.30.0

Message ID 20210806080117.14544-1-yegorslists@googlemail.com
State Superseded
Headers show
Series package/libqmi: bump to version 1.30.0 | expand

Commit Message

Voss, Samuel M Collins via buildroot Aug. 6, 2021, 8:01 a.m. UTC 
From: Yegor Yefremov <yegorslists@googlemail.com>

This release introduces meson build system support that fixes
gobject-intorspection issue with autotools.

As meson files are only available in git, switch the location to
https://gitlab.freedesktop.org.

Add support for bash-completion.

Fixes:
http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/libqmi/libqmi.hash |  2 +-
 package/libqmi/libqmi.mk   | 36 ++++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

Comments

Aleksander Morgado Aug. 6, 2021, 8:08 a.m. UTC | #1 
On Fri, Aug 6, 2021 at 10:01 AM <yegorslists@googlemail.com> wrote:
>
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> This release introduces meson build system support that fixes
> gobject-intorspection issue with autotools.
>
> As meson files are only available in git, switch the location to
> https://gitlab.freedesktop.org.
>
> Add support for bash-completion.
>
> Fixes:
> http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

Acked-by: Aleksander Morgado <aleksander@aleksander.es>

> ---
>  package/libqmi/libqmi.hash |  2 +-
>  package/libqmi/libqmi.mk   | 36 ++++++++++++++++++++----------------
>  2 files changed, 21 insertions(+), 17 deletions(-)
>
> diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash
> index 0bfc63f4a4..0373bb4e75 100644
> --- a/package/libqmi/libqmi.hash
> +++ b/package/libqmi/libqmi.hash
> @@ -1,4 +1,4 @@
>  # Locally computed:
>  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
>  sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
> -sha256  cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd  libqmi-1.28.6.tar.xz
> +sha256  c0421684c12697c448077dd5c0a66c6f745deab3558af578e3f10307c8a0c564  libqmi-1.30.0.tar.gz
> diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
> index 7b1d76a0c1..05fd3ae9af 100644
> --- a/package/libqmi/libqmi.mk
> +++ b/package/libqmi/libqmi.mk
> @@ -4,9 +4,8 @@
>  #
>  ################################################################################
>
> -LIBQMI_VERSION = 1.28.6
> -LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
> -LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
> +LIBQMI_VERSION = 1.30.0
> +LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)
>  LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
>  LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
>  LIBQMI_CPE_ID_VENDOR = libqmi_project
> @@ -14,47 +13,52 @@ LIBQMI_INSTALL_STAGING = YES
>
>  LIBQMI_DEPENDENCIES = libglib2
>
> -LIBQMI_CONF_OPTS = --disable-Werror
> -
>  ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
>  LIBQMI_DEPENDENCIES += gobject-introspection
> -LIBQMI_CONF_OPTS += --enable-introspection
> +LIBQMI_CONF_OPTS += -Dintrospection=true
>  else
> -LIBQMI_CONF_OPTS += --disable-introspection
> +LIBQMI_CONF_OPTS += -Dintrospection=false
>  endif
>
>  # if libgudev available, request udev support for a better
>  # qmi-firmware-update experience
>  ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
>  LIBQMI_DEPENDENCIES += libgudev
> -LIBQMI_CONF_OPTS += --with-udev
> +LIBQMI_CONF_OPTS += -Dudev=true
>  else
> -LIBQMI_CONF_OPTS += --without-udev
> +LIBQMI_CONF_OPTS += -Dudev=false
>  endif
>
>  # if libmbim available, request QMI-over-MBIM support
>  ifeq ($(BR2_PACKAGE_LIBMBIM),y)
>  LIBQMI_DEPENDENCIES += libmbim
> -LIBQMI_CONF_OPTS += --enable-mbim-qmux
> +LIBQMI_CONF_OPTS += -Dmbim_qmux=true
>  else
> -LIBQMI_CONF_OPTS += --disable-mbim-qmux
> +LIBQMI_CONF_OPTS += -Dmbim_qmux=false
>  endif
>
>  # if libqrtr-glib available, enable support for QMI over QRTR
>  ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y)
>  LIBQMI_DEPENDENCIES += libqrtr-glib
> -LIBQMI_CONF_OPTS += --enable-qrtr
> +LIBQMI_CONF_OPTS += -Dqrtr=true
>  else
> -LIBQMI_CONF_OPTS += --disable-qrtr
> +LIBQMI_CONF_OPTS += -Dqrtr=false
>  endif
>
>  # if ModemManager available, enable MM runtime check in
>  # qmi-firmware-update (note that we don't need to build-depend on
>  # anything else)
>  ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y)
> -LIBQMI_CONF_OPTS += --enable-mm-runtime-check
> +LIBQMI_CONF_OPTS += -Dmm_runtime_check=true
> +else
> +LIBQMI_CONF_OPTS += -Dmm_runtime_check=false
> +endif
> +
> +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
> +LIBQMI_DEPENDENCIES += bash-completion
> +LIBQMI_CONF_OPTS += -Dbash_completion=true
>  else
> -LIBQMI_CONF_OPTS += --disable-mm-runtime-check
> +LIBQMI_CONF_OPTS += -Dbash_completion=false
>  endif
>
> -$(eval $(autotools-package))
> +$(eval $(meson-package))
> --
> 2.17.0
>
Aleksander Morgado Aug. 6, 2021, 8:39 a.m. UTC | #2 
> > This release introduces meson build system support that fixes
> > gobject-intorspection issue with autotools.
> >
> > As meson files are only available in git, switch the location to
> > https://gitlab.freedesktop.org.
> >
> > Add support for bash-completion.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a
> >
> > Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>
> Acked-by: Aleksander Morgado <aleksander@aleksander.es>
>

Wait, the -Dintrospection=false option is broken with meson :/
Working on a patch here, you may need to explicitly include it, sorry...
https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/merge_requests/278


> > ---
> >  package/libqmi/libqmi.hash |  2 +-
> >  package/libqmi/libqmi.mk   | 36 ++++++++++++++++++++----------------
> >  2 files changed, 21 insertions(+), 17 deletions(-)
> >
> > diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash
> > index 0bfc63f4a4..0373bb4e75 100644
> > --- a/package/libqmi/libqmi.hash
> > +++ b/package/libqmi/libqmi.hash
> > @@ -1,4 +1,4 @@
> >  # Locally computed:
> >  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
> >  sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
> > -sha256  cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd  libqmi-1.28.6.tar.xz
> > +sha256  c0421684c12697c448077dd5c0a66c6f745deab3558af578e3f10307c8a0c564  libqmi-1.30.0.tar.gz
> > diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
> > index 7b1d76a0c1..05fd3ae9af 100644
> > --- a/package/libqmi/libqmi.mk
> > +++ b/package/libqmi/libqmi.mk
> > @@ -4,9 +4,8 @@
> >  #
> >  ################################################################################
> >
> > -LIBQMI_VERSION = 1.28.6
> > -LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
> > -LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
> > +LIBQMI_VERSION = 1.30.0
> > +LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)
> >  LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
> >  LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
> >  LIBQMI_CPE_ID_VENDOR = libqmi_project
> > @@ -14,47 +13,52 @@ LIBQMI_INSTALL_STAGING = YES
> >
> >  LIBQMI_DEPENDENCIES = libglib2
> >
> > -LIBQMI_CONF_OPTS = --disable-Werror
> > -
> >  ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
> >  LIBQMI_DEPENDENCIES += gobject-introspection
> > -LIBQMI_CONF_OPTS += --enable-introspection
> > +LIBQMI_CONF_OPTS += -Dintrospection=true
> >  else
> > -LIBQMI_CONF_OPTS += --disable-introspection
> > +LIBQMI_CONF_OPTS += -Dintrospection=false
> >  endif
> >
> >  # if libgudev available, request udev support for a better
> >  # qmi-firmware-update experience
> >  ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
> >  LIBQMI_DEPENDENCIES += libgudev
> > -LIBQMI_CONF_OPTS += --with-udev
> > +LIBQMI_CONF_OPTS += -Dudev=true
> >  else
> > -LIBQMI_CONF_OPTS += --without-udev
> > +LIBQMI_CONF_OPTS += -Dudev=false
> >  endif
> >
> >  # if libmbim available, request QMI-over-MBIM support
> >  ifeq ($(BR2_PACKAGE_LIBMBIM),y)
> >  LIBQMI_DEPENDENCIES += libmbim
> > -LIBQMI_CONF_OPTS += --enable-mbim-qmux
> > +LIBQMI_CONF_OPTS += -Dmbim_qmux=true
> >  else
> > -LIBQMI_CONF_OPTS += --disable-mbim-qmux
> > +LIBQMI_CONF_OPTS += -Dmbim_qmux=false
> >  endif
> >
> >  # if libqrtr-glib available, enable support for QMI over QRTR
> >  ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y)
> >  LIBQMI_DEPENDENCIES += libqrtr-glib
> > -LIBQMI_CONF_OPTS += --enable-qrtr
> > +LIBQMI_CONF_OPTS += -Dqrtr=true
> >  else
> > -LIBQMI_CONF_OPTS += --disable-qrtr
> > +LIBQMI_CONF_OPTS += -Dqrtr=false
> >  endif
> >
> >  # if ModemManager available, enable MM runtime check in
> >  # qmi-firmware-update (note that we don't need to build-depend on
> >  # anything else)
> >  ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y)
> > -LIBQMI_CONF_OPTS += --enable-mm-runtime-check
> > +LIBQMI_CONF_OPTS += -Dmm_runtime_check=true
> > +else
> > +LIBQMI_CONF_OPTS += -Dmm_runtime_check=false
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
> > +LIBQMI_DEPENDENCIES += bash-completion
> > +LIBQMI_CONF_OPTS += -Dbash_completion=true
> >  else
> > -LIBQMI_CONF_OPTS += --disable-mm-runtime-check
> > +LIBQMI_CONF_OPTS += -Dbash_completion=false
> >  endif
> >
> > -$(eval $(autotools-package))
> > +$(eval $(meson-package))
> > --
> > 2.17.0
> >
>
>
> --
> Aleksander
> https://aleksander.es
diff mbox series

Patch

diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash
index 0bfc63f4a4..0373bb4e75 100644
--- a/package/libqmi/libqmi.hash
+++ b/package/libqmi/libqmi.hash
@@ -1,4 +1,4 @@ 
 # Locally computed:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
-sha256  cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd  libqmi-1.28.6.tar.xz
+sha256  c0421684c12697c448077dd5c0a66c6f745deab3558af578e3f10307c8a0c564  libqmi-1.30.0.tar.gz
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
index 7b1d76a0c1..05fd3ae9af 100644
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -4,9 +4,8 @@ 
 #
 ################################################################################
 
-LIBQMI_VERSION = 1.28.6
-LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
-LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
+LIBQMI_VERSION = 1.30.0
+LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)
 LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
 LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
 LIBQMI_CPE_ID_VENDOR = libqmi_project
@@ -14,47 +13,52 @@  LIBQMI_INSTALL_STAGING = YES
 
 LIBQMI_DEPENDENCIES = libglib2
 
-LIBQMI_CONF_OPTS = --disable-Werror
-
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
 LIBQMI_DEPENDENCIES += gobject-introspection
-LIBQMI_CONF_OPTS += --enable-introspection
+LIBQMI_CONF_OPTS += -Dintrospection=true
 else
-LIBQMI_CONF_OPTS += --disable-introspection
+LIBQMI_CONF_OPTS += -Dintrospection=false
 endif
 
 # if libgudev available, request udev support for a better
 # qmi-firmware-update experience
 ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
 LIBQMI_DEPENDENCIES += libgudev
-LIBQMI_CONF_OPTS += --with-udev
+LIBQMI_CONF_OPTS += -Dudev=true
 else
-LIBQMI_CONF_OPTS += --without-udev
+LIBQMI_CONF_OPTS += -Dudev=false
 endif
 
 # if libmbim available, request QMI-over-MBIM support
 ifeq ($(BR2_PACKAGE_LIBMBIM),y)
 LIBQMI_DEPENDENCIES += libmbim
-LIBQMI_CONF_OPTS += --enable-mbim-qmux
+LIBQMI_CONF_OPTS += -Dmbim_qmux=true
 else
-LIBQMI_CONF_OPTS += --disable-mbim-qmux
+LIBQMI_CONF_OPTS += -Dmbim_qmux=false
 endif
 
 # if libqrtr-glib available, enable support for QMI over QRTR
 ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y)
 LIBQMI_DEPENDENCIES += libqrtr-glib
-LIBQMI_CONF_OPTS += --enable-qrtr
+LIBQMI_CONF_OPTS += -Dqrtr=true
 else
-LIBQMI_CONF_OPTS += --disable-qrtr
+LIBQMI_CONF_OPTS += -Dqrtr=false
 endif
 
 # if ModemManager available, enable MM runtime check in
 # qmi-firmware-update (note that we don't need to build-depend on
 # anything else)
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y)
-LIBQMI_CONF_OPTS += --enable-mm-runtime-check
+LIBQMI_CONF_OPTS += -Dmm_runtime_check=true
+else
+LIBQMI_CONF_OPTS += -Dmm_runtime_check=false
+endif
+
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+LIBQMI_DEPENDENCIES += bash-completion
+LIBQMI_CONF_OPTS += -Dbash_completion=true
 else
-LIBQMI_CONF_OPTS += --disable-mm-runtime-check
+LIBQMI_CONF_OPTS += -Dbash_completion=false
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))