qemu-git: Sync this package with emulators/qemu

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qemu-git: Sync this package with emulators/qemu
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Wed, 30 Aug 2017 21:04:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Aug 30 23:04:11 2017 +0200
Changeset:	b8d2792781f25d8eb7eda2cd0dbc805a09f5b4a4

Modified Files:
	qemu-git/Makefile
	qemu-git/PLIST
	qemu-git/options.mk

Log Message:
qemu-git: Sync this package with emulators/qemu

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b8d2792781f25d8eb7eda2cd0dbc805a09f5b4a4

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

diffstat:
 qemu-git/Makefile   | 34 +++++++++-------------------------
 qemu-git/PLIST      | 40 +++++++++++++++++++++++++++++++++-------
 qemu-git/options.mk | 14 +++-----------
 3 files changed, 45 insertions(+), 43 deletions(-)

diffs:
diff --git a/qemu-git/Makefile b/qemu-git/Makefile
index 6e53af549d..9121c9ee93 100644
--- a/qemu-git/Makefile
+++ b/qemu-git/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.167 2017/04/07 13:32:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.172 2017/08/30 21:00:46 kamil Exp $
 
-DISTNAME=	qemu-2.9.0
+DISTNAME=	qemu-2.10.0
 CATEGORIES=	emulators
 
 GIT_REPOSITORIES=	qemu
@@ -13,14 +13,9 @@ HOMEPAGE=	http://www.qemu-project.org/
 COMMENT=	CPU emulator using dynamic translation
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
 
-CONFLICTS+=		qemu-bin-[0-9]*
-NOT_FOR_PLATFORM+=	NetBSD-1.[0-6]*-*
-# qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565.
-NOT_FOR_PLATFORM+=	NetBSD-5*-*
-
 USE_CURSES=		resize_term wide
 USE_LANGUAGES+=		c c++
-USE_TOOLS+=		bison gmake makeinfo perl:build pkg-config
+USE_TOOLS+=		bison flex gmake makeinfo perl:build pkg-config
 FAKE_NCURSES=		yes
 UNLIMIT_RESOURCES=	datasize
 HAS_CONFIGURE=		yes
@@ -68,7 +63,7 @@ NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-mips64
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-mips64el
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-mipsel
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-moxie
-#NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-or32
+NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-or1k
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-ppc
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-ppc64
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-ppcemb
@@ -87,29 +82,16 @@ PKG_SYSCONFSUBDIR=	qemu
 
 REPLACE_PERL+=		scripts/texi2pod.pl
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported yet as of 2.8.0
-
-BUILDLINK_PASSTHRU_DIRS+=	/usr/lib
-BUILDLINK_PASSTHRU_RPATHDIRS+=	/usr/lib
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported yet as of 2.10.0
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/qemu
 
 UE_ARCHS+=		alpha arm armeb cris i386 m68k microblaze mips mipsel
-UE_ARCHS+=		or32 ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
+UE_ARCHS+=		or1k ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
 UE_ARCHS+=		sparc64 x86_64 microblazeel s390x unicore32
 
 .if ${OPSYS} == "NetBSD"
-.  if (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*))
-# XXX
-# i386 and x86_64 user emul require newer binutils for PROVIDE_HIDDEN()
-# http://git.qemu.org/qemu.git/commit/?id=845f2c2812d9ed24b36c02a3d06ee83aeafe8b49
-# but binutils-2.19 was enabled around 5.99.22:
-# http://cvsweb.NetBSD.org/bsdweb.cgi/src/share/mk/bsd.own.mk#rev1.594
 USER_EMUL=		i386 x86_64 sparc sparc64
-.  else
-CONFIGURE_ARGS+=	--disable-bsd-user
-USER_EMUL=
-.  endif
 PLIST.nbd=		YES
 .elif !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
 USER_EMUL=		i386 x86_64 sparc sparc64
@@ -121,12 +103,13 @@ PLIST.nbd=		YES
 .elif !empty(OPSYS:MLinux)
 USER_EMUL=		${UE_ARCHS}
 PLIST.nbd=		YES
+PLIST.ivshmem=		YES
 .elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
 PLIST.nbd=		YES
 CONFIGURE_ARGS+=	--disable-coroutine-pool
 .endif
 
-PLIST_VARS+=		${UE_ARCHS} nbd
+PLIST_VARS+=		${UE_ARCHS} nbd ivshmem
 .for _var_ in ${USER_EMUL}
 PLIST.${_var_}=		YES
 .endfor
@@ -138,6 +121,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/doc/qemu/
 
 .include "../../wip/mk/git-package.mk"
+
 # On Darwin, qemu uses Cocoa and CoreAudio
 .if empty(OPSYS:MDarwin)
 .include "../../mk/oss.buildlink3.mk"
diff --git a/qemu-git/PLIST b/qemu-git/PLIST
index 306c60c4f9..3f53a349fe 100644
--- a/qemu-git/PLIST
+++ b/qemu-git/PLIST
@@ -1,11 +1,31 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.51 2017/08/30 21:00:46 kamil Exp $
+${PLIST.ivshmem}bin/ivshmem-client
+${PLIST.ivshmem}bin/ivshmem-server
+${PLIST.alpha}bin/qemu-alpha
+${PLIST.arm}bin/qemu-arm
+${PLIST.armeb}bin/qemu-armeb
+${PLIST.cris}bin/qemu-cris
 bin/qemu-ga
-bin/qemu-i386
+${PLIST.i386}bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
-bin/qemu-nbd
-bin/qemu-sparc
-bin/qemu-sparc64
+${PLIST.m68k}bin/qemu-m68k
+${PLIST.microblaze}bin/qemu-microblaze
+${PLIST.microblazeel}bin/qemu-microblazeel
+${PLIST.mips}bin/qemu-mips
+${PLIST.mipsel}bin/qemu-mipsel
+${PLIST.nbd}bin/qemu-nbd
+${PLIST.or1k}bin/qemu-or1k
+${PLIST.ppc}bin/qemu-ppc
+${PLIST.ppc64}bin/qemu-ppc64
+${PLIST.ppc64abi32}bin/qemu-ppc64abi32
+${PLIST.s390x}bin/qemu-s390x
+${PLIST.sh4}bin/qemu-sh4
+${PLIST.sh4eb}bin/qemu-sh4eb
+${PLIST.sparc}bin/qemu-sparc
+${PLIST.sparc32plus}bin/qemu-sparc32plus
+${PLIST.sparc64}bin/qemu-sparc64
+${PLIST.unicore32}bin/qemu-unicore32
 bin/qemu-system-aarch64
 bin/qemu-system-alpha
 bin/qemu-system-arm
@@ -35,7 +55,7 @@ bin/qemu-system-unicore32
 bin/qemu-system-x86_64
 bin/qemu-system-xtensa
 bin/qemu-system-xtensaeb
-bin/qemu-x86_64
+${PLIST.x86_64}bin/qemu-x86_64
 man/man1/qemu-img.1
 man/man1/qemu.1
 man/man7/qemu-ga-ref.7
@@ -49,6 +69,13 @@ share/doc/qemu/qemu-ga-ref.html
 share/doc/qemu/qemu-ga-ref.txt
 share/doc/qemu/qemu-qmp-ref.html
 share/doc/qemu/qemu-qmp-ref.txt
+${PLIST.gtk}share/locale/bg/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/de_DE/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/fr_FR/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/hu/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo
+${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo
 share/qemu/QEMU,cgthree.bin
 share/qemu/QEMU,tcx.bin
 share/qemu/acpi-dsdt.aml
@@ -134,4 +161,3 @@ share/qemu/vgabios-stdvga.bin
 share/qemu/vgabios-virtio.bin
 share/qemu/vgabios-vmware.bin
 share/qemu/vgabios.bin
-@pkgdir var/run
diff --git a/qemu-git/options.mk b/qemu-git/options.mk
index 57ab7fd5e7..82375b0ec3 100644
--- a/qemu-git/options.mk
+++ b/qemu-git/options.mk
@@ -1,25 +1,17 @@
-# $NetBSD: options.mk,v 1.3 2017/02/27 05:19:29 adam Exp $
+# $NetBSD: options.mk,v 1.4 2017/08/30 21:00:46 kamil Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qemu
-PKG_SUPPORTED_OPTIONS=	gtk3 ivshmem sdl
+PKG_SUPPORTED_OPTIONS=	gtk3 sdl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*)
-PKG_SUGGESTED_OPTIONS+=	ivshmem
-.endif
-
 .if empty(OPSYS:MDarwin)
 PKG_SUGGESTED_OPTIONS+=	sdl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk ivshmem
-
-.if !empty(PKG_OPTIONS:Mivshmem)
-PLIST.ivshmem=		yes
-.endif
+PLIST_VARS+=		gtk
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 PLIST.gtk=		yes
Prev by Date: compiler-rt-netbsd: Update to SVN r. 312184
Next by Date: libretro-beetle-pce-fast: Update to 20170814
Previous by Thread: compiler-rt-netbsd: Update to SVN r. 312184
Next by Thread: libretro-beetle-pce-fast: Update to 20170814
Indexes:
Home | Main Index | Thread Index | Old Index