From e9d0303e368c6488850d2f7a5598a0d8380ba5b0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Nov 2025 21:45:11 +0100 Subject: [PATCH] package/belle-sip: remove package belle-sip was only needed as a dependency of linphone, as is anyway bundled in more recent versions of linphone, making a separate package unnecessary. Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ffa68244171fb16207f61953cfebdff9bb411d5d) Signed-off-by: Thomas Perale --- Config.in.legacy | 8 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/belle-sip/Config.in | 22 ------------------ package/belle-sip/belle-sip.hash | 3 --- package/belle-sip/belle-sip.mk | 40 -------------------------------- 6 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 package/belle-sip/Config.in delete mode 100644 package/belle-sip/belle-sip.hash delete mode 100644 package/belle-sip/belle-sip.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3c89cd9a67..8c0bbbe8de 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2025.02.9" +config BR2_PACKAGE_BELLE_SIP + bool "belle-sip has been removed" + select BR2_LEGACY + help + This package has been removed as part of the linphone + removal. In addition, newer version of linphone directly + bundle belle-sip making a separate package unnecessary. + config BR2_PACKAGE_LINPHONE bool "linphone has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7bbd190b4c..584a3b7dbe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -999,7 +999,6 @@ F: package/openzwave/ N: Fabrice Fontaine F: package/bearssl/ -F: package/belle-sip/ F: package/belr/ F: package/boinc/ F: package/cairo/ diff --git a/package/Config.in b/package/Config.in index b630abc95c..6ce7122cfb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1993,7 +1993,6 @@ menu "Networking" source "package/azmq/Config.in" source "package/azure-iot-sdk-c/Config.in" source "package/batman-adv/Config.in" - source "package/belle-sip/Config.in" source "package/bluez5_utils-headers/Config.in" source "package/c-ares/Config.in" source "package/cni-plugins/Config.in" diff --git a/package/belle-sip/Config.in b/package/belle-sip/Config.in deleted file mode 100644 index 8e4de366e4..0000000000 --- a/package/belle-sip/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_BELLE_SIP - bool "belle-sip" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox - depends on BR2_USE_WCHAR - select BR2_PACKAGE_BCTOOLBOX - # needs crypto support in bctoolbox - select BR2_PACKAGE_MBEDTLS - help - Belle-sip is a modern library implementing SIP (RFC 3261) - transport, transaction and dialog layers. - - http://www.linphone.org/technical-corner/belle-sip - -comment "belle-sip needs a toolchain w/ threads, C++, dynamic library, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -comment "belle-sip needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/belle-sip/belle-sip.hash b/package/belle-sip/belle-sip.hash deleted file mode 100644 index 670ce0062e..0000000000 --- a/package/belle-sip/belle-sip.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 eabba615c97080572c1b9d3c76f8f9cf6a7432eedf37482672e5fa178a688f72 belle-sip-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/belle-sip/belle-sip.mk b/package/belle-sip/belle-sip.mk deleted file mode 100644 index b4de3612ce..0000000000 --- a/package/belle-sip/belle-sip.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# belle-sip -# -################################################################################ - -BELLE_SIP_VERSION = 4.4.8 -BELLE_SIP_SITE = \ - https://gitlab.linphone.org/BC/public/belle-sip/-/archive/$(BELLE_SIP_VERSION) -BELLE_SIP_LICENSE = GPL-3.0+ -BELLE_SIP_LICENSE_FILES = LICENSE.txt -BELLE_SIP_CPE_ID_VENDOR = linphone -BELLE_SIP_INSTALL_STAGING = YES -BELLE_SIP_DEPENDENCIES = \ - bctoolbox \ - $(if $(BR2_PACKAGE_ZLIB),zlib) -BELLE_SIP_CONF_OPTS = \ - -DENABLE_STRICT=OFF \ - -DENABLE_TESTS=OFF - -ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) -BELLE_SIP_CONF_OPTS += -DENABLE_MDNS=ON -BELLE_SIP_DEPENDENCIES += avahi -else -BELLE_SIP_CONF_OPTS += -DENABLE_MDNS=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_LIBS),y) -BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -endif - -BELLE_SIP_CFLAGS = $(TARGET_CFLAGS) - -BELLE_SIP_CONF_OPTS += -DCMAKE_C_FLAGS="$(BELLE_SIP_CFLAGS)" - -$(eval $(cmake-package))