signalwire-client-c: bump to 2.0.0

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

2 files changed, 19 insertions, 29 deletions

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)