CVS commit: pkgsrc/www/chromium

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/chromium
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Mon, 28 Sep 2026 07:20:17 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Sep 28 07:20:17 UTC 2026

Modified Files:
        pkgsrc/www/chromium: distinfo
        pkgsrc/www/chromium/patches:
            patch-media_ffmpeg_scripts_build__ffmpeg.py
            patch-rollup_rust_bindings__napi_Cargo.toml
            patch-rollup_rust_bindings__napi_src_lib.rs

Log Message:
chromium: remove obviously wrong --target-os and --sysroot flags

Upstream seems to naively assume that everyone on aarch64 is
is cross-compiling with a Debian Linux sysroot ...

While here adjust some other patches for aarch64 to silence warnings.
Rust's NetBSD target is aarch64 not evbarm.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/chromium/distinfo
cvs rdiff -u -r1.26 -r1.27 \
    pkgsrc/www/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_Cargo.toml \
    pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_src_lib.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/chromium/distinfo
diff -u pkgsrc/www/chromium/distinfo:1.59 pkgsrc/www/chromium/distinfo:1.60
--- pkgsrc/www/chromium/distinfo:1.59   Tue Sep 22 13:41:17 2026
+++ pkgsrc/www/chromium/distinfo        Mon Sep 28 07:20:16 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2026/09/22 13:41:17 kikadf Exp $
+$NetBSD: distinfo,v 1.60 2026/09/28 07:20:16 tnn Exp $
 
 BLAKE2s (ahash-0.8.12.crate) = 157e4e2836883526fa391419f08c2aa4c932fb96ddf2b254bb436193691754c4
 SHA512 (ahash-0.8.12.crate) = 872e5fa0d1334abac96d10eca18f32c2b1a1e0b38671c132b6effd029e9f0147ddcef79f4d85c8baf0537ddfb8c39a85f61d073e1fb3143dba659a8385641e1b
@@ -1604,7 +1604,7 @@ SHA1 (patch-media_capture_video_video__c
 SHA1 (patch-media_capture_video_video__capture__device__client.cc) = b06ffccb3124f2b0805a0988ddaa0eaca73b7434
 SHA1 (patch-media_cdm_cdm__paths__unittest.cc) = c97dcb8d083372283454508ac5b9837ece4c1e88
 SHA1 (patch-media_cdm_library__cdm_cdm__paths.gni) = f7d82b1377a62f6c2b22c626387623179227f75d
-SHA1 (patch-media_ffmpeg_scripts_build__ffmpeg.py) = 73f34c2f12065e7a4a548e2f2576dc128a039d70
+SHA1 (patch-media_ffmpeg_scripts_build__ffmpeg.py) = 9097f666f401472aecf3bc8ec0f697e01ae090b2
 SHA1 (patch-media_ffmpeg_scripts_robo__lib_config.py) = b7bfabccf3d1bf9a86a64fa79fa9e7cb75fca819
 SHA1 (patch-media_gpu_chromeos_gl__image__processor__backend.cc) = 3b5e55db0093433c21e119ea44e047d266fa0974
 SHA1 (patch-media_gpu_chromeos_libyuv__image__processor__backend.cc) = f3c822cae876e565cb475558be5c3c316b7954e3
@@ -1766,8 +1766,8 @@ SHA1 (patch-remoting_host_webauthn_remot
 SHA1 (patch-remoting_protocol_webrtc__transport.cc) = 6be6e37347bdae4b365fdcdd60565ef46c8f4c32
 SHA1 (patch-remoting_protocol_webrtc__video__stream.cc) = 7be343d28af4aa776846822b3485e5e9f12793d7
 SHA1 (patch-remoting_signaling_ftl__host__device__id__provider.cc) = 468b2affd23a0a30af2a63d76a3bfbafe2169edc
-SHA1 (patch-rollup_rust_bindings__napi_Cargo.toml) = af46b5c65dcbd0714ccca2782988f89e4a8d175d
-SHA1 (patch-rollup_rust_bindings__napi_src_lib.rs) = 930763c6c3725b129b395a2a9d560c7c7996cba4
+SHA1 (patch-rollup_rust_bindings__napi_Cargo.toml) = 026582aa085d7a379dde3bceb496cb3f027ac10c
+SHA1 (patch-rollup_rust_bindings__napi_src_lib.rs) = eac53fcf867a908597bc6bed7e4dfc1a64d2938f
 SHA1 (patch-sandbox_BUILD.gn) = 870d879720dff5ecf34c1dbe77ec8bb1a7d2af65
 SHA1 (patch-sandbox_features.gni) = 00a58cedb89dbaf8fca390f250fae2afd20e77ae
 SHA1 (patch-sandbox_linux_BUILD.gn) = fffb5b4535d76cb64337d6997bfe9c8c10f1ab9f

Index: pkgsrc/www/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
diff -u pkgsrc/www/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py:1.26 pkgsrc/www/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py:1.27
--- pkgsrc/www/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py:1.26        Tue Sep 22 13:41:27 2026
+++ pkgsrc/www/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py     Mon Sep 28 07:20:17 2026
@@ -1,12 +1,8 @@
-$NetBSD: patch-media_ffmpeg_scripts_build__ffmpeg.py,v 1.26 2026/09/22 13:41:27 kikadf Exp $
+$NetBSD: patch-media_ffmpeg_scripts_build__ffmpeg.py,v 1.27 2026/09/28 07:20:17 tnn Exp $
 
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/ffmpeg/scripts/build_ffmpeg.py.orig  2026-09-14 22:17:16.000000000 +0000
+--- media/ffmpeg/scripts/build_ffmpeg.py.orig  2026-09-17 03:47:47.000000000 +0000
 +++ media/ffmpeg/scripts/build_ffmpeg.py
-@@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath(
+@@ -33,7 +33,7 @@ sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build
  SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
  
  sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build'))
@@ -15,7 +11,7 @@ $NetBSD: patch-media_ffmpeg_scripts_buil
  
  BRANDINGS = [
      'Chrome',
-@@ -43,6 +43,9 @@ BRANDINGS = [
+@@ -43,6 +43,9 @@ ARCH_MAP = {
  ARCH_MAP = {
      'android': ['ia32', 'x64', 'arm-neon', 'arm64'],
      'linux': ['ia32', 'x64', 'noasm-x64', 'arm-neon', 'arm64', 'riscv64'],
@@ -25,7 +21,7 @@ $NetBSD: patch-media_ffmpeg_scripts_buil
      'mac': ['x64', 'arm64'],
      'win': ['ia32', 'x64', 'arm64'],
  }
-@@ -124,7 +127,7 @@ def PrintAndCheckCall(argv, *args, **kwa
+@@ -124,7 +127,7 @@ def GetDsoName(target_os, dso_name, dso_version):
  
  
  def GetDsoName(target_os, dso_name, dso_version):
@@ -34,7 +30,7 @@ $NetBSD: patch-media_ffmpeg_scripts_buil
          return 'lib%s.so.%s' % (dso_name, dso_version)
      elif target_os == 'mac':
          return 'lib%s.%s.dylib' % (dso_name, dso_version)
-@@ -475,7 +478,7 @@ def BuildFFmpeg(target_os, target_arch, 
+@@ -475,7 +478,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
      # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
      # #warning which will be converted to an error via -Werror.
      # There is also no prctl.h
@@ -52,7 +48,7 @@ $NetBSD: patch-media_ffmpeg_scripts_buil
          parser.print_help()
          return 1
  
-@@ -686,7 +689,6 @@ def ConfigureAndBuild(target_arch, targe
+@@ -686,7 +689,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
          '--disable-faan',
          '--disable-alsa',
          '--disable-iamf',
@@ -60,7 +56,7 @@ $NetBSD: patch-media_ffmpeg_scripts_buil
  
  
          # Disable automatically detected external libraries. This prevents
-@@ -728,7 +730,7 @@ def ConfigureAndBuild(target_arch, targe
+@@ -728,7 +730,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
              '--optflags="-O2"',
          ])
  
@@ -69,7 +65,20 @@ $NetBSD: patch-media_ffmpeg_scripts_buil
          if target_arch == 'x64':
              if target_os == 'android':
                  configure_flags['Common'].extend([
-@@ -929,7 +931,7 @@ def ConfigureAndBuild(target_arch, targe
+@@ -822,12 +824,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+                         '--extra-ldflags=--target=aarch64-linux-gnu',
+                     ])
+ 
+-                configure_flags['Common'].extend([
+-                    '--target-os=linux',
+-                    '--sysroot=' +
+-                    os.path.join(CHROMIUM_ROOT_DIR,
+-                                 'build/linux/debian_bullseye_arm64-sysroot'),
+-                ])
+             configure_flags['Common'].extend([
+                 '--arch=aarch64',
+                 '--enable-armv8',
+@@ -929,7 +925,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
          # typically be the system one, so explicitly configure use of Clang's
          # ld.lld, to ensure that things like cross-compilation and LTO work.
          # This does not work for ia32 and is always used on mac.

Index: pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_Cargo.toml
diff -u pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_Cargo.toml:1.12 pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_Cargo.toml:1.13
--- pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_Cargo.toml:1.12        Tue Sep 22 13:41:29 2026
+++ pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_Cargo.toml     Mon Sep 28 07:20:17 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-rollup_rust_bindings__napi_Cargo.toml,v 1.12 2026/09/22 13:41:29 kikadf Exp $
+$NetBSD: patch-rollup_rust_bindings__napi_Cargo.toml,v 1.13 2026/09/28 07:20:17 tnn Exp $
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
@@ -20,7 +20,7 @@ $NetBSD: patch-rollup_rust_bindings__nap
  #     )
  # )
 -[target.'cfg(any(all(target_os = "linux", not(target_arch = "loongarch64"), not(all(target_arch = "riscv64", target_env = "musl")), not(target_env = "ohos")), all(target_os = "freebsd", 
not(target_arch = "aarch64"))))'.dependencies]
-+[target.'cfg(any(all(target_os = "linux", not(target_arch = "loongarch64"), not(all(target_arch = "riscv64", target_env = "musl")), not(target_env = "ohos")), all(target_os = "openbsd", 
not(target_arch = "aarch64")), all(target_os = "freebsd", not(target_arch = "aarch64")), all(target_os = "netbsd", not(target_arch = "evbarm"))))'.dependencies]
++[target.'cfg(any(all(target_os = "linux", not(target_arch = "loongarch64"), not(all(target_arch = "riscv64", target_env = "musl")), not(target_env = "ohos")), all(target_os = "openbsd", 
not(target_arch = "aarch64")), all(target_os = "freebsd", not(target_arch = "aarch64")), all(target_os = "netbsd", not(target_arch = "aarch64"))))'.dependencies]
  mimalloc-safe = { version = "0.1.58", features = ["local_dynamic_tls"] }
  
  # Disable architecture specific optimizations on aarch64 platforms
Index: pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_src_lib.rs
diff -u pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_src_lib.rs:1.12 pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_src_lib.rs:1.13
--- pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_src_lib.rs:1.12        Tue Sep 22 13:41:29 2026
+++ pkgsrc/www/chromium/patches/patch-rollup_rust_bindings__napi_src_lib.rs     Mon Sep 28 07:20:17 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-rollup_rust_bindings__napi_src_lib.rs,v 1.12 2026/09/22 13:41:29 kikadf Exp $
+$NetBSD: patch-rollup_rust_bindings__napi_src_lib.rs,v 1.13 2026/09/28 07:20:17 tnn Exp $
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
@@ -11,7 +11,7 @@ $NetBSD: patch-rollup_rust_bindings__nap
    not(all(target_os = "linux", target_env = "ohos")),
    not(all(target_os = "freebsd", target_arch = "aarch64")),
 +  not(all(target_os = "openbsd", target_arch = "aarch64")),
-+  not(all(target_os = "netbsd", target_arch = "evbarm")),
++  not(all(target_os = "netbsd", target_arch = "aarch64")),
    not(debug_assertions)
  ))]
  #[global_allocator]

Prev by Date: CVS commit: pkgsrc/databases/p5-DBI
Next by Date: CVS commit: pkgsrc/www/chromium
Previous by Thread: CVS commit: pkgsrc/databases/p5-DBI
Next by Thread: CVS commit: pkgsrc/www/chromium
Indexes:

Home | Main Index | Thread Index | Old Index