Re: pkg/60476: 2026Q2 NetBSD/amd64 gtk3+ binary package is built withoutwayland

The following reply was made to PR pkg/60476; it has been noted by GNATS.

From: Izumi Tsutsui <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: Re: pkg/60476: 2026Q2 NetBSD/amd64 gtk3+ binary package is built withoutwayland
Date: Fri, 7 Aug 2026 03:05:35 +0900

 > The proposed design is:
 > 
 > - Keep the existing logic for modular X11 unchanged.
 > 
 > - In graphics/MesaLib/features.mk, when using native X11 on NetBSD,
 >   determine MESALIB_SUPPORTS_EGL from HAVE_XORG_EGL if that variable
 >   is defined.
 > 
 > - Older NetBSD releases (10.x and prior) do not define HAVE_XORG_EGL.
 >   On those releases, fall back to HAVE_XORG_GLAMOR, because native
 >   libepoxy EGL support was conditional on GLAMOR in those versions.
 > 
 > - For non-NetBSD systems using native X11, retain the existing
 >   header-based detection unless there is a more appropriate
 >   platform-specific capability variable.
 
 If there is no objection I will commit following changes after
 pkgsrc-2026Q3 is branched.
 
 ```
 Index: x11/gtk3/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/gtk3/options.mk,v
 retrieving revision 1.36
 diff -u -p -d -r1.36 options.mk
 --- x11/gtk3/options.mk	27 May 2026 12:39:08 -0000	1.36
 +++ x11/gtk3/options.mk	6 Aug 2026 17:51:09 -0000
 @@ -11,11 +11,7 @@ PKG_SUGGESTED_OPTIONS+=	x11
  .endif
  .include "../../devel/wayland/platform.mk"
  .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 -# workaround for PR pkg/60295
 -.  if ${OPSYS} != "NetBSD" || ${X11_TYPE} != "native" || \
 -      exists(${X11BASE}/lib/modules/libglamoregl.so)
  PKG_SUGGESTED_OPTIONS+=	wayland
 -.  endif
  .endif
  PKG_SUGGESTED_OPTIONS+=	gtk3-atk-bridge cups
  PKG_SUGGESTED_OPTIONS+=	${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
 Index: inputmethod/ibus/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/inputmethod/ibus/Makefile,v
 retrieving revision 1.124
 diff -u -p -d -r1.124 Makefile
 --- inputmethod/ibus/Makefile	22 Jul 2026 17:14:57 -0000	1.124
 +++ inputmethod/ibus/Makefile	6 Aug 2026 17:51:09 -0000
 @@ -78,10 +78,7 @@ BUILDLINK_TRANSFORM+=	rm:-Wno-unused-but
  # wayland or not
  PLIST_VARS+=		wayland
  .include "../../devel/wayland/platform.mk"
 -# XXX PR pkg/60476
 -.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" && \
 -    (${OPSYS} != "NetBSD" || ${X11_TYPE} != "native" || \
 -     exists(${X11BASE}/lib/modules/libglamoregl.so))
 +.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
  CONFIGURE_ARGS+=	--enable-wayland
  PLIST.wayland=		yes
  .else
 Index: graphics/MesaLib/features.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/graphics/MesaLib/features.mk,v
 retrieving revision 1.2
 diff -u -p -d -r1.2 features.mk
 --- graphics/MesaLib/features.mk	10 Jul 2023 03:16:45 -0000	1.2
 +++ graphics/MesaLib/features.mk	6 Aug 2026 17:51:09 -0000
 @@ -28,7 +28,15 @@ MESALIB_SUPPORTS_XA?=		yes
  .    endif
  .  endif
  .else
 -.  if exists(${X11BASE}/include/EGL/egl.h)
 +.  if ${OPSYS} == "NetBSD"
 +.    if defined(HAVE_XORG_EGL)
 +MESALIB_SUPPORTS_EGL?=		${HAVE_XORG_EGL}
 +.    else
 +# NetBSD 10 and earlier built native libepoxy EGL support
 +# conditional on Xorg GLAMOR support.
 +MESALIB_SUPPORTS_EGL?=		${HAVE_XORG_GLAMOR:Uno}
 +.    endif
 +.  elif exists(${X11BASE}/include/EGL/egl.h)
  MESALIB_SUPPORTS_EGL?=		yes
  .  endif
  .  if exists(${X11BASE}/lib/libOSMesa.so)
 
 ```
 
 ---
 Izumi Tsutsui