chromium{,-next}: remove i386 and OpenBSD support, fix llvm major version

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: chromium{,-next}: remove i386 and OpenBSD support, fix llvm major version
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 3 Feb 2025 11:06:37 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon Feb 3 12:05:15 2025 +0100
Changeset:	739227356a351c4b3e1e085edf9ccc7fabddf579

Modified Files:
	chromium-next/Makefile
	chromium-next/TODO
	chromium/Makefile
	chromium/TODO
	chromium/distinfo
	chromium/options.mk
	chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc

Log Message:
chromium{,-next}: remove i386 and OpenBSD support, fix llvm major version

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=739227356a351c4b3e1e085edf9ccc7fabddf579

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

diffstat:
 chromium-next/Makefile                              | 19 +++++++------------
 chromium-next/TODO                                  |  6 ++----
 chromium/Makefile                                   | 21 +++++++--------------
 chromium/TODO                                       |  5 ++---
 chromium/distinfo                                   |  2 +-
 chromium/options.mk                                 | 10 +---------
 ...er_renderer__host_render__process__host__impl.cc |  4 ++++
 7 files changed, 24 insertions(+), 43 deletions(-)

diffs:
diff --git a/chromium-next/Makefile b/chromium-next/Makefile
index a59e16fd5a..9f7dd95e09 100644
--- a/chromium-next/Makefile
+++ b/chromium-next/Makefile
@@ -16,6 +16,9 @@ DISTFILES+=			${DISTNAME}${EXTRACT_SUFX_C}
 A_VERSION=			130.0
 GITHUB_SUBMODULES=		kikadf chromium-audioio v${A_VERSION} media/audio/audioio
 
+# LLVM_MAJOR_VERSION
+LLVM_MV=			19
+
 MAINTAINER=			kikadf.01%gmail.com@localhost
 HOMEPAGE=			https://www.chromium.org/Home
 COMMENT=			Open source web browser
@@ -53,17 +56,13 @@ DEPENDS+=			xdg-utils-[0-9]*:../../misc/xdg-utils
 .include "../../mk/compiler.mk"
 
 # Supported platforms, synced with rust/platform.mk
-.for c_arch in x86_64 i386 aarch64
+.for c_arch in x86_64 aarch64
 ONLY_FOR_PLATFORM+=		NetBSD-1[0-9].*-${c_arch}
 ONLY_FOR_PLATFORM+=		Linux-*-${c_arch}
-.endfor
-
-.for c_arch in x86_64 aarch64
 ONLY_FOR_PLATFORM+=		Darwin-*-${c_arch}
+ONLY_FOR_PLATFORM+=		FreeBSD-*-${c_arch}
 .endfor
 
-ONLY_FOR_PLATFORM+=		FreeBSD-*-x86_64
-
 # Workaround for brotli and other commands.
 #BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
@@ -158,6 +157,7 @@ GN_ARGS+=	use_kerberos=false
 GN_ARGS+=	use_lld=false
 GN_ARGS+=	use_partition_alloc=true
 GN_ARGS+=	use_partition_alloc_as_malloc=false
+GN_ARGS+=	use_sndio=false
 GN_ARGS+=	use_sysroot=false
 GN_ARGS+=	use_system_freetype=true
 GN_ARGS+=	use_system_harfbuzz=true
@@ -170,7 +170,7 @@ GN_ARGS+=	v8_enable_cet_ibt=true
 
 # flags
 CFLAGS+=	-fno-stack-protector
-CFLAGS+=	-isystem${PREFIX}/lib/clang/17/include # third_party/zlib with clang
+CFLAGS+=	-isystem${PREFIX}/lib/clang/${LLVM_MV}/include # third_party/zlib with clang
 CFLAGS+=	-Wno-error=unused-command-line-argument
 CFLAGS+=	-Wno-unknown-warning-option
 
@@ -199,10 +199,6 @@ FFMPEG_TARGET=		arm64
 .elif ${MACHINE_ARCH} == "x86_64"
 PLIST.swiftshader=	yes
 FFMPEG_TARGET=		x64
-.elif ${MACHINE_ARCH} == "i386"
-EXTRA_LDFLAGS+=		-Wl,--no-keep-memory
-PLIST.swiftshader=	yes
-FFMPEG_TARGET=		ia32
 .endif
 
 GN_ARGS+=	extra_cxxflags=\"${EXTRA_CXXFLAGS}\" \
@@ -381,5 +377,4 @@ BUILDLINK_TRANSFORM+=	l:pci:pciutils
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chromium-next/TODO b/chromium-next/TODO
index 5946e48353..e611a939c9 100644
--- a/chromium-next/TODO
+++ b/chromium-next/TODO
@@ -1,11 +1,10 @@
 To Do:
 
-0) Build on NetBSD-10 amd64, should work on OpenBSD and FreeBSD
+0) Build on NetBSD-10 amd64
 
 1) Audio backends
  a) NetBSD uses sunaudio (https://github.com/kikadf/chromium-audioio)
- b) OpenBSD uses sndio
- c) FreeBSD uses pulseaudio
+ b) FreeBSD uses pulseaudio
 
 If pulseaudio not run, chromium can't start it, so no sound:
 VERBOSE1:pulse_util.cc(261)] Failed to connect to the context. Error: Connection refused
@@ -16,4 +15,3 @@ This is the workaround, see the files/chromium.sh.in launch wrapper.
 
 2) HID doesn't work on NetBSD.
 NOTE: For this OpenBSD uses libudev-openbsd, FreeBSD uses devd.
-
diff --git a/chromium/Makefile b/chromium/Makefile
index 161a6c3744..a3d2653b50 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -16,6 +16,9 @@ DISTFILES+=			${PROFILE_DISTFILES}
 A_VERSION=			130.0
 GITHUB_SUBMODULES=		kikadf chromium-audioio v${A_VERSION} media/audio/audioio
 
+# LLVM_MAJOR_VERSION
+LLVM_MV=			18
+
 MAINTAINER=			kikadf.01%gmail.com@localhost
 #MAINTAINER=			ryoon%NetBSD.org@localhost
 HOMEPAGE=			https://www.chromium.org/Home
@@ -46,8 +49,6 @@ TOOL_DEPENDS+=			${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 TOOL_DEPENDS+=			${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
 TOOL_DEPENDS+=			${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply
 TOOL_DEPENDS+=			nodejs-[0-9]*:../../lang/nodejs
-#TOOL_DEPENDS+=			openjdk11-[0-9]*:../../lang/openjdk11
-#TOOL_DEPENDS+=			clang-[0-9]*:../../lang/clang # clang-format
 TOOL_DEPENDS+=			rust-bindgen-[0-9]*:../../devel/rust-bindgen
 
 DEPENDS+=			xdg-utils-[0-9]*:../../misc/xdg-utils
@@ -56,17 +57,13 @@ DEPENDS+=			xdg-utils-[0-9]*:../../misc/xdg-utils
 .include "../../mk/compiler.mk"
 
 # Supported platforms, synced with rust/platform.mk
-.for c_arch in x86_64 i386 aarch64
+.for c_arch in x86_64 aarch64
 ONLY_FOR_PLATFORM+=		NetBSD-1[0-9].*-${c_arch}
 ONLY_FOR_PLATFORM+=		Linux-*-${c_arch}
-.endfor
-
-.for c_arch in x86_64 aarch64
 ONLY_FOR_PLATFORM+=		Darwin-*-${c_arch}
+ONLY_FOR_PLATFORM+=		FreeBSD-*-${c_arch}
 .endfor
 
-ONLY_FOR_PLATFORM+=		FreeBSD-*-x86_64
-
 # Workaround for brotli and other commands.
 #BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
@@ -159,6 +156,7 @@ GN_ARGS+=	use_kerberos=false
 GN_ARGS+=	use_lld=false
 GN_ARGS+=	use_partition_alloc=true
 GN_ARGS+=	use_partition_alloc_as_malloc=false
+GN_ARGS+=	use_sndio=false
 GN_ARGS+=	use_sysroot=false
 GN_ARGS+=	use_system_freetype=true
 GN_ARGS+=	use_system_harfbuzz=true
@@ -171,7 +169,7 @@ GN_ARGS+=	v8_enable_cet_ibt=true
 
 # flags
 CFLAGS+=	-fno-stack-protector
-CFLAGS+=	-isystem${PREFIX}/lib/clang/17/include # third_party/zlib with clang
+CFLAGS+=	-isystem${PREFIX}/lib/clang/${LLVM_MV}/include # third_party/zlib with clang
 CFLAGS+=	-Wno-error=unused-command-line-argument
 CFLAGS+=	-Wno-unknown-warning-option
 
@@ -200,10 +198,6 @@ FFMPEG_TARGET=		arm64
 .elif ${MACHINE_ARCH} == "x86_64"
 PLIST.swiftshader=	yes
 FFMPEG_TARGET=		x64
-.elif ${MACHINE_ARCH} == "i386"
-EXTRA_LDFLAGS+=		-Wl,--no-keep-memory
-PLIST.swiftshader=	yes
-FFMPEG_TARGET=		ia32
 .endif
 
 GN_ARGS+=	extra_cxxflags=\"${EXTRA_CXXFLAGS}\" \
@@ -377,5 +371,4 @@ BUILDLINK_TRANSFORM+=	l:pci:pciutils
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chromium/TODO b/chromium/TODO
index 6feab70900..cb9885ae70 100644
--- a/chromium/TODO
+++ b/chromium/TODO
@@ -1,11 +1,10 @@
 To Do:
 
-0) Build on NetBSD-10 amd64, should work on OpenBSD and FreeBSD
+0) Build on NetBSD-10 amd64
 
 1) Audio backends
  a) NetBSD uses sunaudio (https://github.com/kikadf/chromium-audioio)
- b) OpenBSD uses sndio
- c) FreeBSD uses pulseaudio
+ b) FreeBSD uses pulseaudio
 
 If pulseaudio not run, chromium can't start it, so no sound:
 VERBOSE1:pulse_util.cc(261)] Failed to connect to the context. Error: Connection refused
diff --git a/chromium/distinfo b/chromium/distinfo
index 725854983d..8c9a9ea4c8 100644
--- a/chromium/distinfo
+++ b/chromium/distinfo
@@ -668,7 +668,7 @@ SHA1 (patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc)
 SHA1 (patch-content_browser_renderer__host_delegated__frame__host.cc) = f82807c5d354852860c90075cb01b45e82e99600
 SHA1 (patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc) = c25b3137528cad4f5a7561412d7a5fdbd35b173f
 SHA1 (patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc) = 4db24342c9c322e120ff060bd9a1c5fec9af2def
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl.cc) = 0f57cdeb5b90412755ff17e22e4bc1fda3d0f686
+SHA1 (patch-content_browser_renderer__host_render__process__host__impl.cc) = cbd1120f48ef000498ce4d071f49d61f5271d8c1
 SHA1 (patch-content_browser_renderer__host_render__process__host__impl.h) = c49458aa4c77ad19a1a54df586dbc2d969ef9fb1
 SHA1 (patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc) = b7184af29baca7e84b096b1ed73032f5192e57b3
 SHA1 (patch-content_browser_renderer__host_render__view__host__impl.cc) = dad13b383b47eab092f191290b16400db25a275d
diff --git a/chromium/options.mk b/chromium/options.mk
index 94cbc58252..c8d5dde95c 100644
--- a/chromium/options.mk
+++ b/chromium/options.mk
@@ -2,13 +2,11 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.chromium
 PKG_OPTIONS_REQUIRED_GROUPS=	audio
-PKG_OPTIONS_GROUP.audio=	alsa pulseaudio sndio sunaudio
+PKG_OPTIONS_GROUP.audio=	alsa pulseaudio sunaudio
 PKG_SUPPORTED_OPTIONS+=		debug
 
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		sunaudio
-.elif ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+=		sndio
 .else
 PKG_SUGGESTED_OPTIONS+=		pulseaudio
 .endif
@@ -37,12 +35,6 @@ WITH_PA=	no
 GN_ARGS+=	use_pulseaudio=false
 .endif
 
-.if !empty(PKG_OPTIONS:Msndio)
-GN_ARGS+=	use_sndio=true
-.else
-GN_ARGS+=	use_sndio=false
-.endif
-
 .if !empty(PKG_OPTIONS:Mdebug)
 BUILDTYPE=		Debug
 GN_ARGS+=		is_debug=true
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
index 432142096c..03a2743795 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,5 +1,9 @@
 $NetBSD$
 
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
 --- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-02-01 12:26:17.880666258 +0100
 +++ content/browser/renderer_host/render_process_host_impl.cc
 @@ -220,7 +220,7 @@
Prev by Date: rust184: fix build on big-endian aarch64 by patching the new line-index crate.
Next by Date: Update yed to 3.25
Previous by Thread: rust184: fix build on big-endian aarch64 by patching the new line-index crate.
Next by Thread: Update yed to 3.25
Indexes:
Home | Main Index | Thread Index | Old Index