svn commit: r546075 - in head: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files

Jan Beich jbeich at FreeBSD.org
Mon Aug 24 12:50:23 UTC 2020 

Author: jbeich
Date: Mon Aug 24 12:50:21 2020
New Revision: 546075
URL: https://svnweb.freebsd.org/changeset/ports/546075

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

Modified:
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/mail/thunderbird/files/patch-cubeb-oss   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox-esr/files/patch-cubeb-oss   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/firefox/files/patch-cubeb-oss   (contents, props changed)

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Mon Aug 24 12:50:09 2020	(r546074)
+++ head/mail/thunderbird/Makefile	Mon Aug 24 12:50:21 2020	(r546075)
@@ -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

Modified: head/mail/thunderbird/files/patch-cubeb-oss
==============================================================================
--- head/mail/thunderbird/files/patch-cubeb-oss	Mon Aug 24 12:50:09 2020	(r546074)
+++ head/mail/thunderbird/files/patch-cubeb-oss	Mon Aug 24 12:50:21 2020	(r546075)
@@ -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 at NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300 at 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 ||

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Mon Aug 24 12:50:09 2020	(r546074)
+++ head/www/firefox-esr/Makefile	Mon Aug 24 12:50:21 2020	(r546075)
@@ -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 \

Modified: head/www/firefox-esr/files/patch-cubeb-oss
==============================================================================
--- head/www/firefox-esr/files/patch-cubeb-oss	Mon Aug 24 12:50:09 2020	(r546074)
+++ head/www/firefox-esr/files/patch-cubeb-oss	Mon Aug 24 12:50:21 2020	(r546075)
@@ -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 at NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300 at 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 ||

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Mon Aug 24 12:50:09 2020	(r546074)
+++ head/www/firefox/Makefile	Mon Aug 24 12:50:21 2020	(r546075)
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	80.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Modified: head/www/firefox/files/patch-cubeb-oss
==============================================================================
--- head/www/firefox/files/patch-cubeb-oss	Mon Aug 24 12:50:09 2020	(r546074)
+++ head/www/firefox/files/patch-cubeb-oss	Mon Aug 24 12:50:21 2020	(r546075)
@@ -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 at NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300 at 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 ||

More information about the svn-ports-head mailing list