From f846a07cbb90f9efbcf17b1f1652e0d522042fbd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Robert=20H=C3=B6gberg?= <robert.hogberg@gmail.com>
Date: Tue, 3 Sep 2024 12:12:13 +0200
Subject: [PATCH] yate: bump to git snapshot from 2024-09-03
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

There hasn't been a yate release for years but development continues
on github. Let's update the OpenWrt package to a github snapshot.

Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>
---
 net/yate/Makefile                             | 40 +++++++++++--------
 net/yate/patches/100-non-gnu-mutex-type.patch |  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/net/yate/Makefile b/net/yate/Makefile
index a672b60..425d0a8 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=yate
-PKG_VERSION:=6.4.0-1
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/
-PKG_HASH:=8c23dc6bffbf8d478db3a85964b5019771c8f6c9acf5220f3465516a748a03b0
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/yatevoip/yate.git
+PKG_SOURCE_DATE:=2024-09-03
+PKG_SOURCE_VERSION:=d009381e4920e608dc2aae847c56469d471a8c48
+PKG_MIRROR_HASH:=eb85e127df46de9aea20f98b28b23897de631da972b6ae6e312338fcf86c0cfd
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
@@ -51,14 +52,11 @@ ifeq ($(CONFIG_HOST_OS_MACOS),y)
     include $(TOPDIR)/feeds/packages/utils/fakeuname/fakeuname.mk
 endif
 
-TAR_OPTIONS+= --strip-components 1
-TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
-
 define Package/$(PKG_NAME)/Default
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://yate.null.ro/
+  URL:=https://yate.ro/
 endef
 
 define Package/$(PKG_NAME)
@@ -100,6 +98,7 @@ CONFIGURE_VARS+= \
 	$(if $(CONFIG_HOST_OS_MACOS),PATH=$(FAKEUNAME_PATH):$(TARGET_PATH_PKG))
 
 CONFIGURE_ARGS+= \
+	--disable-atomics \
 	--disable-sctp \
 	--disable-tdmcard \
 	--disable-wanpipe \
@@ -139,6 +138,22 @@ CONFIGURE_ARGS+= \
 	--disable-isac-float
 endif
 
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); ./yate-config.sh)
+	$(call Build/Configure/Default)
+endef
+
+define Build/Install
+	$(call Build/Install/Default,install-noapi)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/
+endef
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/lib
 
@@ -165,13 +180,6 @@ define Package/$(PKG_NAME)-sounds/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/yate/sounds/ $(1)/usr/share/yate/
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/
-endef
-
 define BuildPlugin
   define Package/$(PKG_NAME)-mod-$(subst _,-,$(1))
     $(call Package/yate/Default)
diff --git a/net/yate/patches/100-non-gnu-mutex-type.patch b/net/yate/patches/100-non-gnu-mutex-type.patch
index e0f9905..0fac097 100644
--- a/net/yate/patches/100-non-gnu-mutex-type.patch
+++ b/net/yate/patches/100-non-gnu-mutex-type.patch
@@ -13,7 +13,7 @@
  #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
 --- a/configure.ac
 +++ b/configure.ac
-@@ -264,7 +264,7 @@ AC_TRY_COMPILE([
+@@ -268,7 +268,7 @@ AC_TRY_COMPILE([
  #include <pthread.h>
  ],[
  pthread_mutexattr_t attr;
-- 
2.30.2