* [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0
@ 2021-08-25 9:02 yegorslists--- via buildroot
2021-08-25 22:29 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: yegorslists--- via buildroot @ 2021-08-25 9:02 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Matt Weber, Aleksander Morgado
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.
Add an upstream patch fixing the compilation without gobject-intorspection.
Fixes:
http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Aleksander Morgado <aleksander@aleksander.es>
---
Changes v1 -> v2:
- add a patch fixing the compilation without gobject-intorspection (Aleksander Morgado)
Changes v2 -> v3:
- rebase against next branch (Thomas Petazzoni)
...build-meson-fix-introspection-option.patch | 33 +++++++++++++++++
package/libqmi/libqmi.hash | 2 +-
package/libqmi/libqmi.mk | 37 ++++++++++++-------
3 files changed, 58 insertions(+), 14 deletions(-)
create mode 100644 package/libqmi/0001-build-meson-fix-introspection-option.patch
diff --git a/package/libqmi/0001-build-meson-fix-introspection-option.patch b/package/libqmi/0001-build-meson-fix-introspection-option.patch
new file mode 100644
index 0000000000..0528868025
--- /dev/null
+++ b/package/libqmi/0001-build-meson-fix-introspection-option.patch
@@ -0,0 +1,33 @@
+From bfb066419f288764edbade1e27e93a5dda59a5f4 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@aleksander.es>
+Date: Fri, 6 Aug 2021 10:32:22 +0200
+Subject: [PATCH] build,meson: fix introspection option
+
+Using -Dintrospection=false would actually not disable it. There is no
+longer an "auto" option for the introspection support, it will be
+either enabled or disabled depending on what the user asks
+for (default enabled).
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index b25bca57..d28e5601 100644
+--- a/meson.build
++++ b/meson.build
+@@ -218,7 +218,10 @@ version_conf.set10('QMI_QRTR_SUPPORTED', enable_qrtr)
+ version_conf.set10('QMI_RMNET_SUPPORTED', enable_rmnet)
+
+ # introspection support
+-enable_gir = dependency('gobject-introspection-1.0', version: '>= 0.9.6', required: get_option('introspection')).found()
++enable_gir = get_option('introspection')
++if enable_gir
++ dependency('gobject-introspection-1.0', version: '>= 0.9.6')
++endif
+
+ random_number = qmi_minor_version + meson.version().split('.').get(1).to_int()
+
+--
+2.17.0
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 35a41e5bd0..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,40 +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 += -Dintrospection=true
+else
+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
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0
2021-08-25 9:02 [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0 yegorslists--- via buildroot
@ 2021-08-25 22:29 ` Thomas Petazzoni
2021-08-26 4:01 ` Yegor Yefremov
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2021-08-25 22:29 UTC (permalink / raw)
To: yegorslists--- via buildroot
Cc: Eric Le Bihan, buildroot, Matt Weber, Aleksander Morgado
On Wed, 25 Aug 2021 11:02:43 +0200
yegorslists--- via buildroot <buildroot@busybox.net> 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.
>
> Add an upstream patch fixing the compilation without gobject-intorspection.
>
> Fixes:
> http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a
Are you sure it is still fixing this issue ? I already made the same
comment on v2, pointing other commits that fixed gobject-introspection
issues.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0
@ 2021-08-26 4:01 ` Yegor Yefremov
0 siblings, 0 replies; 5+ messages in thread
From: Yegor Yefremov via buildroot @ 2021-08-26 4:01 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: yegorslists--- via buildroot, Eric Le Bihan, Matt Weber,
Aleksander Morgado, buildroot
Hi Thomas,
On Thu, Aug 26, 2021 at 12:29 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Wed, 25 Aug 2021 11:02:43 +0200
> yegorslists--- via buildroot <buildroot@busybox.net> 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.
> >
> > Add an upstream patch fixing the compilation without gobject-intorspection.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a
>
> Are you sure it is still fixing this issue ? I already made the same
> comment on v2, pointing other commits that fixed gobject-introspection
> issues.
OK. I'll remove this comment. Though in the context of the next
branch, it really fixes the compilation issue. The general fix is only
in the master branch. libqrtr-glib still fails in the next branch.
Best regards,
Yegor
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0
@ 2021-08-26 4:01 ` Yegor Yefremov
0 siblings, 0 replies; 5+ messages in thread
From: Yegor Yefremov @ 2021-08-26 4:01 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: yegorslists--- via buildroot, Eric Le Bihan, Matt Weber,
Aleksander Morgado, buildroot
Hi Thomas,
On Thu, Aug 26, 2021 at 12:29 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Wed, 25 Aug 2021 11:02:43 +0200
> yegorslists--- via buildroot <buildroot@busybox.net> 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.
> >
> > Add an upstream patch fixing the compilation without gobject-intorspection.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/c13877a5700445253900e312bc87904152be429a
>
> Are you sure it is still fixing this issue ? I already made the same
> comment on v2, pointing other commits that fixed gobject-introspection
> issues.
OK. I'll remove this comment. Though in the context of the next
branch, it really fixes the compilation issue. The general fix is only
in the master branch. libqrtr-glib still fails in the next branch.
Best regards,
Yegor
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0
2021-08-26 4:01 ` Yegor Yefremov
(?)
@ 2021-08-26 12:43 ` Thomas Petazzoni
-1 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2021-08-26 12:43 UTC (permalink / raw)
To: Yegor Yefremov; +Cc: Eric Le Bihan, Matt Weber, Aleksander Morgado, buildroot
Hello Yegor,
On Thu, 26 Aug 2021 06:01:07 +0200
Yegor Yefremov <yegorslists@googlemail.com> wrote:
> > Are you sure it is still fixing this issue ? I already made the same
> > comment on v2, pointing other commits that fixed gobject-introspection
> > issues.
>
> OK. I'll remove this comment. Though in the context of the next
> branch, it really fixes the compilation issue. The general fix is only
> in the master branch. libqrtr-glib still fails in the next branch.
Everything that is in the master branch will appear in the next branch,
either when if we merge master into next, or when 2021.08 is released
and we merge next back into master, and kill the next branch.
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-26 12:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-25 9:02 [Buildroot] [PATCH v3] package/libqmi: bump to version 1.30.0 yegorslists--- via buildroot
2021-08-25 22:29 ` Thomas Petazzoni
2021-08-26 4:01 ` Yegor Yefremov via buildroot
2021-08-26 4:01 ` Yegor Yefremov
2021-08-26 12:43 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.