libks: bump to 2.0.2

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

diff --git a/libs/libks/Makefile b/libs/libks/Makefile
index 243f7a7af27c2d3b651048427784c30130c539f9..cf6a6cff17de4457155d1836abf1de7bb8672322 100644 (file)
--- 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 a128a8d17ce525f69bafa6d6010cac3f6e7e744d..c0739b406f0facd0decf2c052471dca2fab3da41 100644 (file)
--- 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 a496764f3cd0333078e8f93f5d207358f66ee093..f936e9d5309ed25848e65c5b557bc12f7f3d8558 100644 (file)
--- 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})