From 98935b67fecdf653a75ebe569e6e873261580f56 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sat, 13 May 2023 18:31:58 +0300 Subject: [PATCH] Fix compile uqmi and cosmetic changes baresip --- general/package/baresip-openipc/Config.in | 21 ++++++------ general/package/libre-openipc/Config.in | 13 ++++---- .../package/libre-openipc/libre-openipc.mk | 30 ++++++++--------- general/package/librem-openipc/Config.in | 14 ++++---- .../package/librem-openipc/librem-openipc.mk | 32 +++++++++---------- general/package/uqmi-openipc/Config.in | 2 ++ general/package/uqmi-openipc/uqmi.mk | 10 +++--- 7 files changed, 62 insertions(+), 60 deletions(-) diff --git a/general/package/baresip-openipc/Config.in b/general/package/baresip-openipc/Config.in index 7d2fa947..6a4f43cd 100644 --- a/general/package/baresip-openipc/Config.in +++ b/general/package/baresip-openipc/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_BARESIP_OPENIPC - bool "baresip-openipc" - select BR2_PACKAGE_LIBRE_OPENIPC - select BR2_PACKAGE_LIBREM_OPENIPC - default n - help - Baresip is a portable and modular SIP User-Agent with audio - and video support. Copyright (c) 2010 - 2022 Alfred E. Heggestad - and Contributors Distributed under BSD license. - - https://github.com/baresip/baresip + bool "baresip-openipc" + default n + depends on BR2_PACKAGE_LIBRE_OPENIPC + depends on BR2_PACKAGE_LIBREM_OPENIPC + select BR2_PACKAGE_LIBRE_OPENIPC + select BR2_PACKAGE_LIBREM_OPENIPC + help + Baresip is a portable and modular SIP User-Agent with audio + and video support. Copyright (c) 2010 - 2022 Alfred E. Heggestad + and Contributors Distributed under BSD license. + https://github.com/baresip/baresip diff --git a/general/package/libre-openipc/Config.in b/general/package/libre-openipc/Config.in index 16da442f..2eada33a 100644 --- a/general/package/libre-openipc/Config.in +++ b/general/package/libre-openipc/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_LIBRE_OPENIPC - bool "libre-openipc" - default n - help - libre is a Generic library for real-time communications - with async IO support. - - https://github.com/baresip/re + bool "libre-openipc" + default n + help + libre is a Generic library for real-time communications + with async IO support. + https://github.com/baresip/re diff --git a/general/package/libre-openipc/libre-openipc.mk b/general/package/libre-openipc/libre-openipc.mk index 6d249ce1..6d2c015b 100644 --- a/general/package/libre-openipc/libre-openipc.mk +++ b/general/package/libre-openipc/libre-openipc.mk @@ -18,20 +18,20 @@ endif define LIBRE_OPENIPC_BUILD_CMDS $(TARGET_MAKE_ENV) \ - $(MAKE) -C $(@D) \ - LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ - LIBRE_INC=$(STAGING_DIR)/usr/include/re \ - LIBRE_SO=$(STAGING_DIR)/usr/lib \ - CC="$(TARGET_CC)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - EXTRA_LFLAGS="-lm" \ - DESTDIR="$(STAGING_DIR)" \ - SYSROOT="$(STAGING_DIR)/usr" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" \ - RELEASE=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - OS=linux \ - all install + $(MAKE) -C $(@D) \ + LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ + LIBRE_INC=$(STAGING_DIR)/usr/include/re \ + LIBRE_SO=$(STAGING_DIR)/usr/lib \ + CC="$(TARGET_CC)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + EXTRA_LFLAGS="-lm" \ + DESTDIR="$(STAGING_DIR)" \ + SYSROOT="$(STAGING_DIR)/usr" \ + SYSROOT_ALT="$(STAGING_DIR)/usr" \ + RELEASE=1 \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + OS=linux \ + all install endef @@ -50,4 +50,4 @@ define LIBRE_OPENIPC_UNINSTALL_TARGET_CMDS endef $(eval $(generic-package)) -$(eval $(host-generic-package)) \ No newline at end of file +$(eval $(host-generic-package)) diff --git a/general/package/librem-openipc/Config.in b/general/package/librem-openipc/Config.in index 17d1b147..c804ca99 100644 --- a/general/package/librem-openipc/Config.in +++ b/general/package/librem-openipc/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_LIBREM_OPENIPC - bool "librem-openipc" - select BR2_PACKAGE_LIBRE_OPENIPC - default n - help - librem is a Audio and video processing media library. - - https://github.com/baresip/rem + bool "librem-openipc" + default n + depends on BR2_PACKAGE_LIBRE_OPENIPC + select BR2_PACKAGE_LIBRE_OPENIPC + help + librem is a Audio and video processing media library. + https://github.com/baresip/rem diff --git a/general/package/librem-openipc/librem-openipc.mk b/general/package/librem-openipc/librem-openipc.mk index 377bbda0..5611d220 100644 --- a/general/package/librem-openipc/librem-openipc.mk +++ b/general/package/librem-openipc/librem-openipc.mk @@ -15,21 +15,21 @@ endif define LIBREM_OPENIPC_BUILD_CMDS $(TARGET_MAKE_ENV) \ - $(MAKE) -C $(@D) \ - LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ - LIBRE_INC=$(STAGING_DIR)/usr/include/re \ - LIBRE_SO=$(STAGING_DIR)/usr/lib \ - HAVE_LIBRESOLV= \ - CC="$(TARGET_CC)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - EXTRA_LFLAGS="-lm" \ - DESTDIR="$(STAGING_DIR)" \ - SYSROOT="$(STAGING_DIR)/usr" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" \ - RELEASE=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - OS=linux \ - all install + $(MAKE) -C $(@D) \ + LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ + LIBRE_INC=$(STAGING_DIR)/usr/include/re \ + LIBRE_SO=$(STAGING_DIR)/usr/lib \ + HAVE_LIBRESOLV= \ + CC="$(TARGET_CC)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + EXTRA_LFLAGS="-lm" \ + DESTDIR="$(STAGING_DIR)" \ + SYSROOT="$(STAGING_DIR)/usr" \ + SYSROOT_ALT="$(STAGING_DIR)/usr" \ + RELEASE=1 \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + OS=linux \ + all install endef define LIBREM_OPENIPC_INSTALL_TARGET_CMDS @@ -47,4 +47,4 @@ define LIBREM_OPENIPC_UNINSTALL_TARGET_CMDS endef $(eval $(generic-package)) -#$(eval $(host-generic-package)) \ No newline at end of file +#$(eval $(host-generic-package)) diff --git a/general/package/uqmi-openipc/Config.in b/general/package/uqmi-openipc/Config.in index 9ae58078..b09356a0 100644 --- a/general/package/uqmi-openipc/Config.in +++ b/general/package/uqmi-openipc/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_UQMI_OPENIPC bool "uqmi-openipc" + select BR2_PACKAGE_JSON_C_OPENIPC + select BR2_PACKAGE_LIBUBOX help This command line tool originates from the OpenWrt project to configure LTE modem in QMI mode for WAN connection. diff --git a/general/package/uqmi-openipc/uqmi.mk b/general/package/uqmi-openipc/uqmi.mk index a17b20cf..6a5f4ce6 100644 --- a/general/package/uqmi-openipc/uqmi.mk +++ b/general/package/uqmi-openipc/uqmi.mk @@ -4,10 +4,10 @@ # ################################################################################ -UQMI_VERSION = f254fc59c710d781eca3ec36e0bff2d8970370fa -UQMI_SITE = git://git.openwrt.org/project/uqmi.git -UQMI_DEPENDENCIES = json-c-openipc libubox -UQMI_LICENSE = LGPL-2.0+ -UQMI_LICENSE_FILES = COPYING +UQMI_OPENIPC_VERSION = f254fc59c710d781eca3ec36e0bff2d8970370fa +UQMI_OPENIPC_SITE = git://git.openwrt.org/project/uqmi.git +UQMI_OPENIPC_DEPENDENCIES = json-c-openipc libubox +UQMI_OPENIPC_LICENSE = LGPL-2.0+ +UQMI_OPENIPC_LICENSE_FILES = COPYING $(eval $(cmake-package))