| raw e-mail | index | archive | help
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index b6c560def878..8ccd745771bb 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,10 +1,14 @@
PORTNAME= chromium
-PORTVERSION= 124.0.6367.207
+PORTVERSION= 126.0.6478.61
+PULSEMV= 16
+PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
- https://nerd.hu/distfiles/:external
+ https://nerd.hu/distfiles/:external \
+ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external
+ chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external \
+ pulseaudio-${PULSEV}.tar.gz:pulseaudio
MAINTAINER= chromium@FreeBSD.org
COMMENT= Google web browser based on WebKit
@@ -34,8 +38,10 @@ 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 \
@@ -122,10 +128,15 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libffi=true \
use_system_libjpeg=true \
use_udev=false \
- extra_cxxflags="${CXXFLAGS}" \
+ extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \
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
@@ -140,10 +151,8 @@ 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 SNDIO
+OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE
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
@@ -153,12 +162,6 @@ 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 \
@@ -202,18 +205,6 @@ 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
-
-# With SNDIO=on we exclude audio_manager_linux from the build (see
-# media/audio/BUILD.gn) and use audio_manager_openbsd which does not
-# support falling back to ALSA or PulseAudio.
-SNDIO_PREVENTS= ALSA PULSEAUDIO
-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
@@ -229,8 +220,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif
-.if ${COMPILER_VERSION} < 170
-LLVM_DEFAULT= 17
+.if ${COMPILER_VERSION} < 180
+LLVM_DEFAULT= 18
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@@ -258,7 +249,7 @@ PLIST_SUB+= NOT_AARCH64=""
FFMPEG_TARGET= ia32
.endif
-FFMPEG_BDIR= ${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
# Allow relocations against read-only segments (override lld default)
@@ -296,14 +287,15 @@ pre-configure:
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus || ${FALSE}
# Chromium uses an unreleased version of FFmpeg, so configure it
- cd ${WRKSRC}/third_party/ffmpeg && \
- ${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
+ cd ${WRKSRC}/media/ffmpeg && \
+ ${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
--config-only --branding=${FFMPEG_BRAND}
cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
${MKDIR} ${FFMPEG_CDIR}
.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
do-configure:
# GN generator bootstrapping and generating ninja files
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 559acaf6b434..333f3eee8ad8 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1715673268
-SHA256 (chromium-124.0.6367.207.tar.xz) = 6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5
-SIZE (chromium-124.0.6367.207.tar.xz) = 3450794132
-SHA256 (chrome-linux-124.0.6367.207-llvm17.profdata.tar.xz) = 43953cf8958c1f8d6b700635a4d209fe27ea4487e26ac12bc5f2ee56c28cb0c5
-SIZE (chrome-linux-124.0.6367.207-llvm17.profdata.tar.xz) = 30059564
-SHA256 (chromium-124.0.6367.207-testdata.tar.xz) = d30386a73719a64fdd191f7b51709185e4d3fc49888b04a390506d4370e69b06
-SIZE (chromium-124.0.6367.207-testdata.tar.xz) = 277899644
+TIMESTAMP = 1718634893
+SHA256 (chromium-126.0.6478.61.tar.xz) = 4b4075b7885d212265053f1d87ca31496f21bbf6d2a3c5b0dbec153f6ed0f990
+SIZE (chromium-126.0.6478.61.tar.xz) = 4165076884
+SHA256 (chrome-linux-126.0.6478.61-llvm17.profdata.tar.xz) = 65e7bd8319196871cc4284608c02d39e5a699d7db93b81404604060f9688ace2
+SIZE (chrome-linux-126.0.6478.61-llvm17.profdata.tar.xz) = 30469864
+SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
+SIZE (pulseaudio-16.1.tar.gz) = 2763111
+SHA256 (chromium-126.0.6478.61-testdata.tar.xz) = e1d7d4ee8dbcb7c416e7a98d8dd4f2d1bfb6e265fa171e599f5e42c31c3c2879
+SIZE (chromium-126.0.6478.61-testdata.tar.xz) = 278952804
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index e599afc55ff6..6df3122a0e71 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2024-04-19 13:02:56 UTC
+--- BUILD.gn.orig 2024-06-17 12:56:06 UTC
+++ BUILD.gn
-@@ -64,7 +64,7 @@ declare_args() {
+@@ -65,7 +65,7 @@ declare_args() {
root_extra_deps = []
}
@@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -96,7 +96,6 @@ group("gn_all") {
+@@ -97,7 +97,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
-@@ -427,7 +426,7 @@ group("gn_all") {
+@@ -428,7 +427,7 @@ group("gn_all") {
}
}
@@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -627,6 +626,15 @@ group("gn_all") {
+@@ -624,6 +623,15 @@ group("gn_all") {
}
}
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
-@@ -673,7 +681,7 @@ group("gn_all") {
+@@ -670,7 +678,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1094,7 +1102,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1090,7 +1098,7 @@ if (use_blink && !is_cronet_build) {
]
}
diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
index d675abdb9186..6683ac0c2578 100644
--- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,8 +1,8 @@
---- apps/ui/views/app_window_frame_view.cc.orig 2024-01-30 07:53:34 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig 2024-06-17 12:56:06 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
// complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 111ebfe4e412..73cfec037691 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig 2024-04-19 13:02:56 UTC
+--- base/BUILD.gn.orig 2024-06-17 12:56:06 UTC
+++ base/BUILD.gn
@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
@@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
-@@ -1131,11 +1131,23 @@ component("base") {
+@@ -1142,11 +1142,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -34,7 +34,7 @@
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1155,7 +1167,7 @@ component("base") {
+@@ -1166,7 +1178,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2113,6 +2125,22 @@ component("base") {
+@@ -2126,6 +2138,22 @@ component("base") {
]
}
@@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
-@@ -2249,6 +2277,33 @@ component("base") {
+@@ -2271,6 +2299,33 @@ component("base") {
}
}
@@ -100,7 +100,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
-@@ -2259,7 +2314,7 @@ component("base") {
+@@ -2281,7 +2336,7 @@ component("base") {
}
if (dep_libevent) {
@@ -109,7 +109,7 @@
}
if (use_libevent) {
-@@ -3072,7 +3127,7 @@ if (is_apple) {
+@@ -3094,7 +3149,7 @@ if (is_apple) {
}
}
@@ -118,7 +118,7 @@
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
-@@ -3716,7 +3771,7 @@ test("base_unittests") {
+@@ -3743,7 +3798,7 @@ test("base_unittests") {
]
}
@@ -127,7 +127,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3743,7 +3798,7 @@ test("base_unittests") {
+@@ -3770,7 +3825,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -136,7 +136,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3754,7 +3809,7 @@ test("base_unittests") {
+@@ -3781,7 +3836,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -145,7 +145,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -4022,7 +4077,7 @@ test("base_unittests") {
+@@ -4049,7 +4104,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
index 4846c23803fd..895ef040f733 100644
--- a/www/chromium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig 2024-04-19 13:02:56 UTC
+--- base/allocator/dispatcher/tls.h.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/dispatcher/tls.h
-@@ -76,7 +76,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -77,7 +77,7 @@ struct BASE_EXPORT MMapAllocator {
constexpr static size_t AllocationChunkSize = 16384;
#elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
constexpr static size_t AllocationChunkSize = 16384;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index d9e57c421e1a..48db51a06ad6 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-06-17 12:56:06 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -33,7 +33,7 @@ if (is_nacl) {
use_large_empty_slot_span_ring = is_mac
@@ -9,7 +9,7 @@
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
-@@ -351,7 +351,7 @@ declare_args() {
+@@ -373,7 +373,7 @@ declare_args() {
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.
enable_pkeys =
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index 6c1f761e5029..8826075eedc3 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-06-17 12:56:06 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -851,7 +851,7 @@ if (is_clang_or_gcc) {
+@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
index 76b0580b3f89..2c2562fa05d4 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-05-21 18:07:39 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@@ -9,12 +9,12 @@
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges
-@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) {
+@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) {
return AslrAddress(0x20000000ULL);
}
-
-- #elif BUILDFLAG(IS_LINUX)
-+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #elif defined(ARCH_CPU_ARM64)
+- #if BUILDFLAG(IS_LINUX)
*** 15934 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?>