From nobody Wed Jun 26 15:47:55 2024 X-Original-To: dev-commits-ports-all@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 4W8R184xtsz5PlLL; Wed, 26 Jun 2024 15:47:56 +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 4W8R182wX9z4qHZ; Wed, 26 Jun 2024 15:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719416876; 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=byz9tWV7JBXB9iZTCoJEJB/lJPxOQ+ptnEg3sUWqj3c=; b=M672lzoFiZHaTBEvdCG6UUywLaF3O0+Tx2yM91xDnOuU8Jt4LWF+/yYOiADfGuwpCpcJSF k+eFQLcA248vMovkH1gH0Hyg4mRwMTNma/TLdgwfIi8L/IXE7vX+zoxEoLAKZYVEEvUfpC BqV9nMZ/M7KS/YLyMuXXR19V4P/9xzHG8hqmHl2kRjn4Mrdli0w/WWQ2u32lFNIf05MClD XUAVeX9SjPaiSxNxPDrVXqybdKrKf63aAj5Anx42STEW5KKABHHKEkxKnGcSfh+4XNgUma GB9/4QBqrIdKEbtCF0TOGJeIx6Kb6p+op3ayIc5UxBT3IlaogPPMw734Evjb7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719416876; a=rsa-sha256; cv=none; b=ul8si8Vk2pxbhCRXMVHoqpAhTZkf9XRwraYi8MZ0kgU5vAG+fZOJOH9js8LepIgfA5OBNK wypn6jWTJWIdiEAWvpSoE1ZQRN/Wl5zYmrLp0mZG1B1UWhcdxfN0PAlA8t5UM7NhFt0qMI i2wy8M9DdGZ74qfNTOuxSXzZiQq7a+IGH02gb2bckOn/fqCpCRADRw93NW+2nZzL3CB4ug M4IKo7Iy1xiktlRTAkQOxKuyoJUgR+Y05/nlcsBogVLqf/eoWZCFvBaQ7dc809mt/Zuvev LpxtpSm6PSPG/z0jLzQsL3Paqkj8/NKWo2kuPh9uqg/r5E/EIdHmY4S7ICjueA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719416876; 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=byz9tWV7JBXB9iZTCoJEJB/lJPxOQ+ptnEg3sUWqj3c=; b=UIF02vYwLlRIrK2+1T1Es7TD4/Q67oXP50G15MjR5CeL+dWCTFgGi89A9DT4yPE/1VH6MA Wk0YIMAlnEiWKGlGFXuzR/mF2WHik/DG9BCYFtZWcuhr5fCl6aX6AqboRRGsdClyd4Z/bJ h1jHlgGUZwcy1l0pvGzJ2ikrXhcd9vf2JvyNmqrgTT7C0Mz/YytdNbMAJ1ksCUKWpKNl8M 7YP62eyi/suvT0BBrbCUsdz1Pmt32JZkpKHepXuEAyGrP+NsJ9S2ZJCkT79Use0oIIb3Fk JD3HGCYWVyJoKHIK16HgsiYVcUfiSDRvx84uJPsX03PfvyLN8LvwwLxYoYc3eA== 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 4W8R1772KPzrM2; Wed, 26 Jun 2024 15:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45QFlt2d068833; Wed, 26 Jun 2024 15:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45QFltq7068830; Wed, 26 Jun 2024 15:47:55 GMT (envelope-from git) Date: Wed, 26 Jun 2024 15:47:55 GMT Message-Id: <202406261547.45QFltq7068830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: 0792294cb90c - main - www/{*chromium,iridium}: fix audio backend selection logic List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0792294cb90ce950b6a0d58ddc2f3cd95111b0d6 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0792294cb90ce950b6a0d58ddc2f3cd95111b0d6 commit 0792294cb90ce950b6a0d58ddc2f3cd95111b0d6 Author: Robert Nagy AuthorDate: 2024-06-26 15:46:42 +0000 Commit: Robert Nagy CommitDate: 2024-06-26 15:47:51 +0000 www/{*chromium,iridium}: fix audio backend selection logic PR: 279998 --- www/chromium/Makefile | 1 + .../files/patch-media_audio_sndio_audio__manager__sndio.cc | 9 +++++---- www/iridium/Makefile | 1 + .../files/patch-media_audio_sndio_audio__manager__sndio.cc | 9 +++++---- www/ungoogled-chromium/Makefile | 1 + .../files/patch-media_audio_sndio_audio__manager__sndio.cc | 9 +++++---- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index ef0fed481be6..72c0c5de909a 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= chromium PORTVERSION= 126.0.6478.126 +PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland diff --git a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc index 8f42931fbf28..e0c9e4d79afa 100644 --- a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2024-05-21 18:07:39 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2024-06-26 15:43:18 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,240 @@ +@@ -0,0 +1,241 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -207,7 +207,8 @@ +#if defined(USE_PULSEAUDIO) + pa_threaded_mainloop* pa_mainloop = nullptr; + pa_context* pa_context = nullptr; -+ if (audio_backend != "sndio" && pulse::InitPulse(&pa_mainloop, &pa_context)) { ++ if ((audio_backend != "sndio" && audio_backend != "alsa") && ++ pulse::InitPulse(&pa_mainloop, &pa_context)) { + return std::make_unique( + std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context); + } else if (audio_backend == "auto") { @@ -217,7 +218,7 @@ +#endif + +#if defined(USE_SNDIO) -+ if (audio_backend != "pulse") { ++ if (audio_backend != "pulse" && audio_backend != "alsa") { + return std::make_unique(std::move(audio_thread), + audio_log_factory); + } else if (audio_backend == "auto") { diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 72df93a08cfb..734c72bfcdef 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,5 +1,6 @@ PORTNAME= iridium PORTVERSION= 2024.06.126.2 +PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland diff --git a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc index e8a0321b47e1..e0c9e4d79afa 100644 --- a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2024-06-25 12:08:48 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2024-06-26 15:43:18 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,240 @@ +@@ -0,0 +1,241 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -207,7 +207,8 @@ +#if defined(USE_PULSEAUDIO) + pa_threaded_mainloop* pa_mainloop = nullptr; + pa_context* pa_context = nullptr; -+ if (audio_backend != "sndio" && pulse::InitPulse(&pa_mainloop, &pa_context)) { ++ if ((audio_backend != "sndio" && audio_backend != "alsa") && ++ pulse::InitPulse(&pa_mainloop, &pa_context)) { + return std::make_unique( + std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context); + } else if (audio_backend == "auto") { @@ -217,7 +218,7 @@ +#endif + +#if defined(USE_SNDIO) -+ if (audio_backend != "pulse") { ++ if (audio_backend != "pulse" && audio_backend != "alsa") { + return std::make_unique(std::move(audio_thread), + audio_log_factory); + } else if (audio_backend == "auto") { diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 3141f403a14b..caeddd0ee6ec 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= ungoogled-chromium PORTVERSION= 126.0.6478.126 +PORTREVISION= 1 UGVERSION= ${DISTVERSION}-1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 diff --git a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc index 35e8ab80fb77..e0c9e4d79afa 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2024-05-23 20:04:36 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2024-06-26 15:43:18 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,240 @@ +@@ -0,0 +1,241 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -207,7 +207,8 @@ +#if defined(USE_PULSEAUDIO) + pa_threaded_mainloop* pa_mainloop = nullptr; + pa_context* pa_context = nullptr; -+ if (audio_backend != "sndio" && pulse::InitPulse(&pa_mainloop, &pa_context)) { ++ if ((audio_backend != "sndio" && audio_backend != "alsa") && ++ pulse::InitPulse(&pa_mainloop, &pa_context)) { + return std::make_unique( + std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context); + } else if (audio_backend == "auto") { @@ -217,7 +218,7 @@ +#endif + +#if defined(USE_SNDIO) -+ if (audio_backend != "pulse") { ++ if (audio_backend != "pulse" && audio_backend != "alsa") { + return std::make_unique(std::move(audio_thread), + audio_log_factory); + } else if (audio_backend == "auto") {