Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1602834168194700"
MIME-Version: 1.0
Date: Fri, 16 Oct 2020 07:42:48 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/chat/mumble
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20201016074248.CEE24FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1602834168194700
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Fri Oct 16 07:42:48 UTC 2020

Modified Files:
	pkgsrc/chat/mumble: Makefile distinfo options.mk
Added Files:
	pkgsrc/chat/mumble/patches: patch-src_mumble_OSS.cpp

Log Message:
mumble: Update to 1.3.3

pkgsrc changes:

- Fixed device iteration on NetBSD
- Fixed the portaudio option
- Added a jack option

Client

Fixed: Chatbox invisble (zero height)
Fixed: Handling of invalid packet sizes
Fixed: Race-condition leading to loss of shortcuts
Fixed: Link in About dialog is now clickable again
Fixed: Sizing issues in ACL-Editor
Improved: PulseAudio now always samples at 48 kHz

Server

Fixed: Crash due to problems when using PostgreSQL
Fixed: Handling of invalid package sizes


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/mumble/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/mumble/distinfo \
    pkgsrc/chat/mumble/options.mk
cvs rdiff -u -r0 -r1.3 pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp

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


--_----------=_1602834168194700
Content-Disposition: inline
Content-Length: 5755
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/chat/mumble/Makefile
diff -u pkgsrc/chat/mumble/Makefile:1.23 pkgsrc/chat/mumble/Makefile:1.24
--- pkgsrc/chat/mumble/Makefile:1.23	Tue Aug 18 17:57:41 2020
+++ pkgsrc/chat/mumble/Makefile	Fri Oct 16 07:42:48 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2020/08/18 17:57:41 leot Exp $
+# $NetBSD: Makefile,v 1.24 2020/10/16 07:42:48 nia Exp $
 
-DISTNAME=	mumble-1.3.2
-PKGREVISION=	2
+DISTNAME=	mumble-1.3.3
 CATEGORIES=	chat audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mumble-voip/}
 GITHUB_PROJECT=	mumble
@@ -15,7 +14,7 @@ LICENSE=	modified-bsd
 TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 USE_TOOLS+=	pkg-config gmake
-USE_LANGUAGES=	c c++11
+USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
 PYTHON_FOR_BUILD_ONLY=	tool
@@ -50,10 +49,8 @@ CONFIG_OPTIONS+=	CONFIG+=no-ice
 .if ${OSS_TYPE} != "none"
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
-SUBST_MESSAGE.oss=	Correct path to OSS device.
+SUBST_MESSAGE.oss=	Setting the OSS library.
 SUBST_FILES.oss+=	src/mumble/mumble.pro
-SUBST_FILES.oss+=	src/mumble/OSS.cpp
-SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_VARS.oss+=	LIBOSSAUDIO
 .endif
 

Index: pkgsrc/chat/mumble/distinfo
diff -u pkgsrc/chat/mumble/distinfo:1.5 pkgsrc/chat/mumble/distinfo:1.6
--- pkgsrc/chat/mumble/distinfo:1.5	Mon Jul 27 00:29:03 2020
+++ pkgsrc/chat/mumble/distinfo	Fri Oct 16 07:42:48 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2020/07/27 00:29:03 nia Exp $
+$NetBSD: distinfo,v 1.6 2020/10/16 07:42:48 nia Exp $
 
-SHA1 (mumble-1.3.2.tar.gz) = 9afb1dc0632fd249c0ff892979b89d1df920f374
-RMD160 (mumble-1.3.2.tar.gz) = 4f571c22e724781179e9208116d92cbaefd0c1cc
-SHA512 (mumble-1.3.2.tar.gz) = 3f5e3b586efbe9b49c7f14119072f4842bbd885f9c5145cdaa129a87c7fc85107d0735a3107f5a2789cec9fdadda1200ab4a6d76c3caee409d3e38406a8ba27f
-Size (mumble-1.3.2.tar.gz) = 8586368 bytes
+SHA1 (mumble-1.3.3.tar.gz) = 3fd6f2fbd42be57dfc8277143d3d4aea857255ab
+RMD160 (mumble-1.3.3.tar.gz) = 415fbb4d436beaf0d104f1920ef9fe00509294ab
+SHA512 (mumble-1.3.3.tar.gz) = be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
+Size (mumble-1.3.3.tar.gz) = 8591354 bytes
+SHA1 (patch-src_mumble_OSS.cpp) = cf441337a6284da7f87429610275ef14d084ddbf
 SHA1 (patch-src_mumble_mumble.pro) = a49c3263f6034b2ea7c8633e24823937f4c4d3f5
Index: pkgsrc/chat/mumble/options.mk
diff -u pkgsrc/chat/mumble/options.mk:1.5 pkgsrc/chat/mumble/options.mk:1.6
--- pkgsrc/chat/mumble/options.mk:1.5	Tue Apr 28 05:47:10 2020
+++ pkgsrc/chat/mumble/options.mk	Fri Oct 16 07:42:48 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2020/04/28 05:47:10 riastradh Exp $
+# $NetBSD: options.mk,v 1.6 2020/10/16 07:42:48 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mumble
-PKG_SUPPORTED_OPTIONS=		alsa dbus pulseaudio portaudio
+PKG_SUPPORTED_OPTIONS=		alsa dbus jack pulseaudio portaudio
 PKG_SUGGESTED_OPTIONS=		dbus portaudio
 PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
@@ -16,18 +16,26 @@ CONFIG_OPTIONS+=	CONFIG+=no-alsa
 
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIG_OPTIONS+=	CONFIG+=dbus
-#.include "../../x11/qt5-qtdbus/buildlink3.mk"
 .else
 CONFIG_OPTIONS+=	CONFIG+=no-dbus
 .endif
 
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIG_OPTIONS+=	CONFIG+=jackaudio
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIG_OPTIONS+=	CONFIG+=no-jackaudio
+.endif
+
 .if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIG_OPTIONS+=	CONFIG+=pulseaudio
 .include "../../audio/pulseaudio/buildlink3.mk"
 .else
 CONFIG_OPTIONS+=	CONFIG+=no-pulseaudio
 .endif
 
 .if !empty(PKG_OPTIONS:Mportaudio)
+CONFIG_OPTIONS+=	CONFIG+=portaudio
 .include "../../audio/portaudio/buildlink3.mk"
 .else
 CONFIG_OPTIONS+=	CONFIG+=no-portaudio

Added files:

Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp:1.3
--- /dev/null	Fri Oct 16 07:42:48 2020
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp	Fri Oct 16 07:42:48 2020
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_mumble_OSS.cpp,v 1.3 2020/10/16 07:42:48 nia Exp $
+
+Make device iteration work with NetBSD's OSS compat layer.
+
+XXX: Fix this in libossaudio.
+
+--- src/mumble/OSS.cpp.orig	2020-10-04 20:25:02.000000000 +0000
++++ src/mumble/OSS.cpp
+@@ -128,9 +128,46 @@ void OSSOutputRegistrar::setDeviceChoice
+ OSSEnumerator::OSSEnumerator() {
+ 	qhInput.insert(QString(), QLatin1String("Default OSS Device"));
+ 	qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
++#if defined(__NetBSD__) || defined(__OpenBSD__)
++	qhDevices.insert(QString(), QLatin1String("/dev/audio"));
++#else
+ 	qhDevices.insert(QString(), QLatin1String("/dev/dsp"));
++#endif
++
++#if defined(__NetBSD__)
++	for (int i=0;i< 32;i++) {
++		char audiodevname[32];
++		int fd;
++		oss_audioinfo ainfo;
++
++		ainfo.dev = i;
++		snprintf(audiodevname, sizeof(audiodevname), "/dev/audio%d", i);
++		if ((fd = open(audiodevname, O_RDWR)) == -1) {
++			break;
++		}
++		if (ioctl(fd, SNDCTL_AUDIOINFO, &ainfo) == -1) {
++			close(fd);
++			qWarning("OSSEnumerator: SNDCTL_AUDIOINFO failed for device %d", i);
++			continue;
++		}
++
++		close(fd);
+ 
+-#if (SOUND_VERSION >= 0x040002)
++		QString handle = QLatin1String(ainfo.handle);
++		QString name = QLatin1String(ainfo.name);
++		QString device = QLatin1String(ainfo.devnode);
++
++		if (ainfo.caps & PCM_CAP_HIDDEN)
++			continue;
++
++		qhDevices.insert(device, device);
++
++		if (ainfo.caps & PCM_CAP_INPUT)
++			qhInput.insert(device, name);
++		if (ainfo.caps & PCM_CAP_OUTPUT)
++			qhOutput.insert(device, name);
++	}
++#elif (SOUND_VERSION >= 0x040002) && !defined(__NetBSD__)
+ 	int mixerfd = open("/dev/mixer", O_RDWR, 0);
+ 	if (mixerfd == -1) {
+ 		qWarning("OSSEnumerator: Failed to open /dev/mixer");


--_----------=_1602834168194700--