svn commit: r456518 - in head/emulators/qemu-sbruno: . files

[Sean Bruno]

Author: sbruno
Date: Sun Dec 17 00:14:17 2017
New Revision: 456518
URL: https://svnweb.freebsd.org/changeset/ports/456518

Log:
  emulators/qemu-sbruno
  emulators/qemu-user-static
  
  Update to 2.11.50 + patches from submitters.  Upstream introduced some git
  nonsense with remotes inside their repos.  Change the way we fetch our
  distributions with GH_TUPLE instead of the previous way.  Clean up a couple
  lines commented out for the PCAP features that aren't stored in a patch, but
  merely direct committed to this tree.
  
  - Remove the interpreter name and interpreter prefix when retrieving the
    argument vectors using kvm_getargv  (Mikael Urankar)
  
  - No need to check msg_controllen: msg_controllen can have the value 0 and
    the kernel discards negative value  (Mikael Urankar)
  
  - Implement/modify kevent64 related syscalls.  (Mikael Urankar)
  
  - Implement ktimer_{create, delete, settime, gettime} (Mikael Urankar)
  
  - Stop using basename_r(3). Fix build after FreeBSD svn r326719 (Ed Shouten)
  
  Changelogs can be found at https://github.com/seanbruno/qemu-bsd-user
  
  PR:	224016

Modified:
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu-sbruno/distinfo
  head/emulators/qemu-sbruno/files/cdrom-dma-patch
  head/emulators/qemu-sbruno/files/patch-Makefile

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Sat Dec 16 21:44:09 2017	(r456517)
+++ head/emulators/qemu-sbruno/Makefile	Sun Dec 17 00:14:17 2017	(r456518)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.9.94.g20171023
+PORTVERSION=	2.11.50.g20171215
 CATEGORIES=	emulators
 MASTER_SITES=	GH
 PKGNAMESUFFIX?=	-sbruno
@@ -14,11 +14,10 @@ COMMENT?=	QEMU CPU Emulator - github bsd-user branch
 
 LICENSE=	GPLv2
 USE_GITHUB=	yes
-GH_ACCOUNT=	seanbruno
-GH_PROJECT=	${PORTNAME}-bsd-user
-GH_TAGNAME=	32c666c
+GH_TUPLE=	seanbruno:${PORTNAME}-bsd-user:8dcfea1 \
+		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
-USES=		gmake pkgconfig bison perl5 python:2,build
+USES=		gmake pkgconfig bison perl5 python:2.7,build
 USE_PERL5=	build
 PATCH_STRIP=	-p1
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
@@ -263,9 +262,6 @@ post-patch:
 		${WRKSRC}/Makefile
 .endif
 
-#.if ${PORT_OPTIONS:MPCAP}
-#	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch
-#.endif
 .if empty(PORT_OPTIONS:MCDROM_DMA)
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch
 .endif

Modified: head/emulators/qemu-sbruno/distinfo
==============================================================================
--- head/emulators/qemu-sbruno/distinfo	Sat Dec 16 21:44:09 2017	(r456517)
+++ head/emulators/qemu-sbruno/distinfo	Sun Dec 17 00:14:17 2017	(r456518)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1508784315
-SHA256 (qemu/2.9.94.g20171023/seanbruno-qemu-bsd-user-2.9.94.g20171023-32c666c_GH0.tar.gz) = 8f4e9ee2488cd95aa4a6f13d5aa11b66ab50a03e4a65163ad4f3d886bfef0fcc
-SIZE (qemu/2.9.94.g20171023/seanbruno-qemu-bsd-user-2.9.94.g20171023-32c666c_GH0.tar.gz) = 14637253
+TIMESTAMP = 1513359428
+SHA256 (qemu/2.11.50.g20171215/seanbruno-qemu-bsd-user-2.11.50.g20171215-8dcfea1_GH0.tar.gz) = cd7f9e5b1f1a6a6055b9fba569b5d45970e78679fce1b4d000f28ccb53b1ab15
+SIZE (qemu/2.11.50.g20171215/seanbruno-qemu-bsd-user-2.11.50.g20171215-8dcfea1_GH0.tar.gz) = 14817005
+SHA256 (qemu/2.11.50.g20171215/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
+SIZE (qemu/2.11.50.g20171215/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895

Modified: head/emulators/qemu-sbruno/files/cdrom-dma-patch
==============================================================================
--- head/emulators/qemu-sbruno/files/cdrom-dma-patch	Sat Dec 16 21:44:09 2017	(r456517)
+++ head/emulators/qemu-sbruno/files/cdrom-dma-patch	Sun Dec 17 00:14:17 2017	(r456518)
@@ -1,10 +1,11 @@
-Index: include/hw/ide/internal.h
-@@ -27,7 +27,7 @@
- //#define DEBUG_IDE
- //#define DEBUG_IDE_ATAPI
- //#define DEBUG_AIO
+--- include/hw/ide/internal.h.orig	2017-11-19 18:54:05.000000000 -0700
++++ include/hw/ide/internal.h	2017-11-20 08:35:44.521365000 -0700
+@@ -15,7 +15,7 @@
+ #include "qapi/error.h"
+ 
+ /* debug IDE devices */
 -#define USE_DMA_CDROM
 +// #define USE_DMA_CDROM
  
- /* Bits of HD_STATUS */
- #define ERR_STAT		0x01
+ typedef struct IDEBus IDEBus;
+ typedef struct IDEDevice IDEDevice;

Modified: head/emulators/qemu-sbruno/files/patch-Makefile
==============================================================================
--- head/emulators/qemu-sbruno/files/patch-Makefile	Sat Dec 16 21:44:09 2017	(r456517)
+++ head/emulators/qemu-sbruno/files/patch-Makefile	Sun Dec 17 00:14:17 2017	(r456518)
@@ -1,6 +1,6 @@
---- Makefile.orig	2017-07-06 15:00:58.000000000 -0600
-+++ Makefile	2017-07-06 15:18:48.131891000 -0600
-@@ -206,9 +206,13 @@
+--- Makefile.orig	2017-12-15 10:34:23.000000000 -0700
++++ Makefile	2017-12-15 22:05:39.173965000 -0700
+@@ -263,9 +263,13 @@
  HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
  
  ifdef BUILD_DOCS
@@ -11,10 +11,10 @@
  DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
  DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
 +endif
+ DOCS+=docs/qemu-block-drivers.7
  ifdef CONFIG_VIRTFS
  DOCS+=fsdev/virtfs-proxy-helper.1
- endif
-@@ -564,15 +568,19 @@
+@@ -647,16 +651,20 @@
  
  install-doc: $(DOCS)
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
@@ -30,11 +30,12 @@
  	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
 +ifndef NOPORTDOCS
  	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
+ 	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
 +endif
  ifneq ($(TOOLS),)
  	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
  	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
-@@ -580,9 +588,11 @@
+@@ -664,9 +672,11 @@
  endif
  ifneq (,$(findstring qemu-ga,$(TOOLS)))
  	$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"