gecko: update OSS patches

Changes:	https://github.com/kinetiknz/cubeb/compare/123ce2a...957847c
PR:		248816
Submitted by:	Ka Ho Ng

6 files changed, 15 insertions, 12 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 6cf5dd2dcf9b..81924e4f999b 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	68.11.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/mail/thunderbird/files/patch-cubeb-oss b/mail/thunderbird/files/patch-cubeb-oss
index 77d40ca3a55d..7a5e46dc338f 100644
--- a/mail/thunderbird/files/patch-cubeb-oss
+++ b/mail/thunderbird/files/patch-cubeb-oss
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
  #endif
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1128 @@
+@@ -0,0 +1,1129 @@
 +/*
 + * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
@@ -114,7 +114,7 @@ https://github.com/kinetiknz/cubeb/pull/600
 +#define OSS_DEFAULT_NFRAMES (32)
 +#endif
 +
-+#define ENV_AUDIO_DEVICE "AUDIODEVICE"
++#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
 +
 +#ifndef OSS_MAX_CHANNELS
 +# if defined(__FreeBSD__) || defined(__DragonFly__)
@@ -438,7 +438,8 @@ https://github.com/kinetiknz/cubeb/pull/600
 +      continue;
 +
 +    devinfop[collection_cnt].device_id = strdup(sinfo.devname);
-+    devinfop[collection_cnt].friendly_name = strdup(sinfo.desc);
++    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 ||
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 2334b438379c..2c8623d67a9b 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	68.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-esr/files/patch-cubeb-oss b/www/firefox-esr/files/patch-cubeb-oss
index 77d40ca3a55d..7a5e46dc338f 100644
--- a/www/firefox-esr/files/patch-cubeb-oss
+++ b/www/firefox-esr/files/patch-cubeb-oss
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
  #endif
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1128 @@
+@@ -0,0 +1,1129 @@
 +/*
 + * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
@@ -114,7 +114,7 @@ https://github.com/kinetiknz/cubeb/pull/600
 +#define OSS_DEFAULT_NFRAMES (32)
 +#endif
 +
-+#define ENV_AUDIO_DEVICE "AUDIODEVICE"
++#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
 +
 +#ifndef OSS_MAX_CHANNELS
 +# if defined(__FreeBSD__) || defined(__DragonFly__)
@@ -438,7 +438,8 @@ https://github.com/kinetiknz/cubeb/pull/600
 +      continue;
 +
 +    devinfop[collection_cnt].device_id = strdup(sinfo.devname);
-+    devinfop[collection_cnt].friendly_name = strdup(sinfo.desc);
++    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 ||
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 37cd85a2412a..8efabd9e0191 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	80.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/firefox/files/patch-cubeb-oss b/www/firefox/files/patch-cubeb-oss
index 4b9063d1c2f4..619c88c161d7 100644
--- a/www/firefox/files/patch-cubeb-oss
+++ b/www/firefox/files/patch-cubeb-oss
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
  #endif
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1129 @@
+@@ -0,0 +1,1130 @@
 +/*
 + * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
@@ -114,7 +114,7 @@ https://github.com/kinetiknz/cubeb/pull/600
 +#define OSS_DEFAULT_NFRAMES (32)
 +#endif
 +
-+#define ENV_AUDIO_DEVICE "AUDIODEVICE"
++#define ENV_AUDIO_DEVICE "AUDIO_DEVICE"
 +
 +#ifndef OSS_MAX_CHANNELS
 +# if defined(__FreeBSD__) || defined(__DragonFly__)
@@ -438,7 +438,8 @@ https://github.com/kinetiknz/cubeb/pull/600
 +      continue;
 +
 +    devinfop[collection_cnt].device_id = strdup(sinfo.devname);
-+    devinfop[collection_cnt].friendly_name = strdup(sinfo.desc);
++    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 ||