[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: x11 isn't an option

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a274117e1c42
branches:  trunk
changeset: 444217:a274117e1c42
user:      roy <roy%pkgsrc.org@localhost>
date:      Sun Jan 03 21:42:29 2021 +0000

description:
qemu: x11 isn't an option

If not Darwin, depend on libxkbcommon if any of these options are set:
 * gtk3
 * opengl
 * sdl

diffstat:

 emulators/qemu/Makefile   |  10 ++--------
 emulators/qemu/options.mk |  13 ++++++++++++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diffs (52 lines):

diff -r a501812ba7f7 -r a274117e1c42 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Sun Jan 03 21:42:16 2021 +0000
+++ b/emulators/qemu/Makefile   Sun Jan 03 21:42:29 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.259 2020/12/20 16:51:44 spz Exp $
+# $NetBSD: Makefile,v 1.260 2021/01/03 21:42:29 roy Exp $
 
 DISTNAME=      qemu-5.1.0
 PKGREVISION=   11
@@ -159,14 +159,8 @@
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
 
-# On Darwin, qemu uses Cocoa and CoreAudio
+# On Darwin, qemu uses CoreAudio
 .if ${OPSYS} != "Darwin"
-.if !empty(PKG_OPTIONS:Mx11)
-PLIST.keymap=  yes
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=                --disable-xkbcommon
-.endif
 .include "../../mk/oss.buildlink3.mk"
 .endif
 .include "../../archivers/lzo/buildlink3.mk"
diff -r a501812ba7f7 -r a274117e1c42 emulators/qemu/options.mk
--- a/emulators/qemu/options.mk Sun Jan 03 21:42:16 2021 +0000
+++ b/emulators/qemu/options.mk Sun Jan 03 21:42:29 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2020/12/15 16:50:08 maya Exp $
+# $NetBSD: options.mk,v 1.14 2021/01/03 21:42:29 roy Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi sdl spice
@@ -55,6 +55,17 @@
 CONFIGURE_ARGS+=       --disable-sdl
 .endif
 
+# On Darwin, qemu uses Coca
+.if ${OPSYS} != "Darwin"
+.if !empty(PKG_OPTIONS:Mgtk3) || \
+    !empty(PKG_OPTIONS:Mopengl) || !empty(PKG_OPTIONS:Msdl)
+PLIST.keymap=          yes
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-xkbcommon
+.endif
+.endif
+
 # NB to successfully build virtfs-proxy-helper, the upstream Linux
 # header/development libraries for libcap and libattr must be installed.
 .if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper)