Attachment #217462 for bug #248816

Lines 3-9 Link Here

(-)b/mail/thunderbird/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= thunderbird	4	PORTNAME= thunderbird
5	DISTVERSION= 68.11.0	5	DISTVERSION= 68.11.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= mail news net-im	7	CATEGORIES= mail news net-im
8	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	8	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
9	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source	9	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source




 #endif
--- /dev/null
+++ media/libcubeb/src/cubeb_oss.c
@@ -0,0 +1,1130 @@
+/*
+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>

+#define OSS_DEFAULT_NFRAMES (32)
+#endif
+
+#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
+
+#ifndef OSS_MAX_CHANNELS
+# if defined(__FreeBSD__) || defined(__DragonFly__)

+      continue;
+
+    devinfop[collection_cnt].device_id = strdup(sinfo.devname);
+    asprintf((char **)&devinfop[collection_cnt].friendly_name, "%s: %s",
+             sinfo.devname, sinfo.desc);
+    devinfop[collection_cnt].group_id = strdup(sinfo.devname);
+    devinfop[collection_cnt].vendor_name = NULL;
+    if (devinfop[collection_cnt].device_id == NULL ||

Lines 3-9 Link Here

(-)b/www/firefox-esr/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 68.12.0	5	DISTVERSION= 68.12.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= www	8	CATEGORIES= www
9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \	9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \




 #endif
--- /dev/null
+++ media/libcubeb/src/cubeb_oss.c
@@ -0,0 +1,1130 @@
+/*
+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>

+#define OSS_DEFAULT_NFRAMES (32)
+#endif
+
+#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
+
+#ifndef OSS_MAX_CHANNELS
+# if defined(__FreeBSD__) || defined(__DragonFly__)

+      continue;
+
+    devinfop[collection_cnt].device_id = strdup(sinfo.devname);
+    asprintf((char **)&devinfop[collection_cnt].friendly_name, "%s: %s",
+             sinfo.devname, sinfo.desc);
+    devinfop[collection_cnt].group_id = strdup(sinfo.devname);
+    devinfop[collection_cnt].vendor_name = NULL;
+    if (devinfop[collection_cnt].device_id == NULL ||

Lines 3-9 Link Here

(-)b/www/firefox/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 80.0	5	DISTVERSION= 80.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= www	8	CATEGORIES= www
9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \




 #endif
--- /dev/null
+++ media/libcubeb/src/cubeb_oss.c
@@ -0,0 +1,1130 @@
+/*
+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>

+#define OSS_DEFAULT_NFRAMES (32)
+#endif
+
+#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
+
+#ifndef OSS_MAX_CHANNELS
+# if defined(__FreeBSD__) || defined(__DragonFly__)

+      continue;
+
+    devinfop[collection_cnt].device_id = strdup(sinfo.devname);
+    asprintf((char **)&devinfop[collection_cnt].friendly_name, "%s: %s",
+             sinfo.devname, sinfo.desc);
+    devinfop[collection_cnt].group_id = strdup(sinfo.devname);
+    devinfop[collection_cnt].vendor_name = NULL;
+    if (devinfop[collection_cnt].device_id == NULL ||

Return to bug 248816

Lines 61-67 https://github.com/kinetiknz/cubeb/pull/600 Link Here

(-)b/mail/thunderbird/files/patch-cubeb-oss (-3 / +4 lines)
61	#endif	61	#endif
62	--- /dev/null	62	--- /dev/null
63	+++ media/libcubeb/src/cubeb_oss.c	63	+++ media/libcubeb/src/cubeb_oss.c
64	@@ -0,0 +1,1128 @@	64	@@ -0,0 +1,1130 @@
65	+/*	65	+/*
66	+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>	66	+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
67	+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>	67	+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
Lines 114-120 https://github.com/kinetiknz/cubeb/pull/600 Link Here
114	+#define OSS_DEFAULT_NFRAMES (32)	114	+#define OSS_DEFAULT_NFRAMES (32)
115	+#endif	115	+#endif
116	+	116	+
117	+#define ENV_AUDIO_DEVICE "AUDIODEVICE"	117	+#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
118	+	118	+
119	+#ifndef OSS_MAX_CHANNELS	119	+#ifndef OSS_MAX_CHANNELS
120	+# if defined(__FreeBSD__) \|\| defined(__DragonFly__)	120	+# if defined(__FreeBSD__) \|\| defined(__DragonFly__)
Lines 438-444 https://github.com/kinetiknz/cubeb/pull/600 Link Here
438	+ continue;	438	+ continue;
439	+	439	+
440	+ devinfop[collection_cnt].device_id = strdup(sinfo.devname);	440	+ devinfop[collection_cnt].device_id = strdup(sinfo.devname);
441	+ devinfop[collection_cnt].friendly_name = strdup(sinfo.desc);	441	+ asprintf((char **)&devinfop[collection_cnt].friendly_name, "%s: %s",
		442	+ sinfo.devname, sinfo.desc);
442	+ devinfop[collection_cnt].group_id = strdup(sinfo.devname);	443	+ devinfop[collection_cnt].group_id = strdup(sinfo.devname);
443	+ devinfop[collection_cnt].vendor_name = NULL;	444	+ devinfop[collection_cnt].vendor_name = NULL;
444	+ if (devinfop[collection_cnt].device_id == NULL \|\|	445	+ if (devinfop[collection_cnt].device_id == NULL \|\|

Lines 61-67 https://github.com/kinetiknz/cubeb/pull/600 Link Here

(-)b/www/firefox-esr/files/patch-cubeb-oss (-3 / +4 lines)
61	#endif	61	#endif
62	--- /dev/null	62	--- /dev/null
63	+++ media/libcubeb/src/cubeb_oss.c	63	+++ media/libcubeb/src/cubeb_oss.c
64	@@ -0,0 +1,1128 @@	64	@@ -0,0 +1,1130 @@
65	+/*	65	+/*
66	+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>	66	+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
67	+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>	67	+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
Lines 114-120 https://github.com/kinetiknz/cubeb/pull/600 Link Here
114	+#define OSS_DEFAULT_NFRAMES (32)	114	+#define OSS_DEFAULT_NFRAMES (32)
115	+#endif	115	+#endif
116	+	116	+
117	+#define ENV_AUDIO_DEVICE "AUDIODEVICE"	117	+#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
118	+	118	+
119	+#ifndef OSS_MAX_CHANNELS	119	+#ifndef OSS_MAX_CHANNELS
120	+# if defined(__FreeBSD__) \|\| defined(__DragonFly__)	120	+# if defined(__FreeBSD__) \|\| defined(__DragonFly__)
Lines 438-444 https://github.com/kinetiknz/cubeb/pull/600 Link Here
438	+ continue;	438	+ continue;
439	+	439	+
440	+ devinfop[collection_cnt].device_id = strdup(sinfo.devname);	440	+ devinfop[collection_cnt].device_id = strdup(sinfo.devname);
441	+ devinfop[collection_cnt].friendly_name = strdup(sinfo.desc);	441	+ asprintf((char **)&devinfop[collection_cnt].friendly_name, "%s: %s",
		442	+ sinfo.devname, sinfo.desc);
442	+ devinfop[collection_cnt].group_id = strdup(sinfo.devname);	443	+ devinfop[collection_cnt].group_id = strdup(sinfo.devname);
443	+ devinfop[collection_cnt].vendor_name = NULL;	444	+ devinfop[collection_cnt].vendor_name = NULL;
444	+ if (devinfop[collection_cnt].device_id == NULL \|\|	445	+ if (devinfop[collection_cnt].device_id == NULL \|\|

Lines 61-67 https://github.com/kinetiknz/cubeb/pull/600 Link Here

(-)b/www/firefox/files/patch-cubeb-oss (-3 / +4 lines)
61	#endif	61	#endif
62	--- /dev/null	62	--- /dev/null
63	+++ media/libcubeb/src/cubeb_oss.c	63	+++ media/libcubeb/src/cubeb_oss.c
64	@@ -0,0 +1,1129 @@	64	@@ -0,0 +1,1130 @@
65	+/*	65	+/*
66	+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>	66	+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
67	+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>	67	+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
Lines 114-120 https://github.com/kinetiknz/cubeb/pull/600 Link Here
114	+#define OSS_DEFAULT_NFRAMES (32)	114	+#define OSS_DEFAULT_NFRAMES (32)
115	+#endif	115	+#endif
116	+	116	+
117	+#define ENV_AUDIO_DEVICE "AUDIODEVICE"	117	+#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
118	+	118	+
119	+#ifndef OSS_MAX_CHANNELS	119	+#ifndef OSS_MAX_CHANNELS
120	+# if defined(__FreeBSD__) \|\| defined(__DragonFly__)	120	+# if defined(__FreeBSD__) \|\| defined(__DragonFly__)
Lines 438-444 https://github.com/kinetiknz/cubeb/pull/600 Link Here
438	+ continue;	438	+ continue;
439	+	439	+
440	+ devinfop[collection_cnt].device_id = strdup(sinfo.devname);	440	+ devinfop[collection_cnt].device_id = strdup(sinfo.devname);
441	+ devinfop[collection_cnt].friendly_name = strdup(sinfo.desc);	441	+ asprintf((char **)&devinfop[collection_cnt].friendly_name, "%s: %s",
		442	+ sinfo.devname, sinfo.desc);
442	+ devinfop[collection_cnt].group_id = strdup(sinfo.devname);	443	+ devinfop[collection_cnt].group_id = strdup(sinfo.devname);
443	+ devinfop[collection_cnt].vendor_name = NULL;	444	+ devinfop[collection_cnt].vendor_name = NULL;
444	+ if (devinfop[collection_cnt].device_id == NULL \|\|	445	+ if (devinfop[collection_cnt].device_id == NULL \|\|