From 7c156bf8ba2a15dcccf06b0baaaac35a7d423c71 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 24 Aug 2020 12:50:21 +0000 Subject: gecko: update OSS patches Changes: https://github.com/kinetiknz/cubeb/compare/123ce2a...957847c PR: 248816 Submitted by: Ka Ho Ng --- www/firefox/files/patch-cubeb-oss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'www/firefox/files/patch-cubeb-oss') 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 + * Copyright © 2020 Ka Ho Ng @@ -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 || -- cgit v1.2.3