Thu May 28 14:44:19 2020 UTC ()
qemu: support opengl

bump pkgrevision


(nia)
diff -r1.244 -r1.245 pkgsrc/emulators/qemu/Makefile
diff -r1.9 -r1.10 pkgsrc/emulators/qemu/options.mk
cvs diff -r1.244 -r1.245 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2020/05/26 07:17:53 1.244
+++ pkgsrc/emulators/qemu/Makefile 2020/05/28 14:44:19 1.245
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.244 2020/05/26 07:17:53 skrll Exp $ 1# $NetBSD: Makefile,v 1.245 2020/05/28 14:44:19 nia Exp $
2 2
3DISTNAME= qemu-5.0.0 3DISTNAME= qemu-5.0.0
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14USE_CURSES= resize_term wide 14USE_CURSES= resize_term wide
15USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config 16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config
17FAKE_NCURSES= yes 17FAKE_NCURSES= yes
@@ -33,27 +33,26 @@ SUBST_SED.sphinx-build+= -e 's/sphinx-bu @@ -33,27 +33,26 @@ SUBST_SED.sphinx-build+= -e 's/sphinx-bu
33.include "options.mk" 33.include "options.mk"
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37CONFIGURE_ARGS+= --prefix=${PREFIX} 37CONFIGURE_ARGS+= --prefix=${PREFIX}
38CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 38CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
39CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 39CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
40CONFIGURE_ARGS+= --python=${PYTHONBIN} 40CONFIGURE_ARGS+= --python=${PYTHONBIN}
41CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 41CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
42CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 42CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
43CONFIGURE_ARGS+= --enable-curses 43CONFIGURE_ARGS+= --enable-curses
44CONFIGURE_ARGS+= --enable-docs 44CONFIGURE_ARGS+= --enable-docs
45CONFIGURE_ARGS+= --enable-jemalloc 45CONFIGURE_ARGS+= --enable-jemalloc
46CONFIGURE_ARGS+= --disable-opengl 
47CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 46CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
48 47
49.if defined(PKGSRC_USE_SSP) 48.if defined(PKGSRC_USE_SSP)
50# do not add flags to everything 49# do not add flags to everything
51PKGSRC_USE_SSP= no 50PKGSRC_USE_SSP= no
52CONFIGURE_ARGS+= --enable-stack-protector 51CONFIGURE_ARGS+= --enable-stack-protector
53.endif 52.endif
54 53
55NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64 54NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
56NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha 55NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
57NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm 56NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
58NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris 57NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
59NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa 58NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-hppa
cvs diff -r1.9 -r1.10 pkgsrc/emulators/qemu/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/options.mk 2020/03/13 13:57:04 1.9
+++ pkgsrc/emulators/qemu/options.mk 2020/05/28 14:44:19 1.10
@@ -1,41 +1,50 @@ @@ -1,41 +1,50 @@
1# $NetBSD: options.mk,v 1.9 2020/03/13 13:57:04 tnn Exp $ 1# $NetBSD: options.mk,v 1.10 2020/05/28 14:44:19 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qemu 3PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
4PKG_SUPPORTED_OPTIONS= gtk3 iscsi sdl spice 4PKG_SUPPORTED_OPTIONS= gtk3 iscsi sdl spice
5PKG_SUGGESTED_OPTIONS+= iscsi 5PKG_SUGGESTED_OPTIONS+= iscsi
6 6
7.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
8 8
9.if ${OPSYS} == "Linux" 9.if ${OPSYS} == "Linux"
10PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper 10PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper
11.endif 11.endif
12 12
13.if ${OPSYS} != "Darwin" 13.if ${OPSYS} != "Darwin"
14PKG_SUGGESTED_OPTIONS+= sdl 14PKG_SUPPORTED_OPTIONS+= opengl
 15PKG_SUGGESTED_OPTIONS+= opengl sdl
15.endif 16.endif
16 17
17.include "../../mk/bsd.options.mk" 18.include "../../mk/bsd.options.mk"
18 19
19PLIST_VARS+= gtk virtfs-proxy-helper 20PLIST_VARS+= gtk virtfs-proxy-helper
20 21
21.if !empty(PKG_OPTIONS:Mgtk3) 22.if !empty(PKG_OPTIONS:Mgtk3)
22PLIST.gtk= yes 23PLIST.gtk= yes
23CONFIGURE_ARGS+= --enable-gtk 24CONFIGURE_ARGS+= --enable-gtk
24.include "../../x11/gtk3/buildlink3.mk" 25.include "../../x11/gtk3/buildlink3.mk"
25.else 26.else
26CONFIGURE_ARGS+= --disable-gtk 27CONFIGURE_ARGS+= --disable-gtk
27.endif 28.endif
28 29
 30.if !empty(PKG_OPTIONS:Mopengl)
 31CONFIGURE_ARGS+= --enable-opengl
 32.include "../../graphics/MesaLib/buildlink3.mk"
 33.include "../../graphics/libepoxy/buildlink3.mk"
 34.else
 35CONFIGURE_ARGS+= --disable-opengl
 36.endif
 37
29.if !empty(PKG_OPTIONS:Msdl) 38.if !empty(PKG_OPTIONS:Msdl)
30CONFIGURE_ARGS+= --enable-sdl 39CONFIGURE_ARGS+= --enable-sdl
31.include "../../devel/SDL2/buildlink3.mk" 40.include "../../devel/SDL2/buildlink3.mk"
32.else 41.else
33CONFIGURE_ARGS+= --disable-sdl 42CONFIGURE_ARGS+= --disable-sdl
34.endif 43.endif
35 44
36# NB to successfully build virtfs-proxy-helper, the upstream Linux 45# NB to successfully build virtfs-proxy-helper, the upstream Linux
37# header/development libraries for libcap and libattr must be installed. 46# header/development libraries for libcap and libattr must be installed.
38.if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper) 47.if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper)
39PLIST.virtfs-proxy-helper= yes 48PLIST.virtfs-proxy-helper= yes
40CONFIGURE_ARGS+= --enable-virtfs 49CONFIGURE_ARGS+= --enable-virtfs
41.else 50.else