pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

chromium: make wayland support optional



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Fri Jun 19 03:00:44 2026 +0200
Changeset:	a846798df38fac415d421b72ab9110aea71d983d

Modified Files:
	chromium/Makefile
	chromium/options.mk

Log Message:
chromium: make wayland support optional

Fix build on NetBSD-10: disable wayland support with native X11_TYPE

../../ui/ozone/platform/wayland/host/drm_syncobj_ioctl_wrapper.cc:50:10: error: use of undeclared identifier 'drmSyncobjEventfd'
   50 |   return drmSyncobjEventfd(fd_.get(), handle, point, ev_fd, flags);
      |          ^~~~~~~~~~~~~~~~~

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

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

diffstat:
 chromium/Makefile   |  4 ----
 chromium/options.mk | 20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diffs:
diff --git a/chromium/Makefile b/chromium/Makefile
index 2672c69003..baad485305 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -201,7 +201,6 @@ GN_ARGS+=	use_sysroot=false
 GN_ARGS+=	use_system_freetype=true
 GN_ARGS+=	use_system_harfbuzz=true
 GN_ARGS+=	use_system_libdrm=true
-GN_ARGS+=	use_system_libffi=true
 GN_ARGS+=	use_system_libjpeg=true #libjpeg-turbo
 GN_ARGS+=	use_thin_lto=false
 GN_ARGS+=	use_udev=true
@@ -390,14 +389,11 @@ do-install:
 .include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"
-.include "../../devel/input-headers/buildlink3.mk"
 .include "../../devel/libepoll-shim/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libudev-bsd/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../devel/wayland/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/chromium/options.mk b/chromium/options.mk
index 46614b21f5..ec3c0c8f8f 100644
--- a/chromium/options.mk
+++ b/chromium/options.mk
@@ -3,7 +3,7 @@
 PKG_OPTIONS_VAR=		PKG_OPTIONS.chromium
 PKG_OPTIONS_REQUIRED_GROUPS=	audio
 PKG_OPTIONS_GROUP.audio=	alsa pulseaudio sunaudio
-PKG_SUPPORTED_OPTIONS+=		debug
+PKG_SUPPORTED_OPTIONS+=		debug wayland
 
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		sunaudio debug
@@ -11,6 +11,15 @@ PKG_SUGGESTED_OPTIONS+=		sunaudio debug
 PKG_SUGGESTED_OPTIONS+=		pulseaudio
 .endif
 
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+.  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 110000 && ${X11_TYPE} == "native"
+# Need libdrm >= 2.4.116 for wayland support
+.  else
+PKG_SUGGESTED_OPTIONS+=	wayland
+.  endif
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msunaudio)
@@ -35,6 +44,15 @@ WITH_PA=	no
 GN_ARGS+=	use_pulseaudio=false
 .endif
 
+.if !empty(PKG_OPTIONS:Mwayland)
+GN_ARGS+=	use_system_libffi=true
+.include "../../devel/input-headers/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/wayland/buildlink3.mk"
+.else
+GN_ARGS+=	ozone_platform_wayland=false
+.endif
+
 .if !empty(PKG_OPTIONS:Mdebug)
 #BUILDTYPE=		Debug
 #GN_ARGS+=		is_debug=true


Home | Main Index | Thread Index | Old Index