CVS commit: pkgsrc/emulators/qemu

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Sun Jan  3 21:42:29 UTC 2021

Modified Files:
        pkgsrc/emulators/qemu: Makefile options.mk

Log Message:
qemu: x11 isn't an option

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


To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/emulators/qemu/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/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.259 pkgsrc/emulators/qemu/Makefile:1.260
--- pkgsrc/emulators/qemu/Makefile:1.259        Sun Dec 20 16:51:44 2020
+++ pkgsrc/emulators/qemu/Makefile      Sun Jan  3 21:42:29 2021
@@ -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 @@ post-install:
        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"

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.13 pkgsrc/emulators/qemu/options.mk:1.14
--- pkgsrc/emulators/qemu/options.mk:1.13       Tue Dec 15 16:50:08 2020
+++ pkgsrc/emulators/qemu/options.mk    Sun Jan  3 21:42:29 2021
@@ -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+=     --enable-sdl
 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)