svn commit: r508242 - in head/emulators/qemu: . files
Muhammad Moinur Rahman
bofh at FreeBSD.org
Tue Aug 6 09:46:45 UTC 2019
Author: bofh
Date: Tue Aug 6 09:46:43 2019
New Revision: 508242
URL: https://svnweb.freebsd.org/changeset/ports/508242
Log:
emulators/qemu: Update version 3.0.1=>3.1.1
- USES=gl is not always needed [1]
PR: 238364 [1]
Submitted by: pizzamig [1]
Deleted:
head/emulators/qemu/files/patch-hw_rdma_Makefile.objs
head/emulators/qemu/files/patch-hw_rdma_vmw_pvrdma__cmd.c
Modified:
head/emulators/qemu/Makefile
head/emulators/qemu/distinfo
head/emulators/qemu/files/patch-configure
head/emulators/qemu/pkg-plist
Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile Tue Aug 6 09:31:00 2019 (r508241)
+++ head/emulators/qemu/Makefile Tue Aug 6 09:46:43 2019 (r508242)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 3.0.1
-PORTREVISION= 2
+PORTVERSION= 3.1.1
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
DIST_SUBDIR= qemu/${PORTVERSION}
@@ -25,7 +24,7 @@ USE_XORG= pixman
USE_GNOME+= cairo glib20 libxml2
.endif
-USES?= cpe gl gmake gnome pkgconfig bison perl5 python:build tar:xz
+USES?= cpe gmake gnome pkgconfig bison perl5 python:build tar:xz
USE_PERL5= build
PORTSCOUT= limit:^3\.0\.
@@ -61,12 +60,13 @@ GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
libepoxy.so:graphics/libepoxy \
libpcre2-8.so:devel/pcre2
GTK3_USE= GNOME=gtk30,vte3,gdkpixbuf2 XORG=x11,xext GL=gbm
-GTK3_USES= gettext
+GTK3_USES= gettext gl
JPEG_CONFIGURE_OFF= --disable-vnc-jpeg
JPEG_USES= jpeg
NCURSES_USES= ncurses:base
OPENGL_CONFIGURE_OFF= --disable-opengl
OPENGL_USE= GL=glu
+OPENGL_USES= gl
PCAP_CONFIGURE_ON= --enable-pcap
PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch ${FILESDIR}/pcap-patch-net_net.c \
${FILESDIR}/pcap-patch-net_clients.h
Modified: head/emulators/qemu/distinfo
==============================================================================
--- head/emulators/qemu/distinfo Tue Aug 6 09:31:00 2019 (r508241)
+++ head/emulators/qemu/distinfo Tue Aug 6 09:46:43 2019 (r508242)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555276984
-SHA256 (qemu/3.0.1/qemu-3.0.1.tar.xz) = cf5747aa3bf0e7ec6cb166f48be4680097c333ce320e8e58140980b0d99512f3
-SIZE (qemu/3.0.1/qemu-3.0.1.tar.xz) = 35626524
+TIMESTAMP = 1564890466
+SHA256 (qemu/3.1.1/qemu-3.1.1.tar.xz) = d7c69fef3fb4bfbac99e3f2ac9fb8d6409db4faadf2e37337d544e3fdb4fde3a
+SIZE (qemu/3.1.1/qemu-3.1.1.tar.xz) = 36072500
Modified: head/emulators/qemu/files/patch-configure
==============================================================================
--- head/emulators/qemu/files/patch-configure Tue Aug 6 09:31:00 2019 (r508241)
+++ head/emulators/qemu/files/patch-configure Tue Aug 6 09:46:43 2019 (r508242)
@@ -1,14 +1,6 @@
---- configure.orig 2019-04-14 21:25:18 UTC
+--- configure.orig 2018-12-11 17:44:34 UTC
+++ configure
-@@ -375,6 +375,7 @@ hax="no"
- hvf="no"
- whpx="no"
- rdma=""
-+pvrdma=""
- gprof="no"
- debug_tcg="no"
- debug="no"
-@@ -391,7 +392,7 @@ DSOSUF=".so"
+@@ -393,7 +393,7 @@ DSOSUF=".so"
LDFLAGS_SHARED="-shared"
modules="no"
prefix="/usr/local"
@@ -17,7 +9,7 @@
datadir="\${prefix}/share"
firmwarepath="\${prefix}/share/qemu-firmware"
qemu_docdir="\${prefix}/share/doc/qemu"
-@@ -471,6 +472,9 @@ numa=""
+@@ -469,6 +469,9 @@ numa=""
tcmalloc="no"
jemalloc="no"
replication="yes"
@@ -25,9 +17,9 @@
+pcap_create="no"
+bpf="no"
vxhs=""
- libxml2=""
- docker="no"
-@@ -1087,6 +1091,10 @@ for opt do
+ bochs="yes"
+ cloop="yes"
+@@ -1097,6 +1100,10 @@ for opt do
;;
--enable-vnc-png) vnc_png="yes"
;;
@@ -38,81 +30,10 @@
--disable-slirp) slirp="no"
;;
--disable-vde) vde="no"
-@@ -1363,6 +1371,10 @@ for opt do
- ;;
- --disable-rdma) rdma="no"
- ;;
-+ --enable-pvrdma) pvrdma="yes"
-+ ;;
-+ --disable-pvrdma) pvrdma="no"
-+ ;;
- --with-gtkabi=*) gtkabi="$optarg"
- ;;
- --disable-vte) vte="no"
-@@ -1669,7 +1681,8 @@ disabled with --disable-FEATURE, default is enabled if
- hax HAX acceleration support
- hvf Hypervisor.framework acceleration support
- whpx Windows Hypervisor Platform acceleration support
-- rdma Enable RDMA-based migration and PVRDMA support
-+ rdma Enable RDMA-based migration
-+ pvrdma Enable PVRDMA support
- vde support for vde network
- netmap support for netmap network
- linux-aio Linux AIO support
-@@ -2881,7 +2894,49 @@ else
- tasn1=no
+@@ -2860,6 +2867,14 @@ if ! check_include "ifaddrs.h" ; then
fi
-+##########################################
-+# PVRDMA detection
-
-+cat > $TMPC <<EOF &&
-+#include <sys/mman.h>
-+
-+int
-+main(void)
-+{
-+ char buf = 0;
-+ void *addr = &buf;
-+ addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED);
-+
-+ return 0;
-+}
-+EOF
-+
-+if test "$rdma" = "yes" ; then
-+ case "$pvrdma" in
-+ "")
-+ if compile_prog "" ""; then
-+ pvrdma="yes"
-+ else
-+ pvrdma="no"
-+ fi
-+ ;;
-+ "yes")
-+ if ! compile_prog "" ""; then
-+ error_exit "PVRDMA is not supported since mremap is not implemented"
-+ fi
-+ pvrdma="yes"
-+ ;;
-+ "no")
-+ pvrdma="no"
-+ ;;
-+ esac
-+else
-+ if test "$pvrdma" = "yes" ; then
-+ error_exit "PVRDMA requires rdma suppport"
-+ fi
-+ pvrdma="no"
-+fi
-+
##########################################
- # getifaddrs (for tests/test-io-channel-socket )
-
-@@ -2891,6 +2946,14 @@ if ! check_include "ifaddrs.h" ; then
- fi
-
- ##########################################
+# getifaddrs (for tests/test-io-channel-socket )
+
+have_ifaddrs_h=yes
@@ -124,10 +45,22 @@
# VTE probe
if test "$vte" != "no"; then
-@@ -3061,7 +3124,51 @@ EOF
+@@ -4466,11 +4481,6 @@ fi
+ if test "$docs" != "no" ; then
+ if has makeinfo && has pod2man; then
+ docs=yes
+- else
+- if test "$docs" = "yes" ; then
+- feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
+- fi
+- docs=no
fi
fi
+@@ -4984,7 +4994,51 @@ if test "$debug_stack_usage" = "yes"; then
+ fi
+ fi
+
+##########################################
+# pcap probe
@@ -174,42 +107,9 @@
+fi # test "$pcap"
+
##########################################
- # VNC SASL detection
- if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then
-@@ -3474,7 +3581,7 @@ for i in $glib_modules; do
- glib_libs=$($pkg_config --libs $i)
- QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
- LIBS="$glib_libs $LIBS"
-- libs_qga="$glib_libs $libs_qga"
-+ libs_qga="$glib_libs -lintl $libs_qga"
- else
- error_exit "glib-$glib_req_ver $i is required to compile QEMU"
- fi
-@@ -4419,14 +4526,7 @@ fi
+ # check if we have open_by_handle_at
- # Check if tools are available to build documentation.
- if test "$docs" != "no" ; then
-- if has makeinfo && has pod2man; then
- docs=yes
-- else
-- if test "$docs" = "yes" ; then
-- feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
-- fi
-- docs=no
-- fi
- fi
-
- # Search for bswap_32 function
-@@ -4551,7 +4651,7 @@ fi
-
- # check for libusb
- if test "$libusb" != "no" ; then
-- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
-+ if $pkg_config libusb-1.0; then
- libusb="yes"
- libusb_cflags=$($pkg_config --cflags libusb-1.0)
- libusb_libs=$($pkg_config --libs libusb-1.0)
-@@ -5914,6 +6014,7 @@ echo "Audio drivers $audio_drv_list"
+@@ -6005,6 +6059,7 @@ echo "Audio drivers $audio_drv_list"
echo "Block whitelist (rw) $block_drv_rw_whitelist"
echo "Block whitelist (ro) $block_drv_ro_whitelist"
echo "VirtFS support $virtfs"
@@ -217,15 +117,7 @@
echo "Multipath support $mpath"
echo "VNC support $vnc"
if test "$vnc" = "yes" ; then
-@@ -5949,6 +6050,7 @@ if test "$tcg" = "yes" ; then
- fi
- echo "malloc trim support $malloc_trim"
- echo "RDMA support $rdma"
-+echo "PVRDMA support $pvrdma"
- echo "fdt support $fdt"
- echo "membarrier $membarrier"
- echo "preadv support $preadv"
-@@ -6143,6 +6245,15 @@ fi
+@@ -6240,6 +6295,15 @@ fi
if test "$profiler" = "yes" ; then
echo "CONFIG_PROFILER=y" >> $config_host_mak
fi
@@ -241,24 +133,13 @@
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
-@@ -6384,6 +6495,9 @@ fi
+@@ -6470,6 +6534,9 @@ fi
+ # if this macro is set.
if test "$have_fsxattr" = "yes" ; then
echo "HAVE_FSXATTR=y" >> $config_host_mak
- fi
++fi
+if test "$have_ifaddrs_h" = "yes" ; then
+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak
-+fi
+ fi
if test "$have_copy_file_range" = "yes" ; then
echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak
- fi
-@@ -6703,6 +6817,10 @@ echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_m
- if test "$rdma" = "yes" ; then
- echo "CONFIG_RDMA=y" >> $config_host_mak
- echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
-+fi
-+
-+if test "$pvrdma" = "yes" ; then
-+ echo "CONFIG_PVRDMA=y" >> $config_host_mak
- fi
-
- if test "$have_rtnetlink" = "yes" ; then
Modified: head/emulators/qemu/pkg-plist
==============================================================================
--- head/emulators/qemu/pkg-plist Tue Aug 6 09:31:00 2019 (r508241)
+++ head/emulators/qemu/pkg-plist Tue Aug 6 09:46:43 2019 (r508242)
@@ -1,3 +1,4 @@
+bin/qemu-edid
bin/qemu-ga
bin/qemu-i386
bin/qemu-img
@@ -25,7 +26,6 @@ bin/qemu-system-i386
%%NO_X86_TARGETS%%bin/qemu-system-or1k
%%NO_X86_TARGETS%%bin/qemu-system-ppc
%%NO_X86_TARGETS%%bin/qemu-system-ppc64
-%%NO_X86_TARGETS%%bin/qemu-system-ppcemb
%%NO_X86_TARGETS%%bin/qemu-system-riscv32
%%NO_X86_TARGETS%%bin/qemu-system-riscv64
%%NO_X86_TARGETS%%bin/qemu-system-s390x
@@ -40,8 +40,9 @@ bin/qemu-system-x86_64
%%NO_X86_TARGETS%%bin/qemu-system-xtensaeb
bin/qemu-x86_64
man/man1/qemu.1.gz
-man/man7/qemu-block-drivers.7.gz
man/man1/qemu-img.1.gz
+man/man7/qemu-block-drivers.7.gz
+man/man7/qemu-cpu-models.7.gz
man/man7/qemu-ga-ref.7.gz
man/man7/qemu-qmp-ref.7.gz
man/man8/qemu-ga.8.gz
@@ -62,27 +63,29 @@ man/man8/qemu-nbd.8.gz
%%DATADIR%%/efi-virtio.rom
%%DATADIR%%/efi-vmxnet3.rom
%%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%%/openbios-ppc
%%DATADIR%%/openbios-sparc32
%%DATADIR%%/openbios-sparc64
+%%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%%/qemu_vga.ndrv
+%%DATADIR%%/s390-netboot.img
+%%DATADIR%%/u-boot-sam460-20100605.bin
+%%DATADIR%%/vgabios.bin
+%%DATADIR%%/vgabios-bochs-display.bin
+%%DATADIR%%/vgabios-cirrus.bin
+%%DATADIR%%/vgabios-qxl.bin
+%%DATADIR%%/vgabios-ramfb.bin
+%%DATADIR%%/vgabios-stdvga.bin
+%%DATADIR%%/vgabios-virtio.bin
+%%DATADIR%%/vgabios-vmware.bin
%%DATADIR%%/spapr-rtas.bin
%%DATADIR%%/slof.bin
%%DATADIR%%/s390-ccw.img
More information about the svn-ports-head
mailing list