svn commit: r513050 - in head: . emulators emulators/qemu-devel emulators/qemu40

Muhammad Moinur Rahman bofh at FreeBSD.org
Fri Sep 27 17:55:49 UTC 2019 

Author: bofh
Date: Fri Sep 27 17:55:47 2019
New Revision: 513050
URL: https://svnweb.freebsd.org/changeset/ports/513050

Log:
  emulators/qemu-devel: Update version 4.0.0=>4.1.0
  
  - Merge 4.0.X branch into emulators/qemu40
  - See UPDATING for more info

Added:
  head/emulators/qemu40/
     - copied from r512805, head/emulators/qemu-devel/
Modified:
  head/UPDATING
  head/emulators/Makefile
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-devel/distinfo
  head/emulators/qemu-devel/pkg-plist
  head/emulators/qemu40/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Sep 27 17:41:16 2019	(r513049)
+++ head/UPDATING	Fri Sep 27 17:55:47 2019	(r513050)
@@ -6,6 +6,14 @@ You should get into the habit of checking this file fo
 you update your ports collection, before attempting any port upgrades.
 
 20190927:
+  AFFECTS: users of emulators/qemu-devel
+  AUTHOR: bofh at FreeBSD.org
+
+  qemu-devel has been updated to 4.1.0 and 4.0.0 has been merged into a new port
+  emulators/qemu40. If you want to stick with 4.0.X branch, simply use:
+  # portmaster -o emulators/qemu-devel emulators/qemu40
+
+20190927:
   AFFECTS: users of XFCE desktop
   AUTHOR: madpilot at FreeBSD.org
 

Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile	Fri Sep 27 17:41:16 2019	(r513049)
+++ head/emulators/Makefile	Fri Sep 27 17:55:47 2019	(r513050)
@@ -120,6 +120,7 @@
     SUBDIR += qemu-user-static
     SUBDIR += qemu-utils
     SUBDIR += qemu30
+    SUBDIR += qemu40
     SUBDIR += qmc2
     SUBDIR += quasi88
     SUBDIR += riscv-fesvr

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Fri Sep 27 17:41:16 2019	(r513049)
+++ head/emulators/qemu-devel/Makefile	Fri Sep 27 17:55:47 2019	(r513050)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	4.0.0
+PORTVERSION=	4.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 PKGNAMESUFFIX=	-devel
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libnettle.so:security/nettle \
 		libepoxy.so:graphics/libepoxy \
 		libpcre2-8.so:devel/pcre2
 
-USES=		bison cpe gmake gnome iconv:wchar_t perl5 pkgconfig python:build tar:xz
+USES=		bison cpe gmake gnome iconv:wchar_t perl5 pkgconfig python:build tar:xz xorg
 USE_GNOME=	cairo glib20 libxml2
 USE_PERL5=	build
 USE_XORG=	pixman
@@ -90,12 +90,12 @@ DOCS_USES=		makeinfo
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
 
 PORTDOCS=	docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
-	       	qemu-qmp-ref.html qemu-qmp-ref.txt
+	       	qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS=	--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
-		--extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh2 --enable-debug \
+		--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \
 		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
 		--enable-debug-info --python=${PYTHON_CMD} \

Modified: head/emulators/qemu-devel/distinfo
==============================================================================
--- head/emulators/qemu-devel/distinfo	Fri Sep 27 17:41:16 2019	(r513049)
+++ head/emulators/qemu-devel/distinfo	Fri Sep 27 17:55:47 2019	(r513050)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556455551
-SHA256 (qemu/4.0.0/qemu-4.0.0.tar.xz) = 13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469
-SIZE (qemu/4.0.0/qemu-4.0.0.tar.xz) = 55628624
+TIMESTAMP = 1569438904
+SHA256 (qemu/4.1.0/qemu-4.1.0.tar.xz) = 656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6
+SIZE (qemu/4.1.0/qemu-4.1.0.tar.xz) = 54001708

Modified: head/emulators/qemu-devel/pkg-plist
==============================================================================
--- head/emulators/qemu-devel/pkg-plist	Fri Sep 27 17:41:16 2019	(r513049)
+++ head/emulators/qemu-devel/pkg-plist	Fri Sep 27 17:55:47 2019	(r513050)
@@ -55,6 +55,15 @@ man/man8/qemu-nbd.8.gz
 %%DATADIR%%/bios-256k.bin
 %%DATADIR%%/bios.bin
 %%DATADIR%%/canyonlands.dtb
+%%DATADIR%%/edk2-aarch64-code.fd
+%%DATADIR%%/edk2-arm-code.fd
+%%DATADIR%%/edk2-arm-vars.fd
+%%DATADIR%%/edk2-i386-code.fd
+%%DATADIR%%/edk2-i386-secure-code.fd
+%%DATADIR%%/edk2-i386-vars.fd
+%%DATADIR%%/edk2-licenses.txt
+%%DATADIR%%/edk2-x86_64-code.fd
+%%DATADIR%%/edk2-x86_64-secure-code.fd
 %%DATADIR%%/efi-e1000.rom
 %%DATADIR%%/efi-e1000e.rom
 %%DATADIR%%/efi-eepro100.rom
@@ -63,34 +72,45 @@ man/man8/qemu-nbd.8.gz
 %%DATADIR%%/efi-rtl8139.rom
 %%DATADIR%%/efi-virtio.rom
 %%DATADIR%%/efi-vmxnet3.rom
+%%DATADIR%%/firmware/50-edk2-i386-secure.json
+%%DATADIR%%/firmware/50-edk2-x86_64-secure.json
+%%DATADIR%%/firmware/60-edk2-aarch64.json
+%%DATADIR%%/firmware/60-edk2-arm.json
+%%DATADIR%%/firmware/60-edk2-i386.json
+%%DATADIR%%/firmware/60-edk2-x86_64.json
 %%DATADIR%%/hppa-firmware.img
-%%DATADIR%%/qemu_vga.ndrv
-%%DATADIR%%/s390-netboot.img
-%%DATADIR%%/u-boot-sam460-20100605.bin
-%%DATADIR%%/vgabios.bin
-%%DATADIR%%/vgabios-cirrus.bin
-%%DATADIR%%/vgabios-qxl.bin
-%%DATADIR%%/vgabios-stdvga.bin
-%%DATADIR%%/vgabios-virtio.bin
-%%DATADIR%%/vgabios-vmware.bin
-%%DATADIR%%/palcode-clipper
-%%DATADIR%%/ppc_rom.bin
+%%DATADIR%%/linuxboot.bin
+%%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin
+%%DATADIR%%/multiboot.bin
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32
 %%DATADIR%%/openbios-sparc64
+%%DATADIR%%/opensbi-riscv32-virt-fw_jump.bin
+%%DATADIR%%/opensbi-riscv64-sifive_u-fw_jump.bin
+%%DATADIR%%/opensbi-riscv64-virt-fw_jump.bin
+%%DATADIR%%/palcode-clipper
+%%DATADIR%%/petalogix-ml605.dtb
+%%DATADIR%%/ppc_rom.bin
 %%DATADIR%%/pxe-e1000.rom
 %%DATADIR%%/pxe-eepro100.rom
 %%DATADIR%%/pxe-ne2k_pci.rom
 %%DATADIR%%/pxe-rtl8139.rom
 %%DATADIR%%/pxe-pcnet.rom
 %%DATADIR%%/pxe-virtio.rom
-%%DATADIR%%/petalogix-ml605.dtb
-%%DATADIR%%/spapr-rtas.bin
-%%DATADIR%%/slof.bin
+%%DATADIR%%/qemu-nsis.bmp
+%%DATADIR%%/qemu_vga.ndrv
 %%DATADIR%%/s390-ccw.img
-%%DATADIR%%/linuxboot.bin
-%%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin
-%%DATADIR%%/multiboot.bin
+%%DATADIR%%/s390-netboot.img
+%%DATADIR%%/slof.bin
+%%DATADIR%%/spapr-rtas.bin
+%%DATADIR%%/u-boot-sam460-20100605.bin
+%%DATADIR%%/vgabios.bin
+%%DATADIR%%/vgabios-ati.bin
+%%DATADIR%%/vgabios-cirrus.bin
+%%DATADIR%%/vgabios-qxl.bin
+%%DATADIR%%/vgabios-stdvga.bin
+%%DATADIR%%/vgabios-virtio.bin
+%%DATADIR%%/vgabios-vmware.bin
 %%DATADIR%%/sgabios.bin
 %%DATADIR%%/skiboot.lid
 %%DATADIR%%/trace-events-all

Modified: head/emulators/qemu40/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Wed Sep 25 19:06:04 2019	(r512805)
+++ head/emulators/qemu40/Makefile	Fri Sep 27 17:55:47 2019	(r513050)
@@ -5,11 +5,11 @@ PORTNAME=	qemu
 PORTVERSION=	4.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
-PKGNAMESUFFIX=	-devel
+PKGNAMESUFFIX=	40
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	bofh at FreeBSD.org
-COMMENT=	QEMU CPU Emulator - development version
+COMMENT=	QEMU CPU Emulator - 4.0.X version
 
 LICENSE=	GPLv2
 
@@ -24,7 +24,6 @@ LIB_DEPENDS=	libnettle.so:security/nettle \
 USES=		bison cpe gmake gnome iconv:wchar_t perl5 pkgconfig python:build tar:xz
 USE_GNOME=	cairo glib20 libxml2
 USE_PERL5=	build
-USE_XORG=	pixman
 
 #BROKEN_powerpc64=	fails to compile: In function aio_bh_poll: internal compiler error: Segmentation fault
 
@@ -88,6 +87,8 @@ DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
 			sphinx-build:textproc/py-sphinx
 DOCS_USES=		makeinfo
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
+X86_TARGETS_USE_OFF=	XORG=pixman,x11
+X86_TARGETS_USES_OFF=	xorg
 
 PORTDOCS=	docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
 	       	qemu-qmp-ref.html qemu-qmp-ref.txt

More information about the svn-ports-head mailing list