From nobody Mon Aug 05 15:16:21 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 4Wd0QF6Z00z5SCFP; Mon, 05 Aug 2024 15:16:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wd0QF66FTz4V0s; Mon, 5 Aug 2024 15:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722870981; 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=JsuhtHVjlt/YQNAnlsmEuP/qopyrt8q2rapipY6qYB8=; b=w89VinAtckiPZLrgyiaMCbnZKnIBHzrYNJtgDxIkIb3WuIbkj0gLPVj5BNcJeZYK6EGwne w1mst0uXZ9J947/NFz4jZG79ovYTGfY9uIdsj6Xatqu9vEZl/2SI18KenE4WZ7u+MH3vBO 0ec/eyZOaTvXA1D8s7Xi8X18Qkwl1fULeTbYzZXbLoIySkSe0LXEYL9habv8W2yq46Xfeq lNXJCh3fgEQn2azEXS0xUj87yp6NI03Eg+yxUxcx7AczKvTcW8jXE0VbhLgDSF/5XXQETg vk90qG2bTPTu6FsXNYjHgfiRk/FGiIktShBtkIbHDMcC8pUTDzHAri6Uus57pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722870981; a=rsa-sha256; cv=none; b=cMECPpdYPxXXnzUV99kR3M6pgFjdoxa78h6T4Et23WUX+RneQNuQiD1CQbedWhfo1+y/1I 9lYQZ9KhjGJbxa/DNFbUPPfjnFGKKtU36r+lYnmDwCat+RS3XbR9THsd/DbMLEOWygVDuP kb3PiqHni1VmTWbQZvCtjM4kgzElqmSNsji++Ce8Wo6Jchy/X0fTsLktIwL95Ju5o4A/R1 OeFBqubgFhKelvPUrGfCFpFudt3/uPy6HPe/IXScXQywLzNvAJ25S0IZjhtTpmba34yEpa +O55hrceoIJjsax4fsGsJqY4DWvHTblUtA+YxF7le4yGKC/B45tz9mDklQkiiA== 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=1722870981; 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=JsuhtHVjlt/YQNAnlsmEuP/qopyrt8q2rapipY6qYB8=; b=Xof9ogVsf8BIWDDG8Lf+cel0ApcpQ3eO/P+EZqB/iHbjG4LK/opYuy8/WdtnMEov7xljr8 WJd2x+s7y9bLpKO62R3aFDvaNuQRhNqSRP5hRyn2VZ3wBPxsG9fr1tmDBsnNqRCfLcoonq ltqZdvGF8hMtcdiNGPkpYJ/Smt4sD8F2Z/Vjhqta6dCUUwysCxOPnZLfDafwfF3YqbufKO lz43Dk2xeQfSPudJujF0tiaRfvYhbbFus1AVxllUL7FiXbVqbuS5cOPCy1GzkOWXAfBUua fg2UTDxfrGeHDtQASSy8rzJZtZkLCKXSaW7py2/Z0mqTlfE6dOsUsLyjZridnQ== 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 4Wd0QF5b6bzSY5; Mon, 5 Aug 2024 15:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 475FGL9t098586; Mon, 5 Aug 2024 15:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 475FGLMS098583; Mon, 5 Aug 2024 15:16:21 GMT (envelope-from git) Date: Mon, 5 Aug 2024 15:16:21 GMT Message-Id: <202408051516.475FGLMS098583@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: 18a8d77e0e18 - main - www/{*chromium,iridium}: bring back audio knobs 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: 18a8d77e0e182d2188cc6b8dbb9ebac63d71d16d Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=18a8d77e0e182d2188cc6b8dbb9ebac63d71d16d commit 18a8d77e0e182d2188cc6b8dbb9ebac63d71d16d Author: Robert Nagy AuthorDate: 2024-08-05 15:00:16 +0000 Commit: Robert Nagy CommitDate: 2024-08-05 15:16:14 +0000 www/{*chromium,iridium}: bring back audio knobs It seems that 683K worth of libs are too much dependencies. PR: 280268 --- www/chromium/Makefile | 37 ++++++++++++---------- www/chromium/distinfo | 4 +-- www/chromium/files/patch-media_audio_BUILD.gn | 11 ++++--- www/iridium/Makefile | 35 +++++++++++--------- www/iridium/distinfo | 4 +-- www/iridium/files/patch-media_audio_BUILD.gn | 11 ++++--- www/ungoogled-chromium/Makefile | 37 ++++++++++++---------- www/ungoogled-chromium/distinfo | 4 +-- .../files/patch-media_audio_BUILD.gn | 11 ++++--- 9 files changed, 86 insertions(+), 68 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 7bd5dd0a24ff..4b31f58a567e 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,14 +1,11 @@ PORTNAME= chromium PORTVERSION= 127.0.6533.88 -PULSEMV= 16 -PULSEV= ${PULSEMV}.1 +PORTREVISION= 1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ - https://nerd.hu/distfiles/:external \ - https://freedesktop.org/software/pulseaudio/releases/:pulseaudio + https://nerd.hu/distfiles/:external DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external \ - pulseaudio-${PULSEV}.tar.gz:pulseaudio + chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit @@ -39,10 +36,8 @@ BUILD_DEPENDS= bash:shells/bash \ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ - libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ - libsndio.so:audio/sndio \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ @@ -129,15 +124,10 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_libffi=true \ use_system_libjpeg=true \ use_udev=false \ - extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \ + extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" -# Audio backends -GN_ARGS+= use_alsa=true \ - use_pulseaudio=true \ - use_sndio=true - # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles @@ -152,8 +142,10 @@ SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE -OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO +OPTIONS_GROUP= AUDIO +OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes @@ -163,6 +155,12 @@ HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ + alsa-lib>=1.1.1_1:audio/alsa-lib +ALSA_VARS= GN_ARGS+=use_alsa=true +ALSA_VARS_OFF= GN_ARGS+=use_alsa=false + CODECS_VARS= GN_ARGS+=proprietary_codecs=true \ FFMPEG_BRAND="Chrome" CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ @@ -206,6 +204,14 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true +PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false + +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_VARS= GN_ARGS+=use_sndio=true +SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false + WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm @@ -291,7 +297,6 @@ pre-configure: .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor - touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ ${WRKSRC}/build/rust/rust_bindgen.gni diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 045c33c1a145..f8cb93707573 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,10 +1,8 @@ -TIMESTAMP = 1722453335 +TIMESTAMP = 1722834759 SHA256 (chromium-127.0.6533.88.tar.xz) = fd8e2bec6aee113388e2ac269538f9e621a21c449aca925ba7d709c12a9f93a5 SIZE (chromium-127.0.6533.88.tar.xz) = 6614557448 SHA256 (chrome-linux-127.0.6533.88-llvm17.profdata.tar.xz) = 2e4ed9d5d435891f578e81b8525f5491bbbefa2bbae05ab8394735378d36a27b SIZE (chrome-linux-127.0.6533.88-llvm17.profdata.tar.xz) = 30457324 -SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 -SIZE (pulseaudio-16.1.tar.gz) = 2763111 SHA256 (chromium-127.0.6533.88-testdata.tar.xz) = 11b9d2d629f1ca12a9ea3ce0799b51f95d482fb4a05c88459692fcaced63f6f7 SIZE (chromium-127.0.6533.88-testdata.tar.xz) = 281486940 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 724df812a7e7..fe71e86e7828 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,18 +1,21 @@ ---- media/audio/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- media/audio/BUILD.gn.orig 2024-08-05 14:59:35 UTC +++ media/audio/BUILD.gn -@@ -270,9 +270,20 @@ source_set("audio") { +@@ -270,9 +270,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !use_sndio) { ++ if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/audio_manager_linux.cc" ] } + ++ if (is_bsd) { ++ sources += [ "sndio/audio_manager_sndio.cc" ] ++ } ++ + if (use_sndio) { + libs += [ "sndio" ] + sources += [ -+ "sndio/audio_manager_sndio.cc", + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc", diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 8f742862f888..bd3e65425adc 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,15 +1,12 @@ PORTNAME= iridium PORTVERSION= 2024.07.127.1 -PULSEMV= 16 -PULSEV= ${PULSEMV}.1 +PORTREVISION= 1 CATEGORIES= www wayland -MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \ - https://freedesktop.org/software/pulseaudio/releases/:pulseaudio +MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - pulseaudio-${PULSEV}.tar.gz:pulseaudio +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Iridium browser @@ -40,10 +37,8 @@ BUILD_DEPENDS= bash:shells/bash \ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ - libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ - libsndio.so:audio/sndio \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ @@ -130,15 +125,10 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_libffi=true \ use_system_libjpeg=true \ use_udev=false \ - extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \ + extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" -# Audio backends -GN_ARGS+= use_alsa=true \ - use_pulseaudio=true \ - use_sndio=true - # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles @@ -149,6 +139,8 @@ SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS LTO PIPEWIRE OPTIONS_DEFAULT= CODECS CUPS KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO +OPTIONS_GROUP= AUDIO +OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes @@ -157,6 +149,12 @@ HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ + alsa-lib>=1.1.1_1:audio/alsa-lib +ALSA_VARS= GN_ARGS+=use_alsa=true +ALSA_VARS_OFF= GN_ARGS+=use_alsa=false + CODECS_VARS= GN_ARGS+=proprietary_codecs=true \ FFMPEG_BRAND="Chrome" CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ @@ -197,6 +195,14 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true +PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false + +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_VARS= GN_ARGS+=use_sndio=true +SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false + .include .include # for COMPILER_VERSION @@ -270,7 +276,6 @@ pre-configure: .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor - touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ ${WRKSRC}/build/rust/rust_bindgen.gni diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 61537a8bae72..a2a4671a94ce 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1722505699 +TIMESTAMP = 1722870643 SHA256 (iridium-browser-2024.07.127.1.tar.xz) = 76786af5d0670aaede10a3ce52f8bae3a2855fac9b8ad7a8c5f87df0d3657fb7 SIZE (iridium-browser-2024.07.127.1.tar.xz) = 2866494748 -SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 -SIZE (pulseaudio-16.1.tar.gz) = 2763111 diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index 348773ee95aa..fe71e86e7828 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,18 +1,21 @@ ---- media/audio/BUILD.gn.orig 2024-06-25 12:08:48 UTC +--- media/audio/BUILD.gn.orig 2024-08-05 14:59:35 UTC +++ media/audio/BUILD.gn -@@ -270,9 +270,20 @@ source_set("audio") { +@@ -270,9 +270,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !use_sndio) { ++ if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/audio_manager_linux.cc" ] } + ++ if (is_bsd) { ++ sources += [ "sndio/audio_manager_sndio.cc" ] ++ } ++ + if (use_sndio) { + libs += [ "sndio" ] + sources += [ -+ "sndio/audio_manager_sndio.cc", + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc", diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index f7b9117e1491..616d3144e828 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,15 +1,12 @@ PORTNAME= ungoogled-chromium PORTVERSION= 127.0.6533.88 +PORTREVISION= 1 UGVERSION= ${DISTVERSION}-1 -PULSEMV= 16 -PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ - https://nerd.hu/distfiles/:external \ - https://freedesktop.org/software/pulseaudio/releases/:pulseaudio + https://nerd.hu/distfiles/:external DISTFILES= chromium-${DISTVERSION}${EXTRACT_SUFX} \ - ungoogled-chromium-${UGVERSION}.tar.gz:external \ - pulseaudio-${PULSEV}.tar.gz:pulseaudio + ungoogled-chromium-${UGVERSION}.tar.gz:external MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit sans integration with Google @@ -43,10 +40,8 @@ BUILD_DEPENDS= bash:shells/bash \ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ - libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ - libsndio.so:audio/sndio \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ @@ -126,7 +121,7 @@ GN_ARGS+= enable_widevine=true \ use_system_libffi=true \ use_system_libjpeg=true \ use_udev=false \ - extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \ + extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" @@ -153,11 +148,6 @@ GN_ARGS+= build_with_tflite_lib=false \ use_official_google_api_keys=false \ use_unofficial_version_number=false -# Audio backends -GN_ARGS+= use_alsa=true \ - use_pulseaudio=true \ - use_sndio=true - # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles @@ -166,8 +156,10 @@ SUB_FILES= ungoogled-chromium.desktop ungoogled-chromium SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE -OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO +OPTIONS_GROUP= AUDIO +OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes @@ -177,6 +169,12 @@ HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ + alsa-lib>=1.1.1_1:audio/alsa-lib +ALSA_VARS= GN_ARGS+=use_alsa=true +ALSA_VARS_OFF= GN_ARGS+=use_alsa=false + CODECS_VARS= GN_ARGS+=proprietary_codecs=true \ FFMPEG_BRAND="Chrome" CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ @@ -220,6 +218,14 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true +PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false + +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_VARS= GN_ARGS+=use_sndio=true +SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false + WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm @@ -316,7 +322,6 @@ pre-configure: .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor - touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ ${WRKSRC}/build/rust/rust_bindgen.gni diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 90ab2d08eb4c..5cd5e3add868 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,10 +1,8 @@ -TIMESTAMP = 1722454458 +TIMESTAMP = 1722870427 SHA256 (chromium-127.0.6533.88.tar.xz) = fd8e2bec6aee113388e2ac269538f9e621a21c449aca925ba7d709c12a9f93a5 SIZE (chromium-127.0.6533.88.tar.xz) = 6614557448 SHA256 (ungoogled-chromium-127.0.6533.88-1.tar.gz) = d48dc832e53ac37b623162088788583ca3e8bf4eefc565334b7b59da1ffc30eb SIZE (ungoogled-chromium-127.0.6533.88-1.tar.gz) = 1237525 -SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 -SIZE (pulseaudio-16.1.tar.gz) = 2763111 SHA256 (chromium-127.0.6533.88-testdata.tar.xz) = 11b9d2d629f1ca12a9ea3ce0799b51f95d482fb4a05c88459692fcaced63f6f7 SIZE (chromium-127.0.6533.88-testdata.tar.xz) = 281486940 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index 9039f1b1f769..fe71e86e7828 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn @@ -1,18 +1,21 @@ ---- media/audio/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- media/audio/BUILD.gn.orig 2024-08-05 14:59:35 UTC +++ media/audio/BUILD.gn -@@ -270,9 +270,20 @@ source_set("audio") { +@@ -270,9 +270,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !use_sndio) { ++ if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/audio_manager_linux.cc" ] } + ++ if (is_bsd) { ++ sources += [ "sndio/audio_manager_sndio.cc" ] ++ } ++ + if (use_sndio) { + libs += [ "sndio" ] + sources += [ -+ "sndio/audio_manager_sndio.cc", + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc",