Readd twinkle to pkgsrc-wip, twinkle version 1.10.3

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Readd twinkle to pkgsrc-wip, twinkle version 1.10.3
From: Niclas Rosenvik <nros%pkgsrc.org@localhost>
Date: Sat, 22 Oct 2022 10:24:24 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Sat Oct 22 12:24:24 2022 +0200
Changeset:	c4bdcc5e3ce379b9c12465bf098c2f0d26316211

Modified Files:
	Makefile
Added Files:
	twinkle/DESCR
	twinkle/Makefile
	twinkle/PLIST
	twinkle/TODO
	twinkle/distinfo
	twinkle/patches/patch-CMakeLists.txt
	twinkle/patches/patch-src_CMakeLists.txt
	twinkle/patches/patch-src_call__script.cpp
	twinkle/patches/patch-src_sys__settings.cpp
	twinkle/patches/patch-src_sys__settings.h
	twinkle/patches/patch-src_threads_mutex.cpp

Log Message:
Readd twinkle to pkgsrc-wip, twinkle version 1.10.3

Twinkle is a SIP-based VoIP client.
It comes with both a Qt-based graphical version
and one for console usage.
This is a new version ported to Qt5.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c4bdcc5e3ce379b9c12465bf098c2f0d26316211

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                    |  1 +
 twinkle/DESCR                               |  3 +++
 twinkle/Makefile                            | 34 +++++++++++++++++++++++++++++
 twinkle/PLIST                               | 23 +++++++++++++++++++
 twinkle/TODO                                |  3 +++
 twinkle/distinfo                            | 11 ++++++++++
 twinkle/patches/patch-CMakeLists.txt        | 33 ++++++++++++++++++++++++++++
 twinkle/patches/patch-src_CMakeLists.txt    | 14 ++++++++++++
 twinkle/patches/patch-src_call__script.cpp  | 15 +++++++++++++
 twinkle/patches/patch-src_sys__settings.cpp | 24 ++++++++++++++++++++
 twinkle/patches/patch-src_sys__settings.h   | 18 +++++++++++++++
 twinkle/patches/patch-src_threads_mutex.cpp | 16 ++++++++++++++
 12 files changed, 195 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index e0e925b7d3..4d0a9c0742 100644
--- a/Makefile
+++ b/Makefile
@@ -5798,6 +5798,7 @@ SUBDIR+=	tvmet
 SUBDIR+=	twamp-gui
 SUBDIR+=	twemproxy
 SUBDIR+=	twin-environment
+SUBDIR+=	twinkle
 SUBDIR+=	twintk
 SUBDIR+=	twitim
 SUBDIR+=	twitmail
diff --git a/twinkle/DESCR b/twinkle/DESCR
new file mode 100644
index 0000000000..21bc72e05a
--- /dev/null
+++ b/twinkle/DESCR
@@ -0,0 +1,3 @@
+Twinkle is a SIP-based VoIP client.
+It comes with both a Qt-based graphical version
+and one for console usage.
diff --git a/twinkle/Makefile b/twinkle/Makefile
new file mode 100644
index 0000000000..f4e72ec433
--- /dev/null
+++ b/twinkle/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD$
+
+DISTNAME=	twinkle-1.10.3
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_GITHUB:=LubosD/}
+GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://twinkle.dolezei.info/
+COMMENT=	SIP-based VOIP client
+LICENSE=	gnu-gpl-v2
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	bison flex
+
+CMAKE_ARGS+=	-DWITH_ALSA:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_SPEEX:BOOL=ON
+CMAKE_ARGS+=	-DWITH_ZRTP:BOOL=ON
+
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/ucommon/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../net/ccrtp/buildlink3.mk"
+.include "../../net/libzrtpcpp/buildlink3.mk"
+.include "../../sysutils/file/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/twinkle/PLIST b/twinkle/PLIST
new file mode 100644
index 0000000000..60d7e31e74
--- /dev/null
+++ b/twinkle/PLIST
@@ -0,0 +1,23 @@
+@comment $NetBSD$
+bin/twinkle
+bin/twinkle-console
+man/man1/twinkle.1
+share/applications/twinkle.desktop
+share/icons/hicolor/16x16/apps/twinkle.png
+share/icons/hicolor/24x24/apps/twinkle.png
+share/icons/hicolor/32x32/apps/twinkle.png
+share/icons/hicolor/48x48/apps/twinkle.png
+share/icons/hicolor/scalable/apps/twinkle.svg
+share/pixmaps/twinkle.png
+share/twinkle/lang/twinkle_cs.qm
+share/twinkle/lang/twinkle_de.qm
+share/twinkle/lang/twinkle_fr.qm
+share/twinkle/lang/twinkle_nl.qm
+share/twinkle/lang/twinkle_ru.qm
+share/twinkle/lang/twinkle_sv.qm
+share/twinkle/providers.csv
+share/twinkle/ringback.wav
+share/twinkle/ringtone.wav
+share/twinkle/twinkle16.png
+share/twinkle/twinkle32.png
+share/twinkle/twinkle48.png
diff --git a/twinkle/TODO b/twinkle/TODO
new file mode 100644
index 0000000000..e3e3541c0a
--- /dev/null
+++ b/twinkle/TODO
@@ -0,0 +1,3 @@
+twinkle does not end its process when
+closing it on NetBSD, t_thread->cancel()
+does not cancel thr_listen_udp in main.cpp.
diff --git a/twinkle/distinfo b/twinkle/distinfo
new file mode 100644
index 0000000000..d7c80293dc
--- /dev/null
+++ b/twinkle/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+BLAKE2s (twinkle-1.10.3.tar.gz) = f99250cc3bf48f8a0da0ad639c105cf549490c1802cf5eac0c4f369a07e3f979
+SHA512 (twinkle-1.10.3.tar.gz) = 7b70a346e6d3f1dd08c1d019dd671da3cb3539815d8a14de7268b2bf43fc0b632834e00d3b63823b1338472a1b91f727a479e5381da8b1076327b112c8a9bea2
+Size (twinkle-1.10.3.tar.gz) = 1196890 bytes
+SHA1 (patch-CMakeLists.txt) = 28890aeb4d89d8a9e903c8b1f2f658d53a550f8d
+SHA1 (patch-src_CMakeLists.txt) = 3e5f9e1f234d3972bfa317c686181eb26ea05f68
+SHA1 (patch-src_call__script.cpp) = 69ee7528de4a0fe3191a328f66bbff1cf98190c9
+SHA1 (patch-src_sys__settings.cpp) = 938fc221b9732529312385c5fecede01e66f3d7f
+SHA1 (patch-src_sys__settings.h) = a638124a9f688bd20b0001097552923d83941d0b
+SHA1 (patch-src_threads_mutex.cpp) = bacd240d0df36d97f25f25173dda649aa8637637
diff --git a/twinkle/patches/patch-CMakeLists.txt b/twinkle/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..3fa3dac25b
--- /dev/null
+++ b/twinkle/patches/patch-CMakeLists.txt
@@ -0,0 +1,33 @@
+$NetBSD$
+
+* allow compiler extensions for compiler based alloca
+* install manpages into PKGMANDIR
+
+--- CMakeLists.txt.orig	2022-02-19 05:05:00.000000000 +0000
++++ CMakeLists.txt
+@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6.0 FAT
+ 
+ set(PRODUCT_VERSION "1.10.3")
+ set(PRODUCT_DATE    "February 18, 2022")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++set(CMAKE_CXX_STANDARD 11)
+ 
+ OPTION(WITH_ZRTP		"Enable ZRTP encrypted calls" OFF)
+ OPTION(WITH_SPEEX		"Enable the Speex codec" OFF)
+@@ -19,6 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_C
+ 
+ include (CheckIncludeFile)
+ include (CheckIncludeFiles)
++include (GNUInstallDirs)
+ 
+ find_package(LibXml2 REQUIRED)
+ find_package(LibMagic REQUIRED)
+@@ -159,7 +160,7 @@ install(FILES data/twinkle.svg
+ 	DESTINATION share/icons/hicolor/scalable/apps)
+ 
+ install(FILES data/twinkle.1
+-	DESTINATION share/man/man1)
++	DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ 
+ add_subdirectory(src)
+ 
diff --git a/twinkle/patches/patch-src_CMakeLists.txt b/twinkle/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000000..34fedd98e6
--- /dev/null
+++ b/twinkle/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD$
+
+* NetBSD needs ossaudio for oss emulation
+
+--- src/CMakeLists.txt.orig	2022-02-19 05:05:00.000000000 +0000
++++ src/CMakeLists.txt
+@@ -99,6 +99,7 @@ set(twinkle_LIBS
+ if (WITH_GSM)
+ 	list(APPEND twinkle_LIBS ${GSM_LIBRARY})
+ endif (WITH_GSM)
++list(APPEND twinkle_LIBS $<$<PLATFORM_ID:NetBSD>:-lossaudio>)
+ 
+ if (WITH_QT5)
+ 	add_subdirectory(gui)
diff --git a/twinkle/patches/patch-src_call__script.cpp b/twinkle/patches/patch-src_call__script.cpp
new file mode 100644
index 0000000000..00435f38cd
--- /dev/null
+++ b/twinkle/patches/patch-src_call__script.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* make sure environ is defined, used later in the code
+
+--- src/call_script.cpp.orig	2022-02-19 05:05:00.000000000 +0000
++++ src/call_script.cpp
+@@ -46,6 +46,8 @@
+ #define SCR_TRIGGER_LOCAL_RELEASE	"local_release"
+ #define SCR_TRIGGER_REMOTE_RELEASE	"remote_release"
+ 
++extern char **environ;
++
+ /////////////////////////
+ // class t_script_result
+ /////////////////////////
diff --git a/twinkle/patches/patch-src_sys__settings.cpp b/twinkle/patches/patch-src_sys__settings.cpp
new file mode 100644
index 0000000000..502a4e0133
--- /dev/null
+++ b/twinkle/patches/patch-src_sys__settings.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+* use /dev/audio as standard device on NetBSD
+
+--- src/sys_settings.cpp.orig	2022-02-19 05:05:00.000000000 +0000
++++ src/sys_settings.cpp
+@@ -1839,7 +1839,7 @@ list<t_audio_device> t_sys_settings::get
+ 	list<t_audio_device> l;
+ 	
+ 	for (int i = -1; i <= 15; i ++) {
+-		string dev = "/dev/dsp";
++		string dev = DEV_DSP;
+ 		if (i >= 0) dev += int2str(i);
+ 		t_audio_device oss_dev;
+ 		oss_dev.type = t_audio_device::OSS;
+@@ -1893,7 +1893,7 @@ list<t_audio_device> t_sys_settings::get
+ 	// just add /dev/dsp as the default device.
+ 	if (l.empty()) {
+ 		t_audio_device oss_dev;
+-		oss_dev.device = "/dev/dsp";
++		oss_dev.device = DEV_DSP;
+ 		oss_dev.type = t_audio_device::OSS;
+ 		l.push_back(oss_dev);
+ 	}
diff --git a/twinkle/patches/patch-src_sys__settings.h b/twinkle/patches/patch-src_sys__settings.h
new file mode 100644
index 0000000000..7ef81fa929
--- /dev/null
+++ b/twinkle/patches/patch-src_sys__settings.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+* use /dev/audio as standard device on NetBSD
+
+--- src/sys_settings.h.orig	2022-02-19 05:05:00.000000000 +0000
++++ src/sys_settings.h
+@@ -40,7 +40,11 @@ using namespace std;
+ #define DIR_TMPFILE	"tmp"
+ 
+ /** Device file for DSP */
++#ifdef __NetBSD__
++#define DEV_DSP		"/dev/audio"
++#else
+ #define DEV_DSP		"/dev/dsp"
++#endif
+ 
+ /** Device prefixes in settings file */
+ #define PFX_OSS		"oss:"
diff --git a/twinkle/patches/patch-src_threads_mutex.cpp b/twinkle/patches/patch-src_threads_mutex.cpp
new file mode 100644
index 0000000000..a8c526aa7c
--- /dev/null
+++ b/twinkle/patches/patch-src_threads_mutex.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* use posix standard defines instead of linux ones,
+  needed on NetBSD
+
+--- src/threads/mutex.cpp.orig	2022-02-19 05:05:00.000000000 +0000
++++ src/threads/mutex.cpp
+@@ -36,7 +36,7 @@ t_mutex::t_mutex(bool recursive) {
+ 	pthread_mutexattr_init(&attr);
+ 
+ 
+-	int ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++	int ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ 	if (ret != 0) throw string(
+ 		"t_mutex::t_mutex failed to create a recursive mutex.");
+
Prev by Date: py-distributed: Update to 2022.10.0
Next by Date: rust: add bits for building for earmv6hf on NetBSD.
Previous by Thread: py-distributed: Update to 2022.10.0
Next by Thread: rust: add bits for building for earmv6hf on NetBSD.
Indexes:
Home | Main Index | Thread Index | Old Index