Date: Mon, 24 Aug 2020 12:55:57 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r546080 - in branches/2020Q3: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files Message-ID: <202008241255.07OCtvmO041771@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Aug 24 12:55:56 2020 New Revision: 546080 URL: https://svnweb.freebsd.org/changeset/ports/546080 Log: MFH: r546075 gecko: update OSS patches Changes: https://github.com/kinetiknz/cubeb/compare/123ce2a...957847c PR: 248816 Submitted by: Ka Ho Ng Approved by: ports-secteam blanket Modified: branches/2020Q3/mail/thunderbird/Makefile branches/2020Q3/mail/thunderbird/files/patch-cubeb-oss branches/2020Q3/www/firefox-esr/Makefile branches/2020Q3/www/firefox-esr/files/patch-cubeb-oss branches/2020Q3/www/firefox/Makefile branches/2020Q3/www/firefox/files/patch-cubeb-oss Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/mail/thunderbird/Makefile ============================================================================== --- branches/2020Q3/mail/thunderbird/Makefile Mon Aug 24 12:53:32 2020 (r546079) +++ branches/2020Q3/mail/thunderbird/Makefile Mon Aug 24 12:55:56 2020 (r546080) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.11.0 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2020Q3/mail/thunderbird/files/patch-cubeb-oss ============================================================================== --- branches/2020Q3/mail/thunderbird/files/patch-cubeb-oss Mon Aug 24 12:53:32 2020 (r546079) +++ branches/2020Q3/mail/thunderbird/files/patch-cubeb-oss Mon Aug 24 12:55:56 2020 (r546080) @@ -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 || Modified: branches/2020Q3/www/firefox-esr/Makefile ============================================================================== --- branches/2020Q3/www/firefox-esr/Makefile Mon Aug 24 12:53:32 2020 (r546079) +++ branches/2020Q3/www/firefox-esr/Makefile Mon Aug 24 12:55:56 2020 (r546080) @@ -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: branches/2020Q3/www/firefox-esr/files/patch-cubeb-oss ============================================================================== --- branches/2020Q3/www/firefox-esr/files/patch-cubeb-oss Mon Aug 24 12:53:32 2020 (r546079) +++ branches/2020Q3/www/firefox-esr/files/patch-cubeb-oss Mon Aug 24 12:55:56 2020 (r546080) @@ -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 || Modified: branches/2020Q3/www/firefox/Makefile ============================================================================== --- branches/2020Q3/www/firefox/Makefile Mon Aug 24 12:53:32 2020 (r546079) +++ branches/2020Q3/www/firefox/Makefile Mon Aug 24 12:55:56 2020 (r546080) @@ -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: branches/2020Q3/www/firefox/files/patch-cubeb-oss ============================================================================== --- branches/2020Q3/www/firefox/files/patch-cubeb-oss Mon Aug 24 12:53:32 2020 (r546079) +++ branches/2020Q3/www/firefox/files/patch-cubeb-oss Mon Aug 24 12:55:56 2020 (r546080) @@ -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 ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008241255.07OCtvmO041771>