Yate: bump version

2026-05-05 22:48:55 +02:00 · 2020-04-29 14:39:01 +00:00
parent b9ccb5bca4
commit a54f263969
3 changed files with 169 additions and 136 deletions
--- a/net-voip/yate/patches/yate-6.0.0.patchset
+++ b/net-voip/yate/patches/yate-6.0.0.patchset
@@ -1,125 +0,0 @@
-From 37a70eb94e8f2e077ad0400c39ae2f2945d0e70d Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 11 Dec 2017 15:00:11 +0300
-Subject: fix configure for use with Qt5
-
-
-diff --git a/configure.ac b/configure.ac
-index 8280899..5296955 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -145,7 +145,7 @@ AC_HEADER_TIME
- 
- # Checks for library functions.
- AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([malloc gettimeofday inet_ntoa memmove strerror], , [AC_MSG_ERROR([This function is required.])])
-+AC_CHECK_FUNCS([malloc gettimeofday memmove strerror], , [AC_MSG_ERROR([This function is required.])])
- 
- HAVE_GETCWD=""
- AC_CHECK_FUNCS([getcwd], [HAVE_GETCWD="-DHAVE_GETCWD"])
-@@ -1558,13 +1558,13 @@ if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
- 	fi
- 	if [[ "x$incqt" != "x" -a "x$libqt" != "x" ]]; then
- 	    HAVE_QT4=yes
-	    QT4_INC="-I$incqt -I$incqt/QtUiTools -I$incqt/QtGui -I$incqt/QtXml -I$incqt/QtCore"
-+	    QT4_INC="-I$incqt -I$incqt/QtUiTools -I$incqt/QtGui -I$incqt/QtXml -I$incqt/QtCore -I$incqt/QtMultimedia -I$incqt/QtWidgets"
- 	    case "$uname_os" in
- 		*Darwin)
- 		    QT4_INC="-D__USE_WS_X11__ $QT4_INC"
- 		    ;;
- 	    esac
-	    QT4_LIB="-L$libqt -lQtUiTools -lQtGui -lQtXml -lQtCore"
-+	    QT4_LIB="-L$libqt -lQtUiTools -lQtGui -lQtXml -lQtCore -lQtMultimedia -lQtWidgets"
- 	    QT4_INC_NET="-I$incqt/QtNetwork"
- 	    QT4_LIB_NET="-L$libqt -lQtNetwork"
- 	    case "$uname_os" in
-@@ -1707,7 +1707,7 @@ INSTALL_D="install -D"
- CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \+\)-g[[0-9]]*//' | sed 's/[[[:space:]]]\{2,\}/ /g'`
- MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK $HAVE_BLOCK_RETURN"
- MODULE_CPPFLAGS="$HAVE_NO_OVERLOAD_VIRT_WARN $RTTI_OPT $MODULE_CFLAGS"
-MODULE_LDRELAX="-rdynamic -shared"
-+MODULE_LDRELAX="-shared"
- MODULE_SYMBOLS="-Wl,--retain-symbols-file,/dev/null"
- SONAME_OPT="-shared -Wl,-soname="
- case "x$uname_os" in
-- 
-2.15.0
-
-
-From 3a4580e5ef92a298dd083194691d3cacfbbc6c4f Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 11 Dec 2017 15:00:51 +0300
-Subject: add missing include
-
-
-diff --git a/clients/qt4/qt4client.h b/clients/qt4/qt4client.h
-index c6702cf..f36df86 100644
--- a/clients/qt4/qt4client.h
-+++ b/clients/qt4/qt4client.h
-@@ -21,6 +21,7 @@
- 
- #ifndef __QT4CLIENT_H
- #define __QT4CLIENT_H
-+#include <QtWidgets>
- 
- #include <yatecbase.h>
- 
-- 
-2.15.0
-
-
-From 07b67701f0613932dcb1132539b34c7f546b6d76 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 11 Dec 2017 15:29:54 +0300
-Subject: comment out pthread_attr_setinheritsched
-
-
-diff --git a/engine/Mutex.cpp b/engine/Mutex.cpp
-index 40c5d95..2ecccd7 100644
--- a/engine/Mutex.cpp
-+++ b/engine/Mutex.cpp
-@@ -32,7 +32,7 @@ typedef HANDLE HSEMAPHORE;
- 
- #ifdef MUTEX_HACK
- extern "C" {
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__HAIKU__)
- extern int pthread_mutexattr_settype(pthread_mutexattr_t *__attr, int __kind);
- #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
- #else
-diff --git a/engine/Thread.cpp b/engine/Thread.cpp
-index 4cf7120..ac4fa36 100644
--- a/engine/Thread.cpp
-+++ b/engine/Thread.cpp
-@@ -162,7 +162,7 @@ ThreadPrivate* ThreadPrivate::create(Thread* t,const char* name,Thread::Priority
- 	    default:
- 		break;
- 	}
-	int err = ::pthread_attr_setinheritsched(&attr,PTHREAD_EXPLICIT_SCHED);
-+/*	int err = ::pthread_attr_setinheritsched(&attr,PTHREAD_EXPLICIT_SCHED);
- 	if (!err)
- 	    err = ::pthread_attr_setschedpolicy(&attr,policy);
- 	if (!err)
-@@ -174,8 +174,10 @@ ThreadPrivate* ThreadPrivate::create(Thread* t,const char* name,Thread::Priority
- #else
- 		DebugNote,
- #endif
-+
- 		"Could not set thread scheduling parameters: %s (%d)",
- 		strerror(err),err);
-+*/
- #ifdef XDEBUG
- 	else
- 	    Debug(DebugInfo,"Successfully set high thread priority %d",prio);
-@@ -214,7 +216,7 @@ ThreadPrivate* ThreadPrivate::create(Thread* t,const char* name,Thread::Priority
- #ifdef PTHREAD_INHERIT_SCHED
- 	if ((0 == i) && (EPERM == e) && (prio > Thread::Normal)) {
- 	    Debug(DebugWarn,"Failed to create thread with priority %d, trying with inherited",prio);
-	    ::pthread_attr_setinheritsched(&attr,PTHREAD_INHERIT_SCHED);
-+//	    ::pthread_attr_setinheritsched(&attr,PTHREAD_INHERIT_SCHED);
- 	    e = EAGAIN;
- 	}
- #endif
-- 
-2.15.0
-
--- a/net-voip/yate/patches/yate-6.1.1~git.patchset
+++ b/net-voip/yate/patches/yate-6.1.1~git.patchset
@@ -0,0 +1,154 @@
+From d35adb5da7f1b060c52c857bf22808628478ffff Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 29 Apr 2020 14:25:19 +0000
+Subject: Fix build on Haiku
+
+
+diff --git a/clients/qtclient.pro b/clients/qtclient.pro
+index 60c1b2a..48b9142 100644
+--- a/clients/qtclient.pro
+++ b/clients/qtclient.pro
+@@ -17,7 +17,7 @@ RCC_DIR = $${DESTDIR}/clients
+ UI_DIR = $${DESTDIR}/clients
+ 
+ INCLUDEPATH += .. qt4 ../modules/qt4 
+-unix:!mac:LIBS += -lpthread -lasound
+unix:!mac:!haiku:LIBS += -lpthread -lasound
+ mac:LIBS += -framework CoreFoundation -framework CoreServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox
+ LIBS += -L$$DESTDIR -lyate -lbasemodules
+ 
+@@ -32,7 +32,7 @@ SOURCES += main-qt4.cpp \
+ 
+ mac:SOURCES += ../modules/client/coreaudio.cpp
+ win32:SOURCES += ../modules/client/dsoundchan.cpp
+-unix:!mac:SOURCES += ../modules/client/alsachan.cpp
+unix:!mac:!haiku:SOURCES += ../modules/client/alsachan.cpp
+ 
+ HEADERS += qt4/qt4client.h \
+            ../modules/qt4/widgetlist.h \
+@@ -103,4 +103,4 @@ mac {
+ 
+ unix:!mac {
+     QMAKE_POST_LINK += $$quote(ln -s libbasemodules.so.1.0.0 $${DESTDIR}/libbasemodules.yate $$escape_expand(\n\t))
+-}
+\ No newline at end of file
+}
+diff --git a/engine/Mutex.cpp b/engine/Mutex.cpp
+index 40c5d95..2ecccd7 100644
+--- a/engine/Mutex.cpp
+++ b/engine/Mutex.cpp
+@@ -32,7 +32,7 @@ typedef HANDLE HSEMAPHORE;
+ 
+ #ifdef MUTEX_HACK
+ extern "C" {
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__HAIKU__)
+ extern int pthread_mutexattr_settype(pthread_mutexattr_t *__attr, int __kind);
+ #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+ #else
+diff --git a/engine/Thread.cpp b/engine/Thread.cpp
+index 4cf7120..dd77714 100644
+--- a/engine/Thread.cpp
+++ b/engine/Thread.cpp
+@@ -162,6 +162,7 @@ ThreadPrivate* ThreadPrivate::create(Thread* t,const char* name,Thread::Priority
+ 	    default:
+ 		break;
+ 	}
+#ifndef __HAIKU__
+ 	int err = ::pthread_attr_setinheritsched(&attr,PTHREAD_EXPLICIT_SCHED);
+ 	if (!err)
+ 	    err = ::pthread_attr_setschedpolicy(&attr,policy);
+@@ -179,6 +180,7 @@ ThreadPrivate* ThreadPrivate::create(Thread* t,const char* name,Thread::Priority
+ #ifdef XDEBUG
+ 	else
+ 	    Debug(DebugInfo,"Successfully set high thread priority %d",prio);
+#endif
+ #endif
+     }
+ #endif /* _WINDOWS */
+@@ -211,7 +213,7 @@ ThreadPrivate* ThreadPrivate::create(Thread* t,const char* name,Thread::Priority
+ 	}
+ #else /* _WINDOWS */
+ 	e = ::pthread_create(&p->thread,&attr,startFunc,p);
+-#ifdef PTHREAD_INHERIT_SCHED
+#if defined(PTHREAD_INHERIT_SCHED) && !defined(__HAIKU__)
+ 	if ((0 == i) && (EPERM == e) && (prio > Thread::Normal)) {
+ 	    Debug(DebugWarn,"Failed to create thread with priority %d, trying with inherited",prio);
+ 	    ::pthread_attr_setinheritsched(&attr,PTHREAD_INHERIT_SCHED);
+diff --git a/engine/engine.pro b/engine/engine.pro
+index 1c6a7e2..ef5178f 100644
+--- a/engine/engine.pro
+++ b/engine/engine.pro
+@@ -12,7 +12,7 @@ mac|linux:DEFINES += ATOMIC_OPS HAVE_GMTOFF HAVE_INT_TZ HAVE_POLL HAVE_NTOP HAVE
+ # engine/regex/regex.c
+ mac:DEFINES += STDC_HEADERS
+ # engine/Mutex.cpp
+-mac:DEFINES += MUTEX_HACK
+mac|haiku:DEFINES += MUTEX_HACK
+ linux:DEFINES += HAVE_TIMEDLOCK HAVE_TIMEDWAIT
+ # engine/Thread.cpp
+ linux:DEFINES += HAVE_PRCTL
+@@ -25,8 +25,9 @@ mac:INCLUDEPATH += ./macosx
+ linux:INCLUDEPATH -= ./regex
+ win32:INCLUDEPATH += ../windows
+ 
+-LIBS += -lresolv -lpthread
+!haiku:LIBS += -lresolv -lpthread
+ mac:LIBS += -lobjc -framework Foundation
+haiku:LIBS += -lnetwork
+ 
+ SOURCES += $$files(*.cpp) $$files(regex/*.c)
+ mac:SOURCES += $$files(macosx/*.mm)
+@@ -34,4 +35,4 @@ linux:SOURCES -= $$files(regex/*.c)
+ 
+ HEADERS += $$files(*.h) $$files(tables/*.h) $$files(regex/*.h)
+ mac:HEADERS += $$files(macosx/*.h)
+-linux:HEADERS -= $$files(regex/*.h)
+\ No newline at end of file
+linux:HEADERS -= $$files(regex/*.h)
+diff --git a/modules/modules.pro b/modules/modules.pro
+index e2700dd..5d23226 100644
+--- a/modules/modules.pro
+++ b/modules/modules.pro
+@@ -7,7 +7,7 @@ DESTDIR = ../build
+ OBJECTS_DIR = $${DESTDIR}/modules
+ 
+ # unix and (:) not mac
+-unix:!mac:DEFINES += HAVE_MALLINFO USE_TLS_METHOD
+unix:!mac:!haiku:DEFINES += HAVE_MALLINFO USE_TLS_METHOD
+ unix:mac:DEFINES += NO_AESCTR
+ INCLUDEPATH += .. ../libs/yrtp ../libs/ysip ../libs/ysdp ../libs/yiax ../libs/yjabber
+ mac:INCLUDEPATH += /opt/local/include
+diff --git a/modules/rmanager.cpp b/modules/rmanager.cpp
+index 3c3fe50..3bc236d 100644
+--- a/modules/rmanager.cpp
+++ b/modules/rmanager.cpp
+@@ -29,6 +29,11 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ 
+#ifdef __HAIKU__
+#undef HAVE_MALLINFO
+#undef HAVE_COREDUMPER
+#endif
+
+ #ifdef NDEBUG
+ #undef HAVE_MALLINFO
+ #undef HAVE_COREDUMPER
+diff --git a/yatemath.h b/yatemath.h
+index 2a42426..7207e3e 100644
+--- a/yatemath.h
+++ b/yatemath.h
+@@ -25,6 +25,9 @@
+ #include <yateclass.h>
+ #include <math.h>
+ #include <string.h>
+#ifdef __HAIKU__
+#undef bzero
+#endif
+ 
+ namespace TelEngine {
+ 
+-- 
+2.26.0
+
--- a/net-voip/yate/yate-6.1.1~git.recipe
+++ b/net-voip/yate/yate-6.1.1~git.recipe
@@ -6,15 +6,16 @@ extended. Voice, video, data and instant messenging can all be unified under \
 Yate's flexible routing engine, maximizing communications efficiency and \
 minimizing infrastructure costs for businesses."
 HOMEPAGE="http://www.yate.ro/"
-COPYRIGHT="2010-2017 KDE Organisation"
+COPYRIGHT="2010-2020 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-SOURCE_URI="http://yate.null.ro/tarballs/yate6/yate-$portVersion-1.tar.gz"
-CHECKSUM_SHA256="0ab76015651db8076031277b2003c23bd5d9eb940491801f30a6dc3c226c1817"
-SOURCE_DIR="yate"
+srcGitRev="8505d691922a3df3545d9b4196170d6084467e37"
+SOURCE_URI="https://github.com/keepitsimpletech/yate/archive/$srcGitRev.zip"
+CHECKSUM_SHA256="2891f8a128421acbf059a72b103c8b9ad10f65052bd0d1c8ed223250e8945b55"
+SOURCE_DIR="yate-$srcGitRev"
 PATCHES="yate-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 !x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86"

 PROVIDES="
@@ -38,20 +39,23 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	cmd:which
+	cmd:qmake
 	"

 BUILD()
 {
-	export CXXFLAGS="-std=c++11"
-	export CFLAGS="-std=c++11"
-	./autogen.sh
-	runConfigure ./configure
-	make $jobArgs
+	./autogen.sh 
+	./configure
+	make yatepaths.h
+	qmake -o Makefile.qmake Yate.pro
+	make $jobArgs -f Makefile.qmake
 }

 INSTALL()
 {
+	mkdir -p $appsDir/Yate
+	cp build/* $appsDir/Yate
+	cp -r client-conf.d $appsDir/Yate

 	local APP_SIGNATURE="application/x-vnd.qt5-yate"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"