Merge pull request #826 from micmac1/fs-1.10.10

freeswitch: bump to 1.10.10

7 files changed, 47 insertions, 57 deletions

diff --git a/libs/libks/Makefile b/libs/libks/Makefile
index 243f7a7..cf6a6cf 100644
--- a/libs/libks/Makefile
+++ b/libs/libks/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libks
 
-PKG_VERSION:=1.8.2
+PKG_VERSION:=2.0.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=libks-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107
+PKG_HASH:=af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63
 
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
@@ -33,13 +33,13 @@ PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/$(PKG_NAME)
+define Package/libks
   SUBMENU:=Telephony
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Foundational support for SignalWire C products
   URL:=https://github.com/signalwire/libks
-  ABI_VERSION:=1
+  ABI_VERSION:=2
   DEPENDS:=+libatomic +libopenssl +libuuid
 endef
 
@@ -47,20 +47,20 @@ endef
 TARGET_CFLAGS += $(TARGET_CPPFLAGS)
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/*.h \
-		$(1)/usr/include/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)/usr/lib/{cmake/$(PKG_NAME),pkgconfig}
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/cmake/* \
-		$(1)/usr/lib/cmake/$(PKG_NAME)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME).so* $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc \
+	$(INSTALL_DIR) $(1)/usr/include/libks2/libks/cmake
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/*.h \
+		$(1)/usr/include/libks2/libks
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/cmake/* \
+		$(1)/usr/include/libks2/libks/cmake
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so* $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libks2.pc \
 		$(1)/usr/lib/pkgconfig
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/libks/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME).so.$(ABI_VERSION)* $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so.$(ABI_VERSION)* $(1)/usr/lib
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,libks))
diff --git a/libs/libks/patches/02-correct-signal_h-include.patch b/libs/libks/patches/02-correct-signal_h-include.patch
index a128a8d..c0739b4 100644
--- a/libs/libks/patches/02-correct-signal_h-include.patch
+++ b/libs/libks/patches/02-correct-signal_h-include.patch
@@ -1,6 +1,6 @@
 --- a/src/include/libks/ks_platform.h
 +++ b/src/include/libks/ks_platform.h
-@@ -91,7 +91,7 @@ KS_BEGIN_EXTERN_C
+@@ -93,7 +93,7 @@ KS_BEGIN_EXTERN_C
  #include <sys/time.h>
  #include <sys/select.h>
  #include <netinet/tcp.h>
diff --git a/libs/libks/patches/03-fix-flags.patch b/libs/libks/patches/03-fix-flags.patch
index a496764..f936e9d 100644
--- a/libs/libks/patches/03-fix-flags.patch
+++ b/libs/libks/patches/03-fix-flags.patch
@@ -4,9 +4,9 @@
  # Must include cotire before anything else for auto pch setup
  #include(cmake/cotire.cmake)
  
-+# Declare our project, libks
-+project(LibKS VERSION 1.8.2 LANGUAGES C CXX)
-+message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
++# Declare our project, libks2
++project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX)
++message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 +
  # Load our common utility api and setup the platfomrm and build
  include(cmake/ksutil.cmake)
@@ -15,9 +15,9 @@
  	endif()
  endif()
  
--# Declare our project, libks
--project(LibKS VERSION 1.8.2 LANGUAGES C CXX)
--message("LibKS Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+-# Declare our project, libks2
+-project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX)
+-message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 -
  # Set package version
  set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
diff --git a/libs/signalwire-client-c/Makefile b/libs/signalwire-client-c/Makefile
index d9ea0b8..debb119 100644
--- a/libs/signalwire-client-c/Makefile
+++ b/libs/signalwire-client-c/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=signalwire-client-c
 
-PKG_VERSION:=1.3.0
+PKG_VERSION:=2.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=signalwire-c-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=77bc7fbd8405283ef64ccbc22fba6687fc936ed76fafcc15e7e90290e2906884
+PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=7916ad76b2c2c75ff616d19bf044894771b3f8602b80a6f74d8ba26206faef79
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/signalwire-c-$(PKG_VERSION)
 
@@ -29,40 +29,41 @@ PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/$(PKG_NAME)
+define Package/signalwire-client-c
   SUBMENU:=Telephony
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=SignalWire C client library
   URL:=https://github.com/signalwire/signalwire-c
-  ABI_VERSION:=1
+  ABI_VERSION:=2
   DEPENDS:=+libatomic +libks +libopenssl
 endef
 
 # Otherwise OpenWrt's CPPFLAGS are ignored
 TARGET_CFLAGS += $(TARGET_CPPFLAGS)
 
-define Package/$(PKG_NAME)/install/headers
-	$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)/$(2)
+define Package/signalwire-client-c/install/headers
+	$(INSTALL_DIR) $(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)
 	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/$(2)/*.h \
-				$(1)/usr/include/$(PKG_NAME)/$(2)
+		$(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)/*.h \
+				$(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)
 endef
 
 define Build/InstallDev
-	$(foreach s,./ JSON blade signalwire transport,$(call Package/$(PKG_NAME)/install/headers,$(1),$(s));)
-	$(INSTALL_DIR) $(1)/usr/lib/{cmake/$(PKG_NAME),pkgconfig}
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/cmake/* \
-		$(1)/usr/lib/cmake/$(PKG_NAME)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client.so* $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/signalwire_client.pc \
+	$(foreach s,./ JSON blade signalwire transport,$(call Package/signalwire-client-c/install/headers,$(1),$(s));)
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig \
+		$(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/cmake/* \
+		$(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client2.so* $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/signalwire_client2.pc \
 		$(1)/usr/lib/pkgconfig
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/signalwire-client-c/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client.so.$(ABI_VERSION)* \
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client2.so.$(ABI_VERSION)* \
 								$(1)/usr/lib
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,signalwire-client-c))
diff --git a/libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch b/libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch
deleted file mode 100644
index c2a961f..0000000
--- a/libs/signalwire-client-c/patches/01-set-libks-cmake-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/FindLibKS.cmake
-+++ b/cmake/FindLibKS.cmake
-@@ -19,7 +19,7 @@ if (NOT TARGET ks)
- 	endif()
- 
- 	# From here we can bootstrap into cmake stuff
--	set(LIBKS_CMAKE_DIR ${LIBKS_INCLUDE_DIRS}/cmake)
-+	set(LIBKS_CMAKE_DIR ${LIBKS_LIBRARY_DIRS}/cmake/libks)
- 
- 	# Load ks utils for our build macros
- 	include(${LIBKS_CMAKE_DIR}/ksutil.cmake)
diff --git a/libs/sofia-sip/Makefile b/libs/sofia-sip/Makefile
index cf1f528..7e5e281 100644
--- a/libs/sofia-sip/Makefile
+++ b/libs/sofia-sip/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sofia-sip
 
-PKG_VERSION:=1.13.14
+PKG_VERSION:=1.13.16
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/freeswitch/$(PKG_NAME)/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=a517e31c6a406af3d7ec8cb0154e46ad12fbcb54dadfc3deada5d97bdbd9cc5a
+PKG_HASH:=125a9653bea1fc1cb275e4aec3445aa2deadf1fe3f1adffae9559d2349bfab36
 
 # sofia-sip adds a version to include path
 # need to update this when the version changes
diff --git a/libs/spandsp3/Makefile b/libs/spandsp3/Makefile
index c6b0696..fa04b2f 100644
--- a/libs/spandsp3/Makefile
+++ b/libs/spandsp3/Makefile
@@ -11,10 +11,10 @@ PKG_NAME:=spandsp3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git
-PKG_SOURCE_DATE=2023-02-06
-PKG_SOURCE_VERSION:=67d2455efe02e7ff0d897f3fd5636fed4d54549e
+PKG_SOURCE_DATE=2023-06-16
+PKG_SOURCE_VERSION:=0d2e6ac65e0e8f53d652665a743015a88bf048d4
 PKG_RELEASE:=1
-PKG_MIRROR_HASH:=2bb858566fae644fc18a60092ac0224500cb8117c9ed106d6a7cf825fab98459
+PKG_MIRROR_HASH:=2d25c0f73f15aab37af7f09cf84f379b3fafb7c4d4e867ed1643dd3b3f594920
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1