summaryrefslogtreecommitdiff
path: root/emulators/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/qemu')
-rw-r--r--emulators/qemu/Makefile5
-rw-r--r--emulators/qemu/distinfo6
-rw-r--r--emulators/qemu/files/extra-patch-meson.build38
-rw-r--r--emulators/qemu/pkg-plist9
4 files changed, 50 insertions, 8 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 6dce4eb92909..d0f32d5f327d 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,5 +1,5 @@
PORTNAME= qemu
-DISTVERSION= 10.0.0
+DISTVERSION= 10.1.2
PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
@@ -124,6 +124,9 @@ CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//}
WITHOUT_CPU_CFLAGS= yes #to avoid problems with register allocation
BINARY_ALIAS= python3=${PYTHON_VERSION}
+.if exists(/usr/include/sys/inotify.h)
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-meson.build
+.endif
PORTDOCS= .buildinfo _static/* about/* dbus-dbusindex.html devel/* docs \
genindex.html glossary.html index.html interop/* objects.inv \
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 275a61eeb6ef..5e2a252aab2a 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746448259
-SHA256 (qemu/10.0.0/qemu-10.0.0.tar.xz) = 22c075601fdcf8c7b2671a839ebdcef1d4f2973eb6735254fd2e1bd0f30b3896
-SIZE (qemu/10.0.0/qemu-10.0.0.tar.xz) = 135618260
+TIMESTAMP = 1761563277
+SHA256 (qemu/10.1.2/qemu-10.1.2.tar.xz) = 9d75f331c1a5cb9b6eb8fd9f64f563ec2eab346c822cb97f8b35cd82d3f11479
+SIZE (qemu/10.1.2/qemu-10.1.2.tar.xz) = 142050300
diff --git a/emulators/qemu/files/extra-patch-meson.build b/emulators/qemu/files/extra-patch-meson.build
new file mode 100644
index 000000000000..5fc53eb7c6f6
--- /dev/null
+++ b/emulators/qemu/files/extra-patch-meson.build
@@ -0,0 +1,38 @@
+--- meson.build.orig 2025-12-03 21:35:34 UTC
++++ meson.build
+@@ -2738,17 +2738,6 @@ have_inotify_init1 = cc.has_header_symbol('sys/inotify
+
+ have_inotify_init = cc.has_header_symbol('sys/inotify.h', 'inotify_init')
+ have_inotify_init1 = cc.has_header_symbol('sys/inotify.h', 'inotify_init1')
+-inotify = not_found
+-if (have_inotify_init or have_inotify_init1) and host_os == 'freebsd'
+- # libinotify-kqueue
+- inotify = cc.find_library('inotify')
+- if have_inotify_init
+- have_inotify_init = inotify.found()
+- endif
+- if have_inotify_init1
+- have_inotify_init1 = inotify.found()
+- endif
+-endif
+ config_host_data.set('CONFIG_INOTIFY', have_inotify_init)
+ config_host_data.set('CONFIG_INOTIFY1', have_inotify_init1)
+
+@@ -5011,7 +5000,6 @@ if host_os == 'freebsd'
+ summary_info += {'selinux': selinux}
+ summary_info += {'libdw': libdw}
+ if host_os == 'freebsd'
+- summary_info += {'libinotify-kqueue': inotify}
+ endif
+ if host_os == 'darwin'
+ summary_info += {'ParavirtualizedGraphics support': pvg}
+--- util/meson.build.orig 2025-12-04 10:07:58 UTC
++++ util/meson.build
+@@ -110,7 +110,6 @@ if have_block
+ if config_host_data.get('CONFIG_INOTIFY1')
+ freebsd_dep = []
+ if host_os == 'freebsd'
+- freebsd_dep = inotify
+ endif
+ util_ss.add(files('filemonitor-inotify.c'), freebsd_dep)
+ else
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index 0622304d8a65..f6a824c2be31 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -53,10 +53,14 @@ include/qemu-plugin.h
@sample etc/qemu-ifdown.sample
%%DATADIR%%/QEMU,tcx.bin
%%DATADIR%%/QEMU,cgthree.bin
+%%DATADIR%%/ast27x0_bootrom.bin
%%DATADIR%%/bios-256k.bin
%%DATADIR%%/bios-microvm.bin
%%DATADIR%%/bios.bin
-%%DATADIR%%/canyonlands.dtb
+%%DATADIR%%/dtb/bamboo.dtb
+%%DATADIR%%/dtb/canyonlands.dtb
+%%DATADIR%%/dtb/petalogix-ml605.dtb
+%%DATADIR%%/dtb/petalogix-s3adsp1800.dtb
%%DATADIR%%/edk2-aarch64-code.fd
%%DATADIR%%/edk2-arm-code.fd
%%DATADIR%%/edk2-arm-vars.fd
@@ -134,7 +138,6 @@ include/qemu-plugin.h
%%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.bin
%%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.bin
%%DATADIR%%/palcode-clipper
-%%DATADIR%%/petalogix-ml605.dtb
%%DATADIR%%/pnv-pnor.bin
%%DATADIR%%/pxe-e1000.rom
%%DATADIR%%/pxe-eepro100.rom
@@ -157,8 +160,6 @@ include/qemu-plugin.h
%%DATADIR%%/vgabios-vmware.bin
%%DATADIR%%/skiboot.lid
%%DATADIR%%/trace-events-all
-%%DATADIR%%/petalogix-s3adsp1800.dtb
-%%DATADIR%%/bamboo.dtb
%%DATADIR%%/kvmvapic.bin
%%DATADIR%%/u-boot.e500
%%DATADIR%%/pvh.bin