www/iridium: update to 2023.07.115.1

freebsd · Jul 25, 2023 · 2f85e0a · 2f85e0a
1 parent 98ea947
commit 2f85e0a
Show file tree

Hide file tree

Showing 612 changed files with 5,273 additions and 13,235 deletions.
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	iridium
-PORTVERSION=	2023.04.112.2
-PORTREVISION=	2
+PORTVERSION=	2023.07.115.1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
 PKGNAMESUFFIX=	-browser
@@ -16,7 +15,7 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 PATCH_SITES=	https://nerd.hu/distfiles/
-PATCHFILES+=	disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch:-p1
+PATCHFILES+=	disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch:-p1
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
@@ -55,6 +54,7 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libexif.so:graphics/libexif \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
+		libdav1d.so:multimedia/dav1d \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
@@ -71,9 +71,9 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic
 
-USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv:wchar_t jpeg \
-		localbase:ldflags ninja perl5 pkgconfig python:build qt:5 shebangfix \
-		tar:xz xorg
+USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
+		iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
+		python:build qt:5 shebangfix tar:xz xorg
 
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
@@ -104,6 +104,7 @@ GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
 		enable_remoting=false \
+		enable_rust=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
@@ -123,7 +124,8 @@ GN_ARGS+=	clang_use_chrome_plugins=false \
 		use_system_libjpeg=true \
 		use_udev=false \
 		extra_cxxflags="${CXXFLAGS}" \
-		extra_ldflags="${LDFLAGS}"
+		extra_ldflags="${LDFLAGS}" \
+		ffmpeg_branding="${FFMPEG_BRAND}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
@@ -151,10 +153,10 @@ ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
-CODECS_VARS=		GN_ARGS+=ffmpeg_branding="Chrome" \
-			GN_ARGS+=proprietary_codecs=true
-CODECS_VARS_OFF=	GN_ARGS+=ffmpeg_branding="Chromium" \
-			GN_ARGS+=proprietary_codecs=false
+CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
+			FFMPEG_BRAND="Chrome"
+CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
+			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
@@ -202,8 +204,8 @@ SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
-.if ${COMPILER_VERSION} < 150
-LLVM_DEFAULT=		15
+.if ${COMPILER_VERSION} < 160
+LLVM_DEFAULT=		16
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@@ -216,13 +218,24 @@ BINARY_ALIAS+=		ar=/usr/bin/llvm-ar \
 			nm=/usr/bin/llvm-nm
 .endif
 
-# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - map ffmpeg target to ${ARCH}
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
-.else
+FFMPEG_TARGET=	arm64
+.elif ${ARCH} == amd64
+BUILD_DEPENDS+=	nasm:devel/nasm
+PLIST_SUB+=	NOT_AARCH64=""
+FFMPEG_TARGET=	x64
+.elif ${ARCH} == i386
+BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
+FFMPEG_TARGET=	ia32
 .endif
 
+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)
 LDFLAGS_i386=	-Wl,-znotext
 
@@ -244,13 +257,16 @@ pre-configure:
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
-		flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
-		libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
+		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
+		libwebp libxml libxslt openh264 opus snappy || ${FALSE}
 	# Iridium uses an unreleased version of FFmpeg, so configure it
-.for brand in Chrome Chromium
-	${CP} -R \
-		${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
-		${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
+	cd ${WRKSRC}/third_party/ffmpeg && \
+		${PYTHON_CMD} chromium/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
 
 do-configure:

diff --git a/www/iridium/distinfo b/www/iridium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1682369682
-SHA256 (iridium-browser-2023.04.112.2.tar.xz) = 7d1baae65e0087045d3da89bd5e2e4967d733e202707b4abfdab02ad5f87c722
-SIZE (iridium-browser-2023.04.112.2.tar.xz) = 1427167196
-SHA256 (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = c8cc1c6a6f735adfe807da0109349ebab87e0eff77f593925757da34bb31f38c
-SIZE (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = 4177
+TIMESTAMP = 1690214890
+SHA256 (iridium-browser-2023.07.115.1.tar.xz) = 3498f2018ad4d68ddce4f12224923b6eb5ae9b83fa4e912283c6e486b8a887d3
+SIZE (iridium-browser-2023.07.115.1.tar.xz) = 1416249736
+SHA256 (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = ea4bfcac8636c65d8933236b89429699a51c77837fa04863cb40f8c7add833b4
+SIZE (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = 3559
diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2023-04-22 17:45:15 UTC
+--- BUILD.gn.orig	2023-07-24 14:27:53 UTC
 +++ BUILD.gn
-@@ -60,7 +60,7 @@ declare_args() {
+@@ -61,7 +61,7 @@ declare_args() {
    root_extra_deps = []
  }
 
@@ -9,49 +9,49 @@
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -90,7 +90,6 @@ group("gn_all") {
-     "//codelabs",
-     "//components:components_unittests",
-     "//components/gwp_asan:gwp_asan_unittests",
--    "//infra/orchestrator:orchestrator_all",
-     "//net:net_unittests",
-     "//sandbox:sandbox_unittests",
-     "//services:services_unittests",
-@@ -423,7 +422,7 @@ group("gn_all") {
+@@ -95,7 +95,6 @@ group("gn_all") {
+       "//codelabs",
+       "//components:components_unittests",
+       "//components/gwp_asan:gwp_asan_unittests",
+-      "//infra/orchestrator:orchestrator_all",
+       "//net:net_unittests",
+       "//sandbox:sandbox_unittests",
+       "//services:services_unittests",
+@@ -419,7 +418,7 @@ group("gn_all") {
+       }
      }
-   }
 
--  if (is_linux || is_chromeos || is_android) {
-+  if ((is_linux && !is_bsd) || is_chromeos || is_android) {
-     deps += [
-       "//third_party/breakpad:breakpad_unittests",
-       "//third_party/breakpad:core-2-minidump",
-@@ -622,6 +621,15 @@ group("gn_all") {
+-    if (is_linux || is_chromeos || is_android) {
++    if ((is_linux && !is_bsd) || is_chromeos || is_android) {
+       deps += [
+         "//third_party/breakpad:breakpad_unittests",
+         "//third_party/breakpad:core-2-minidump",
+@@ -619,6 +618,15 @@ group("gn_all") {
+       }
      }
-   }
 
-+  if (is_bsd) {
-+    deps -= [
-+      "//third_party/breakpad:dump_syms($host_toolchain)",
-+      "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
-+      "//third_party/breakpad:minidump_dump($host_toolchain)",
-+      "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
-+    ]
-+  }
++    if (is_bsd) {
++      deps -= [
++        "//third_party/breakpad:dump_syms($host_toolchain)",
++        "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
++        "//third_party/breakpad:minidump_dump($host_toolchain)",
++        "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
++      ]
++    }
 +
-   if (is_mac) {
-     deps += [
-       "//third_party/breakpad:crash_inspector",
-@@ -670,7 +678,7 @@ group("gn_all") {
-         host_os == "win") {
-       deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+     if (is_mac) {
+       deps += [
+         "//third_party/breakpad:dump_syms",
+@@ -665,7 +673,7 @@ group("gn_all") {
+           host_os == "win") {
+         deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+       }
+-    } else if (!is_android && !is_ios && !is_fuchsia) {
++    } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
+       deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
--  } else if (!is_android && !is_ios && !is_fuchsia) {
-+  } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
-     deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
-   }
 
-@@ -1093,7 +1101,7 @@ if (!is_ios) {
+@@ -1094,7 +1102,7 @@ if (!is_ios && !is_cronet_build) {
      ]
    }
 
@@ -60,7 +60,7 @@
      # WPT Webdriver tests runner
      # chrome/test/chromedriver/test/run_webdriver_tests.py
      script_test("webdriver_wpt_tests") {
-@@ -1193,7 +1201,7 @@ if (!is_ios) {
+@@ -1194,7 +1202,7 @@ if (!is_ios && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
 
@@ -69,7 +69,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1202,7 +1210,7 @@ if (!is_ios) {
+@@ -1203,7 +1211,7 @@ if (!is_ios && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
@@ -78,7 +78,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
-@@ -1670,7 +1678,7 @@ group("chromium_builder_perf") {
+@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
 

diff --git a/www/iridium/files/patch-ash_display_mirror__window__controller.cc b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2022-12-01 10:35:46 UTC
+--- ash/display/mirror_window_controller.cc.orig	2023-07-24 14:27:53 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
        if (!base::Contains(display_info_list, iter->first,
                            &display::ManagedDisplayInfo::id)) {
          CloseAndDeleteHost(iter->second, true);

diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2023-04-22 17:45:15 UTC
+--- base/BUILD.gn.orig	2023-07-24 14:27:53 UTC
 +++ base/BUILD.gn
-@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -198,7 +198,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"
-@@ -1093,11 +1093,23 @@ component("base") {
+@@ -1099,11 +1099,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) {
      sources += [
        "allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1125,7 +1137,7 @@ component("base") {
+@@ -1131,7 +1143,7 @@ component("base") {
        ]
        configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
      }
@@ -43,7 +43,7 @@
        sources += [
          "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
          "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1166,7 +1178,7 @@ component("base") {
+@@ -1172,7 +1184,7 @@ component("base") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -52,7 +52,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -2107,6 +2119,43 @@ component("base") {
+@@ -2130,6 +2142,43 @@ component("base") {
      }
    }
 
@@ -96,7 +96,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2202,7 +2251,7 @@ component("base") {
+@@ -2238,7 +2287,7 @@ component("base") {
    }
 
    if (dep_libevent) {
@@ -105,7 +105,7 @@
    }
 
    if (use_libevent) {
-@@ -3470,7 +3519,7 @@ test("base_unittests") {
+@@ -3552,7 +3601,7 @@ test("base_unittests") {
      ]
    }
 
@@ -114,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3519,7 +3568,7 @@ test("base_unittests") {
+@@ -3601,7 +3650,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -123,7 +123,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3530,7 +3579,7 @@ test("base_unittests") {
+@@ -3612,7 +3661,7 @@ test("base_unittests") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -132,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -3751,7 +3800,7 @@ test("base_unittests") {
+@@ -3837,7 +3886,7 @@ test("base_unittests") {
      }
    }
 

diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig	2023-03-13 07:33:08 UTC
+--- base/allocator/dispatcher/tls.h.orig	2023-07-24 14:27:53 UTC
 +++ base/allocator/dispatcher/tls.h
-@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
        partition_alloc::PartitionPageSize();
  #elif BUILDFLAG(IS_APPLE)
    constexpr static size_t AllocationChunkSize = 16384;

diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator.h.orig	2022-12-06 08:09:13 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig	2023-07-24 14:27:53 UTC
 +++ base/allocator/partition_allocator/page_allocator.h
-@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
+@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
  // recommitted. Do not assume that this will not change over time.
  constexpr PA_COMPONENT_EXPORT(
      PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/page_allocator_constants.h.orig	2022-10-05 07:34:01 UTC
+--- base/allocator/partition_allocator/page_allocator_constants.h.orig	2023-07-24 14:27:53 UTC
 +++ base/allocator/partition_allocator/page_allocator_constants.h
 @@ -25,7 +25,7 @@
  // elimination.
@@ -28,7 +28,7 @@
    // initialize cache.
    size_t size = page_characteristics.size.load(std::memory_order_relaxed);
 @@ -141,7 +141,7 @@ SystemPageShift() {
- PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
+ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
  SystemPageSize() {
  #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
 -    (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))