head	1.4;
access;
symbols
	pkgsrc-2026Q1:1.4.0.32
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.4.0.30
	pkgsrc-2025Q4-base:1.4
	pkgsrc-2025Q3:1.4.0.28
	pkgsrc-2025Q3-base:1.4
	pkgsrc-2025Q2:1.4.0.26
	pkgsrc-2025Q2-base:1.4
	pkgsrc-2025Q1:1.4.0.24
	pkgsrc-2025Q1-base:1.4
	pkgsrc-2024Q4:1.4.0.22
	pkgsrc-2024Q4-base:1.4
	pkgsrc-2024Q3:1.4.0.20
	pkgsrc-2024Q3-base:1.4
	pkgsrc-2024Q2:1.4.0.18
	pkgsrc-2024Q2-base:1.4
	pkgsrc-2024Q1:1.4.0.16
	pkgsrc-2024Q1-base:1.4
	pkgsrc-2023Q4:1.4.0.14
	pkgsrc-2023Q4-base:1.4
	pkgsrc-2023Q3:1.4.0.12
	pkgsrc-2023Q3-base:1.4
	pkgsrc-2023Q2:1.4.0.10
	pkgsrc-2023Q2-base:1.4
	pkgsrc-2023Q1:1.4.0.8
	pkgsrc-2023Q1-base:1.4
	pkgsrc-2022Q4:1.4.0.6
	pkgsrc-2022Q4-base:1.4
	pkgsrc-2022Q3:1.4.0.4
	pkgsrc-2022Q3-base:1.4
	pkgsrc-2022Q2:1.4.0.2
	pkgsrc-2022Q2-base:1.4
	pkgsrc-2022Q1:1.3.0.12
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.10
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.8
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.6
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.4
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.2
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2019Q2:1.1.0.2
	pkgsrc-2019Q2-base:1.1;
locks; strict;
comment	@// @;


1.4
date	2022.04.01.11.53.28;	author nia;	state Exp;
branches;
next	1.3;
commitid	2EMWiGkDSehWxuyD;

1.3
date	2020.10.16.07.42.48;	author nia;	state Exp;
branches;
next	1.2;
commitid	pcHZre0xPngag6sC;

1.2
date	2019.09.16.22.46.21;	author nia;	state dead;
branches;
next	1.1;
commitid	LCRU5SpFMHhAZhDB;

1.1
date	2019.06.17.08.08.31;	author nia;	state Exp;
branches;
next	;
commitid	HJ0nqpv1vH6t3wrB;


desc
@@


1.4
log
@mumble: update to 1.4.230

Release notes:
https://www.mumble.info/blog/mumble-1.4.230/
@
text
@$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.

This is fixed in NetBSD 10.x.

--- src/mumble/OSS.cpp.orig	2022-01-18 01:00:00.346014000 +0000
+++ src/mumble/OSS.cpp
@@@@ -123,9 +123,45 @@@@ 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;
 
-#if (SOUND_VERSION >= 0x040002)
+		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);
+
+		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)
 	int mixerfd = open("/dev/mixer", O_RDWR, 0);
 	if (mixerfd == -1) {
 		qWarning("OSSEnumerator: Failed to open /dev/mixer");
@


1.3
log
@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
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
XXX: Fix this in libossaudio.
d7 1
a7 1
--- src/mumble/OSS.cpp.orig	2020-10-04 20:25:02.000000000 +0000
d9 1
a9 1
@@@@ -128,9 +128,46 @@@@ void OSSOutputRegistrar::setDeviceChoice
d13 1
d21 1
a21 1
+	for (int i=0;i< 32;i++) {
d25 2
a26 1
+
d37 1
a38 3
+		close(fd);
 
-#if (SOUND_VERSION >= 0x040002)
a46 1
+
d52 1
a52 1
+#elif (SOUND_VERSION >= 0x040002) && !defined(__NetBSD__)
@


1.2
log
@mumble: Update to 1.3.0

Full release notes:
https://www.mumble.info/blog/mumble-1.3.0-release-announcement/
@
text
@d1 1
a1 1
$NetBSD: patch-src_mumble_OSS.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
d3 5
a7 1
--- src/mumble/OSS.cpp.orig	2017-01-27 06:48:33.000000000 +0000
d9 28
a36 2
@@@@ -38,9 +38,10 @@@@
 #include <sys/ioctl.h>
d38 9
a46 5
 #include "User.h"
-#include "Global.h"
 #include "MainWindow.h"
 
+#include "Global.h"
d48 9
a56 3
 #define NBLOCKS 8
 
 class OSSEnumerator {
@


1.1
log
@mumble: Fix build with newer protobuf.

While here, use a working portaudio library and make it a default.

https://github.com/mumble-voip/mumble/pull/3623
@
text
@d1 1
a1 1
$NetBSD$
@