From nobody Sat Mar 05 22:04:33 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 96F3B19EF247; Sat, 5 Mar 2022 22:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K9zKF3sZjz4g3q; Sat, 5 Mar 2022 22:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646517873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gYpd3qCmweEK7BIcTtaCb2b6znuT/hT+5ltTidcjsMU=; b=PyOSK3lDHkgyli4L3CxrbLXNcuP2WJF/w5Szi/bk7SZXqeosjtN6w8QDrM7XR0v2BIagkY yBPWudAXRmhMbvMqPyYO59SMiAnCkyQCvZMLwovhCxSCN51ZBa+4Sp7LudAaY5WP0kkJ8A qAMPlGtf1idc3Tp0YSdM19PmkwjDbNKWXT/2wpN0FZDca65FMxAT9H8/+aQ0q82n+ZActN 2Iyykd08+j02DFJTbJo33SWdyOnemzx9l4z81jm95v9TljZODNTK7O5Szxih0s9QKitWDc F0zD89QueENgqMxxabKCQX+Md63fXWO8+GlBCsuLNhfgSwzHZspJQc+5iRS3IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F6524D8; Sat, 5 Mar 2022 22:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 225M4XkJ094047; Sat, 5 Mar 2022 22:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225M4X2k094046; Sat, 5 Mar 2022 22:04:33 GMT (envelope-from git) Date: Sat, 5 Mar 2022 22:04:33 GMT Message-Id: <202203052204.225M4X2k094046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: 9c9e49779670 - 2022Q1 - www/chromium: fix audio playback with ALSA List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 9c9e497796708b460147da46bbc00e6e5c8df7e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646517873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gYpd3qCmweEK7BIcTtaCb2b6znuT/hT+5ltTidcjsMU=; b=SCcYoEaFfFBwxjk+tp87+a0LXz1a8hWY1p4CF19c10AktyoNV0lLCzgb5VsC+hRuHcE/4q dZNCj7FRR+hFFG3WzAqmwLc3qwYHDA2aitBcoxJVBYyxxjiU9/O0no+71A2bo3sV3sBcVb U5IZ8vcbbGVSfUfxoitBMxV2qu2RR8W+sQBRdjZxCJ5ZjHaBl7fPfyUjjPHBpBzOxlIy/e fNdbsACSQU3yZnuvkyBZLoECt379lWRjgILFv2C89dig/3PyDZ4X/AKs4MjoyAqdRNZZ6N UFKyNPa67wIJcGENQxlHSZnzWbnd6euvQLanAEXkBu3Y5Hfg5QY/TRyvYEi5cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646517873; a=rsa-sha256; cv=none; b=AAyjQZ/DYfYoBUhbRlCB6GpGh4YvCCQ3p9GQASaKJQxrjD1tT4mlq0yXIsKq8vOM/tZzev xv4DI8cGydOqXrNPYmlUcLbqMqbzdIzmTjrbqs4j48IGnedqYMZDDL6y9Vzlp9z2Gotu3c LJBTiJ8HEgGMCb0txqgdYw7KOG8FxATObKMHmRFQkBjFPzdzWSEEOIoVssQly892K0g24V g9Fl2QNozMfT64nbSwzLKVXDnBXVAWY7u8QYdTfK3xykjtaolyd0MFR5z7l5786anmY2eL 2rwyp3jMXGfzxmGKFe09F/1+CLUdz6EH58GCvSZe4iyLtC49iYkisP0+qY6OCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c9e497796708b460147da46bbc00e6e5c8df7e5 commit 9c9e497796708b460147da46bbc00e6e5c8df7e5 Author: Robert Nagy AuthorDate: 2022-03-05 22:01:23 +0000 Commit: Rene Ladan CommitDate: 2022-03-05 22:04:29 +0000 www/chromium: fix audio playback with ALSA PR: 262365 Reported by: o.hushchenkov@gmail.com Tested by: o.hushchenkov@gmail.com (cherry picked from commit fd50b0334df1c720befc62ae613bfa8862efb336) --- www/chromium/Makefile | 1 + .../patch-media_audio_alsa_audio__manager__alsa.cc | 54 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b7ee68b405cf..e9c5492b11d5 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,6 +2,7 @@ PORTNAME= chromium PORTVERSION= 99.0.4844.51 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts diff --git a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc new file mode 100644 index 000000000000..deb7ec59d8a0 --- /dev/null +++ b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -0,0 +1,54 @@ +--- media/audio/alsa/audio_manager_alsa.cc.orig 2022-03-05 18:42:44 UTC ++++ media/audio/alsa/audio_manager_alsa.cc +@@ -89,7 +89,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType + int card = -1; + + // Loop through the sound cards to get ALSA device hints. ++#if !BUILDFLAG(IS_BSD) + while (!wrapper_->CardNext(&card) && card >= 0) { ++#endif + void** hints = NULL; + int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); + if (!error) { +@@ -101,7 +103,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType + DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " + << wrapper_->StrError(error); + } ++#if !BUILDFLAG(IS_BSD) + } ++#endif + } + + void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, +@@ -184,7 +188,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( + // goes through software conversion if needed (e.g. incompatible + // sample rate). + // TODO(joi): Should we prefer "hw" instead? ++#if BUILDFLAG(IS_BSD) ++ static const char kDeviceTypeDesired[] = "plug"; ++#else + static const char kDeviceTypeDesired[] = "plughw"; ++#endif + return strncmp(kDeviceTypeDesired, device_name, + base::size(kDeviceTypeDesired) - 1) == 0; + } +@@ -206,7 +214,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( + // Loop through the sound cards. + // Don't use snd_device_name_hint(-1,..) since there is an access violation + // inside this ALSA API with libasound.so.2.0.0. ++#if !BUILDFLAG(IS_BSD) + while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) { ++#endif + int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); + if (!error) { + for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { +@@ -230,7 +240,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( + DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " + << wrapper_->StrError(error); + } ++#if !BUILDFLAG(IS_BSD) + } ++#endif + + return has_device; + }