From bb1c7bc80d14fd5e9bb977a39f14fda2f482e24a Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:48:30 +0800 Subject: [PATCH] libmbim: sync upstream (#478) * libmbim: bump to 1.26.0 Signed-off-by: Nicholas Smith * libmbim: switch to autorelease Signed-off-by: Nicholas Smith * libmbim: bump to 1.26.2 Signed-off-by: Kuan-Yi Li * libmbim: remove unknown configure option The configure option --enable-more-warnings and --without-udev are not recognized by configure. Buildlog: configure: WARNING: unrecognized options: --disable-nls, --enable-more-warnings, --without-udev Therefore this unkown configure options are removed with this commit. Signed-off-by: Florian Eckert * libmbim: switch to meson build tools Using https://gitlab.freedesktop.org/mobile-broadband/libmbim.git to download the source code. Enabled lto and additional gcc flags for perfomance and less size. Modified to use meson as upstream has abandoned autotools. Removed BUILD_PARALLEL options. These are default with ninja/meson. Signed-off-by: Maxim Anisimov * libmbim: bump to 1.26.4 Signed-off-by: Aleksander Morgado Co-authored-by: Nicholas Smith Co-authored-by: Kuan-Yi Li Co-authored-by: Florian Eckert Co-authored-by: Maxim Anisimov Co-authored-by: Aleksander Morgado --- libs/libmbim/Makefile | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/libs/libmbim/Makefile b/libs/libmbim/Makefile index 3d6ffff9..80cf70e2 100644 --- a/libs/libmbim/Makefile +++ b/libs/libmbim/Makefile @@ -8,28 +8,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmbim -PKG_VERSION:=1.24.8 -PKG_RELEASE:=1 +PKG_SOURCE_VERSION:=1.26.4 +PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://www.freedesktop.org/software/libmbim -PKG_HASH:=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git +PKG_MIRROR_HASH:=4963f9135f8ad26165d969d0b2028b00d68243201113c94a2ebe22c4227058a4 -PKG_MAINTAINER:=Nicholas Smith +PKG_MAINTAINER:=Nicholas Smith PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include $(INCLUDE_DIR)/meson.mk -CONFIGURE_ARGS += \ - --disable-static \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-silent-rules \ - --enable-more-warnings=yes +TARGET_CFLAGS += -ffunction-sections -fdata-sections -fno-merge-all-constants -fmerge-constants +TARGET_LDFLAGS += -Wl,--gc-sections + +MESON_ARGS += \ + -Dintrospection=false \ + -Dman=false \ + -Dbash_completion=false \ + -Db_lto=true define Package/libmbim SECTION:=libs @@ -56,10 +57,6 @@ define Package/mbim-utils LICENSE_FILES:=COPYING endef -CONFIGURE_ARGS += \ - --without-udev \ - --without-udev-base-dir - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) \ @@ -78,11 +75,15 @@ define Build/InstallDev endef define Package/libmbim/install - $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/libexec + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libmbim*.so.* \ $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mbim-proxy $(1)/usr/lib/ + + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/mbim-proxy $(1)/usr/libexec/ endef define Package/mbim-utils/install