git: 2ab482e2c8f5 - main - emulators/qemu-devel: Update version 6.1.0.20210928=>7.1.0.20220805
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 06 Aug 2022 05:25:28 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2ab482e2c8f51eae7ffd747685b7f181fe1b3809
commit 2ab482e2c8f51eae7ffd747685b7f181fe1b3809
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-08-06 05:23:35 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-08-06 05:25:11 +0000
emulators/qemu-devel: Update version 6.1.0.20210928=>7.1.0.20220805
- Update version to latest snapshots
Reported by: imp
---
emulators/qemu-devel/Makefile | 21 +++++++++---------
emulators/qemu-devel/distinfo | 26 +++++++++++------------
emulators/qemu-devel/files/patch-configure | 21 ------------------
emulators/qemu-devel/files/patch-util_meson.build | 14 ++++++++++++
emulators/qemu-devel/pkg-plist | 11 +++++-----
5 files changed, 43 insertions(+), 50 deletions(-)
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index a65629964856..654f5dfcdfff 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,6 +1,5 @@
PORTNAME= qemu
-DISTVERSION= 6.1.0.20210928
-PORTREVISION= 2
+DISTVERSION= 7.1.0.20220805
CATEGORIES= emulators
PKGNAMESUFFIX= -devel
DIST_SUBDIR= qemu/${PORTVERSION}
@@ -30,10 +29,10 @@ USE_PERL5= build
USE_PYTHON= distutils noflavors
USE_XORG= pixman
-GL_COMMIT= de8ed1055c2ce18c95f597eb10df360dcb534f99
-GL_TUPLE= qemu-project:keycodemapdb:d21009b1c9f94b740ea66be8e48a1d8ad8124023:keycodemapdb/ui/keycodemapdb \
- qemu-project:dtc:e33ce1d6a8c7e54e3ad12cff33690b6da0aee1dc:dtc/dtc \
- qemu-project:meson:5fa0fd3b473f792bd7333cf6ae6e2f4c851b6108:meson/meson \
+GL_COMMIT= 09ed077d7fae5f825e18ff9a2004dcdd1b165edb
+GL_TUPLE= qemu-project:keycodemapdb:e15649b83a78f89f57205927022115536d2c1698:keycodemapdb/ui/keycodemapdb \
+ qemu-project:dtc:e37c25677dc946a025002a394172788b3169b3ce:dtc/dtc \
+ qemu-project:meson:3fbcff1c2722988d05c5248f7ab54c53001b1ee1:meson/meson \
qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/tests/fp/berkeley-softfloat-3 \
qemu-project:berkeley-testfloat-3:5a59dcec19327396a011a17fd924aed4fec416b3:berkeleytestfloat3/tests/fp/berkeley-testfloat-3
@@ -63,7 +62,7 @@ STATIC_LINK_DESC= Statically link the executables
USBREDIR_DESC= usb device network redirection (experimental!)
VDE_DESC= vde dependency (for vde networking)
X86_TARGETS_DESC= Build only x86 system targets
-CAPSTONE_CONFIGURE_ON= --enable-capstone=system --extra-cflags=-I${LOCALBASE}/include/capstone
+CAPSTONE_CONFIGURE_ON= --enable-capstone --extra-cflags=-I${LOCALBASE}/include/capstone
CAPSTONE_CONFIGURE_OFF= --disable-capstone
CAPSTONE_LIB_DEPENDS= libcapstone.so:devel/capstone4
CURL_CONFIGURE_OFF= --disable-curl
@@ -102,13 +101,13 @@ X11_CONFIGURE_ENABLE= sdl
X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2
X11_USES= sdl
-PORTDOCS= .buildinfo _static/* about/* devel/* docs genindex.html \
- index.html interop/* objects.inv search.html searchindex.js \
- specs/* system/* tools/* user/*
+PORTDOCS= .buildinfo _static/* about/* dbus-dbusindex.html devel/* \
+ docs genindex.html index.html interop/* objects.inv \
+ search.html searchindex.js specs/* system/* tools/* user/*
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\" \
+CONFIGURE_ARGS= --localstatedir=/var --mandir=man --extra-ldflags=-L\"/usr/lib\" \
--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \
--prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \
--disable-linux-user --disable-linux-aio --disable-xen \
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 12ca1735d501..b0941429f014 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1632836307
-SHA256 (qemu/6.1.0.20210928/qemu-qemu-de8ed1055c2ce18c95f597eb10df360dcb534f99_GL0.tar.gz) = 9f898082d12be51c9ec06e3007f40a9e69871ba3285b55488fa9e1806bf32a05
-SIZE (qemu/6.1.0.20210928/qemu-qemu-de8ed1055c2ce18c95f597eb10df360dcb534f99_GL0.tar.gz) = 31495981
-SHA256 (qemu/6.1.0.20210928/qemu-project-keycodemapdb-d21009b1c9f94b740ea66be8e48a1d8ad8124023_GL0.tar.gz) = ac074e95824ae5337e19024eae21119caeea67884fb2a3b4aaa8679bcd0f9ccc
-SIZE (qemu/6.1.0.20210928/qemu-project-keycodemapdb-d21009b1c9f94b740ea66be8e48a1d8ad8124023_GL0.tar.gz) = 49211
-SHA256 (qemu/6.1.0.20210928/qemu-project-dtc-e33ce1d6a8c7e54e3ad12cff33690b6da0aee1dc_GL0.tar.gz) = fd1d927e216b51547cfb409853d00f1cbf48c9fead9f9bd0537c63459618a573
-SIZE (qemu/6.1.0.20210928/qemu-project-dtc-e33ce1d6a8c7e54e3ad12cff33690b6da0aee1dc_GL0.tar.gz) = 205791
-SHA256 (qemu/6.1.0.20210928/qemu-project-meson-5fa0fd3b473f792bd7333cf6ae6e2f4c851b6108_GL0.tar.gz) = ad215ee7ef61f413715532487a83223c3c426f9fc1d66e8d1ee5c6d47a169247
-SIZE (qemu/6.1.0.20210928/qemu-project-meson-5fa0fd3b473f792bd7333cf6ae6e2f4c851b6108_GL0.tar.gz) = 4089447
-SHA256 (qemu/6.1.0.20210928/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/6.1.0.20210928/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/6.1.0.20210928/qemu-project-berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3_GL0.tar.gz) = c1f92abe87764de22f6cf8372d697717d18e7951ceb11b6e12c6767b7d1e3a65
-SIZE (qemu/6.1.0.20210928/qemu-project-berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3_GL0.tar.gz) = 139221
+TIMESTAMP = 1659722692
+SHA256 (qemu/7.1.0.20220805/qemu-qemu-09ed077d7fae5f825e18ff9a2004dcdd1b165edb_GL0.tar.gz) = d261c2fecb2bb32f70696c4f5a15f63166cf34c09cb07d6036c4c8703eddeb89
+SIZE (qemu/7.1.0.20220805/qemu-qemu-09ed077d7fae5f825e18ff9a2004dcdd1b165edb_GL0.tar.gz) = 31046233
+SHA256 (qemu/7.1.0.20220805/qemu-project-keycodemapdb-e15649b83a78f89f57205927022115536d2c1698_GL0.tar.gz) = c73027f2ce32dd729faa817e7a8937c01d5cdb1b3100148386d70f9fa612b177
+SIZE (qemu/7.1.0.20220805/qemu-project-keycodemapdb-e15649b83a78f89f57205927022115536d2c1698_GL0.tar.gz) = 49283
+SHA256 (qemu/7.1.0.20220805/qemu-project-dtc-e37c25677dc946a025002a394172788b3169b3ce_GL0.tar.gz) = 46368043883ca331bd07dbc098e24040352994ed0e919b188810106ce1ef9e71
+SIZE (qemu/7.1.0.20220805/qemu-project-dtc-e37c25677dc946a025002a394172788b3169b3ce_GL0.tar.gz) = 210517
+SHA256 (qemu/7.1.0.20220805/qemu-project-meson-3fbcff1c2722988d05c5248f7ab54c53001b1ee1_GL0.tar.gz) = 287c7da70376e7ee095dd524c145f91763c4109b8dacfdc92c9875c9e14e89ca
+SIZE (qemu/7.1.0.20220805/qemu-project-meson-3fbcff1c2722988d05c5248f7ab54c53001b1ee1_GL0.tar.gz) = 4571420
+SHA256 (qemu/7.1.0.20220805/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+SIZE (qemu/7.1.0.20220805/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
+SHA256 (qemu/7.1.0.20220805/qemu-project-berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3_GL0.tar.gz) = c1f92abe87764de22f6cf8372d697717d18e7951ceb11b6e12c6767b7d1e3a65
+SIZE (qemu/7.1.0.20220805/qemu-project-berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3_GL0.tar.gz) = 139221
diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
deleted file mode 100644
index 0137de386d62..000000000000
--- a/emulators/qemu-devel/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig 2021-09-27 14:03:42 UTC
-+++ configure
-@@ -1635,7 +1635,7 @@ if test "$mingw32" = "yes" ; then
- else
- bindir="${bindir:-$prefix/bin}"
- fi
--mandir="${mandir:-$prefix/share/man}"
-+mandir="${mandir:-$prefix/man}"
- datadir="${datadir:-$prefix/share}"
- docdir="${docdir:-$prefix/share/doc}"
- sysconfdir="${sysconfdir:-$prefix/etc}"
-@@ -4607,6 +4607,9 @@ echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $confi
- # if this macro is set.
- if test "$have_fsxattr" = "yes" ; then
- echo "HAVE_FSXATTR=y" >> $config_host_mak
-+fi
-+if test "$have_ifaddrs_h" = "yes" ; then
-+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak
- fi
- if test "$xen" = "enabled" ; then
- echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
diff --git a/emulators/qemu-devel/files/patch-util_meson.build b/emulators/qemu-devel/files/patch-util_meson.build
new file mode 100644
index 000000000000..44889d1fb32f
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-util_meson.build
@@ -0,0 +1,14 @@
+--- util/meson.build.orig 2022-08-05 20:40:05 UTC
++++ util/meson.build
+@@ -91,10 +91,6 @@ if have_block
+ util_ss.add(files('readline.c'))
+ util_ss.add(files('throttle.c'))
+ util_ss.add(files('timed-average.c'))
+- if config_host_data.get('CONFIG_INOTIFY1')
+- util_ss.add(files('filemonitor-inotify.c'))
+- else
+- util_ss.add(files('filemonitor-stub.c'))
+- endif
++ util_ss.add(files('filemonitor-stub.c'))
+ util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
+ endif
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index 7b1e0a6161bf..8a0e597b2ec1 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -1,6 +1,6 @@
bin/elf2dmp
+bin/qemu-arm
bin/qemu-edid
-bin/qemu-ga
bin/qemu-i386
bin/qemu-img
bin/qemu-io
@@ -14,6 +14,7 @@ bin/qemu-storage-daemon
%%NO_X86_TARGETS%%bin/qemu-system-cris
%%NO_X86_TARGETS%%bin/qemu-system-hppa
bin/qemu-system-i386
+%%NO_X86_TARGETS%%bin/qemu-system-loongarch64
%%NO_X86_TARGETS%%bin/qemu-system-m68k
%%NO_X86_TARGETS%%bin/qemu-system-microblaze
%%NO_X86_TARGETS%%bin/qemu-system-microblazeel
@@ -43,8 +44,6 @@ man/man1/qemu.1.gz
man/man1/qemu-img.1.gz
man/man7/qemu-block-drivers.7.gz
man/man7/qemu-cpu-models.7.gz
-man/man8/qemu-ga.8.gz
-man/man7/qemu-ga-ref.7.gz
man/man8/qemu-nbd.8.gz
man/man8/qemu-pr-helper.8.gz
man/man7/qemu-qmp-ref.7.gz
@@ -118,15 +117,14 @@ man/man7/qemu-storage-daemon-qmp-ref.7.gz
%%DATADIR%%/keymaps/tr
%%DATADIR%%/linuxboot.bin
%%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin
+%%DATADIR%%/multiboot_dma.bin
%%DATADIR%%/multiboot.bin
%%DATADIR%%/npcm7xx_bootrom.bin
%%DATADIR%%/openbios-ppc
%%DATADIR%%/openbios-sparc32
%%DATADIR%%/openbios-sparc64
%%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.bin
-%%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.elf
%%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.bin
-%%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.elf
%%DATADIR%%/palcode-clipper
%%DATADIR%%/petalogix-ml605.dtb
%%DATADIR%%/pxe-e1000.rom
@@ -159,6 +157,8 @@ man/man7/qemu-storage-daemon-qmp-ref.7.gz
%%DATADIR%%/pvh.bin
%%DATADIR%%/vgabios-bochs-display.bin
%%DATADIR%%/vgabios-ramfb.bin
+%%DATADIR%%/vof-nvram.bin
+%%DATADIR%%/vof.bin
share/icons/hicolor/128x128/apps/qemu.png
share/icons/hicolor/16x16/apps/qemu.png
share/icons/hicolor/24x24/apps/qemu.png
@@ -177,4 +177,5 @@ share/applications/qemu.desktop
%%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo
%%GTK3%%share/locale/sv/LC_MESSAGES/qemu.mo
%%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo
+%%GTK3%%share/locale/uk/LC_MESSAGES/qemu.mo
%%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo