haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 14:08:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Yate: add recipe for version 6.0.0

Browse Source 
Doesn't compile yet so help needed.
This commit is contained in:
Sergei Reznikov
2017-12-11 15:31:18 +03:00
parent 2fce966f91
commit 3948e48005
2 changed files with 197 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
net-voip/yate/patches/yate-6.0.0.patchset Normal file
View File

@@ -0,0 +1,125 @@
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