pkgsrc-Changes archive

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

CVS commit: pkgsrc/x11/gtk3



Module Name:    pkgsrc
Committed By:   nia
Date:           Wed May 27 12:39:08 UTC 2026

Modified Files:
        pkgsrc/x11/gtk3: options.mk

Log Message:
gtk3: Make building wayland support conditional on GLAMOREGL on NetBSD.

While this seems... weird, at best, due to Historical Reasons
building libEGL was dependent on building the X server with GLAMOR
support in NetBSD. This is no longer true, but some problems linger
(e.g. with libepoxy in the base system).

As a special hack, for NetBSD with native X only, disable Wayland
support if the GLAMOR extension isn't enabled.

PR pkg/60295 x11/gtk3 does not build on NetBSD/macppc


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/gtk3/options.mk

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

Modified files:

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.35 pkgsrc/x11/gtk3/options.mk:1.36
--- pkgsrc/x11/gtk3/options.mk:1.35     Fri May 15 17:01:06 2026
+++ pkgsrc/x11/gtk3/options.mk  Wed May 27 12:39:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.35 2026/05/15 17:01:06 wiz Exp $
+# $NetBSD: options.mk,v 1.36 2026/05/27 12:39:08 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS+=        doc introspection gtk3-atk-bridge cups
@@ -11,7 +11,11 @@ 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}



Home | Main Index | Thread Index | Old Index