Date: Mon, 5 Aug 2024 17:42:14 +0200
From: Piotr Kubaj <pkubaj@anongoth.pl>
To: Robert Nagy <rnagy@freebsd.org>
Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org
Subject: Re: git: 18a8d77e0e18 - main - www/{*chromium,iridium}: bring back audio knobs
Message-ID: <ZrDy1lmEEy0rpnjW@KGPE-D16>
In-Reply-To: <202408051516.475FGLMS098583@gitrepo.freebsd.org>
References: <202408051516.475FGLMS098583@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0DeNFJ2Po9QTkCER Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline When I started using FreeBSD, it was standard that the port should provide options to build it so that users can build it however they wish. Nowadays, it looks like we're moving towards one blessed configuration for each port. I thought ports were supposed to be easy to configure so that everyone can customize their own options - think Gentoo but different. Is that not the case anymore? On 24-08-05 15:16:21, Robert Nagy wrote: >The branch main has been updated by rnagy: > >URL: https://cgit.FreeBSD.org/ports/commit/?id=18a8d77e0e182d2188cc6b8dbb9ebac63d71d16d > >commit 18a8d77e0e182d2188cc6b8dbb9ebac63d71d16d >Author: Robert Nagy <rnagy@FreeBSD.org> >AuthorDate: 2024-08-05 15:00:16 +0000 >Commit: Robert Nagy <rnagy@FreeBSD.org> >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 <bsd.port.options.mk> > .include <bsd.port.pre.mk> # 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", --0DeNFJ2Po9QTkCER Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJkBAABCgBOFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmaw8tYwFIAAAAAAFQAS cGthLWFkZHJlc3NAZ251cGcub3JncGt1YmFqQGFub25nb3RoLnBsAAoJEHpZm4Ug g5ydUVkP/0IUnB+qNl0unMU+xHp6yEvb4z6E9FIIMs6128FRZZI1sh/P7PbMjQGT mk3YWRIUyPHT+/q+762vlBX584KgPQ7ujk2s2E8ru/zueEEz+tg9d+kOXvhMVkvU RCPDTGZU1gxjYNeiwf3E9fXfeOAcwHg+izRZhalaFoKhDdWPwikUo5tMK5jTzEXI MI6NkCjKKd1Z3iVUv1jk02pudBTkm6WMJKjTyUeVrCIlAu5j5oVecF952KQUQHFT 0ntjacMhMvTza5faewJhptHYd3oRIrLKc3K8GCjfnMYMDgrYXZm9ptbWUg6/UPwx XUlKpCFKHRhCSpVTvXw1Yn77O/Mic3YWU23mavUslatRLCQ3iHIRp59Miy7fz/Gp wIIKRgSwWs+pzLlIveOfbIcAO/gBuI8Vj93CPNTR7aRDh5aTLclrz82TWjjJR71C LrzlzC+A+cHXlsn1TVuiSQd3poN/8fCZJgDfCfL5TGvjHtK287SW3Kk8NfhJ1oLH /h/cZaaWiyxwdrtzARnbDbgDdHwO5wnTG5iR6vePslTjmUMYAEg6SRziU1Eq53fx /mvcAHFt9v3f2E69Gqfts+ranRiQ8YJs05OupyG39CjrRfO8CIoi5sYjXhfbOq9v Z9iw+X6rDoa0vRYCdSvs3+yjEeax3dNx9lAqJPB4lLtqmDdK/5DS =Se+m -----END PGP SIGNATURE----- --0DeNFJ2Po9QTkCER--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZrDy1lmEEy0rpnjW>