re: bump to 2.0.1

- bump to version 2.0.1
- change to use AUTORELEASE
- add ABI_VERSION
- refresh patches

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

diff --git a/libs/re/Makefile b/libs/re/Makefile
index b64d5eb18e89d34536a6f6318487c3603ea9bee4..f2dacab8f6b5c6db28d4a870cbd25db625e2e065 100644 (file)
--- a/libs/re/Makefile
+++ b/libs/re/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=re
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.0.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/baresip/re/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=bf0abfc511b7278462e7d54aaae39e7231b9f35423d5026c8210a322c7c8ef2f
+PKG_HASH:=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
@@ -32,6 +32,7 @@ define Package/libre
   DEPENDS:=+libopenssl +zlib
   TITLE:=Generic library for real-time communications with async IO support
   URL:=https://github.com/baresip/re
+  ABI_VERSION:=1
 endef
 
 # re.mk is used for this and all related packages (rem, restund and baresip).
@@ -68,12 +69,12 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so} $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib
 endef
 
 define Package/libre/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so.$(ABI_VERSION)* $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,libre))

diff --git a/libs/re/patches/001-extend-ninit-nclose-check.patch b/libs/re/patches/001-extend-ninit-nclose-check.patch
index 382d3e943ec90e9843ad8ff64bb4a117bffcc85f..9a227595a2152bbc2ab3b5506801973e10b2192e 100644 (file)
--- a/libs/re/patches/001-extend-ninit-nclose-check.patch
+++ b/libs/re/patches/001-extend-ninit-nclose-check.patch
@@ -1,6 +1,6 @@
 --- a/src/dns/res.c
 +++ b/src/dns/res.c
-@@ -25,7 +25,7 @@ int get_resolv_dns(char *domain, size_t
+@@ -26,7 +26,7 @@ int get_resolv_dns(char *domain, size_t
        uint32_t i;
        int ret, err;
  
@@ -9,7 +9,7 @@
        ret = res_init();
        state = _res;
  #else
-@@ -56,7 +56,7 @@ int get_resolv_dns(char *domain, size_t
+@@ -76,7 +76,7 @@ int get_resolv_dns(char *domain, size_t
        *n = i;
  
   out:

diff --git a/libs/re/patches/004-prevent-optimization-meddling.patch b/libs/re/patches/004-prevent-optimization-meddling.patch
index 3b7ba4fe738910862413e0ef0f96bb7ee3ce9962..97caed3ec111722a0f999f3e42ee8111895eb5e4 100644 (file)
--- a/libs/re/patches/004-prevent-optimization-meddling.patch
+++ b/libs/re/patches/004-prevent-optimization-meddling.patch
@@ -1,10 +1,10 @@
 --- a/mk/re.mk
 +++ b/mk/re.mk
-@@ -43,7 +43,6 @@
+@@ -47,7 +47,6 @@
  
  ifneq ($(RELEASE),)
  CFLAGS  += -DRELEASE
 -OPT_SPEED=1
  endif
  
- 
+ ifneq ($(TRACE_ERR),)

diff --git a/libs/re/patches/005-fix-builds-for-mipsel-targets.patch b/libs/re/patches/005-fix-builds-for-mipsel-targets.patch
index d59f85e5f39e2c6262b73d4e4d2fe553f879bbfc..c50a463a51b9daace2697d96a842281c7e9814eb 100644 (file)
--- a/libs/re/patches/005-fix-builds-for-mipsel-targets.patch
+++ b/libs/re/patches/005-fix-builds-for-mipsel-targets.patch
@@ -1,6 +1,6 @@
 --- a/mk/re.mk
 +++ b/mk/re.mk
-@@ -439,11 +439,6 @@ endif
+@@ -412,11 +412,6 @@ endif
  
  CFLAGS        += -DARCH=\"$(ARCH)\"