CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 28 Aug 2026 07:54:20 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 28 07:54:20 UTC 2026

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo
        pkgsrc/sysutils/qemu-guest-agent: Makefile
Added Files:
        pkgsrc/emulators/qemu: Makefile.common
Removed Files:
        pkgsrc/emulators/qemu: version.mk

Log Message:
qemu: updated to 11.1.1

11.1.1
Bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/qemu/Makefile.common
cvs rdiff -u -r1.255 -r1.256 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.18 -r0 pkgsrc/emulators/qemu/version.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/qemu-guest-agent/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.411 pkgsrc/emulators/qemu/Makefile:1.412
--- pkgsrc/emulators/qemu/Makefile:1.411        Fri Aug  7 08:15:32 2026
+++ pkgsrc/emulators/qemu/Makefile      Fri Aug 28 07:54:20 2026
@@ -1,27 +1,10 @@
-# $NetBSD: Makefile,v 1.411 2026/08/07 08:15:32 adam Exp $
+# $NetBSD: Makefile,v 1.412 2026/08/28 07:54:20 adam Exp $
 
-.include "../../emulators/qemu/version.mk"
+.include "../../emulators/qemu/Makefile.common"
 
-DISTNAME=      qemu-${QEMU_VERSION}
 CATEGORIES=    emulators
-MASTER_SITES=  https://download.qemu.org/
-EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.qemu.org/
 COMMENT=       Machine emulator and virtualizer
-LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
-
-# From pythondeps.toml
-TOOL_DEPENDS+= meson>=1.5.0:../../devel/meson
-TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
-# From python/scripts/mkvenv.py
-TOOL_DEPENDS+= ${PYPKGPREFIX}-distlib-[0-9]*:../../devel/py-distlib
-TOOL_DEPENDS+= ${PYPKGPREFIX}-pycotap>=1.1.0:../../devel/py-pycotap
-DEPENDS+=      ${PYPKGPREFIX}-pip>=20.3.4:../../devel/py-pip
-DEPENDS+=      ${PYPKGPREFIX}-qemu.qmp>=0.0.5:../../emulators/py-qemu.qmp
-DEPENDS+=      ${PYPKGPREFIX}-setuptools>=44.1.1:../../devel/py-setuptools
-DEPENDS+=      ${PYPKGPREFIX}-wheel>=0.34.2:../../devel/py-wheel
 
 USE_CURSES=            resize_term wide
 USE_LANGUAGES+=                c c++
@@ -32,13 +15,6 @@ HAS_CONFIGURE=               yes
 # https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
 GCC_REQD+=     7
 
-PYTHON_VERSIONS_INCOMPATIBLE=  310 311 # py-sphinx
-
-.include "../../lang/python/pyversion.mk"
-.if ${PYTHON_VERSION} < 311
-DEPENDS+=      ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli
-.endif
-
 .include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
@@ -53,17 +29,9 @@ DISTFILES=           ${DEFAULT_DISTFILES}
 DISTFILES+=            ${PALCODE_CLIPPER}
 SITES.${PALCODE_CLIPPER}= http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/
 
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --interp-prefix=${PREFIX}/share/qemu
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --python=${PYTHONBIN}
-CONFIGURE_ARGS+=       --smbd=${PREFIX}/sbin/smbd
-CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --enable-curses
 CONFIGURE_ARGS+=       --enable-fdt=system
 CONFIGURE_ARGS+=       --disable-guest-agent
-CONFIGURE_ENV+=                mansuffix=/${PKGMANDIR}
-ALL_ENV+=              MESON_RSP_THRESHOLD=262144
 
 .if ${PKGSRC_USE_SSP:Uno:tl} != "no"
 # do not add flags to everything

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.255 pkgsrc/emulators/qemu/distinfo:1.256
--- pkgsrc/emulators/qemu/distinfo:1.255        Thu Aug 27 07:27:38 2026
+++ pkgsrc/emulators/qemu/distinfo      Fri Aug 28 07:54:20 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.255 2026/08/27 07:27:38 adam Exp $
+$NetBSD: distinfo,v 1.256 2026/08/28 07:54:20 adam Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
 Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
-BLAKE2s (qemu-11.1.0.tar.xz) = 50727f8690c34e9ac1641d7daf841b09a2575572762f06f762c4564b7d99ec30
-SHA512 (qemu-11.1.0.tar.xz) = 17009c49b1a4f35b150f98c7c3955cb44bf9c63593f124276b328da97568f600724b8f26759fbac88e96e814bda389491713e34b3aae53fa515277f5a868ea5a
-Size (qemu-11.1.0.tar.xz) = 141831772 bytes
+BLAKE2s (qemu-11.1.1.tar.xz) = a0f8de8bf898a6346ec2af51a0057d37a2dc3f49c324922fc3e2ab3671ae7af3
+SHA512 (qemu-11.1.1.tar.xz) = f30b36800b44ac0370e63341a8c5591019648a78d5929e18b0177873c0b6e4a0cbbddc069337cb06a3b5d20d15779c9b9786d0a92073c421fb07ae14a67d4646
+Size (qemu-11.1.1.tar.xz) = 141888716 bytes
 SHA1 (patch-fsdev_file-op-9p.h) = 1cf9f8602dca42b82f3d10e67c9bcd6aa971c7cc
 SHA1 (patch-fsdev_meson.build) = 15588c37dd4f6cc5064b8a163f814cee75b7246f
 SHA1 (patch-hw-mips-Kconfig) = 967cf02da1577bcee0c06997d981c5aa01b75424

Index: pkgsrc/sysutils/qemu-guest-agent/Makefile
diff -u pkgsrc/sysutils/qemu-guest-agent/Makefile:1.13 pkgsrc/sysutils/qemu-guest-agent/Makefile:1.14
--- pkgsrc/sysutils/qemu-guest-agent/Makefile:1.13      Thu Aug 27 07:27:39 2026
+++ pkgsrc/sysutils/qemu-guest-agent/Makefile   Fri Aug 28 07:54:20 2026
@@ -1,38 +1,20 @@
-# $NetBSD: Makefile,v 1.13 2026/08/27 07:27:39 adam Exp $
+# $NetBSD: Makefile,v 1.14 2026/08/28 07:54:20 adam Exp $
 
-.include "../../emulators/qemu/version.mk"
+.include "../../emulators/qemu/Makefile.common"
 
-DISTNAME=      qemu-${QEMU_VERSION}
 PKGNAME=       ${DISTNAME:S/qemu/qemu-guest-agent/}
 CATEGORIES=    sysutils emulators
-MASTER_SITES=  https://download.qemu.org/
-EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.qemu.org/
 COMMENT=       QEMU guest agent
-LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
 
 # meson.build: unsupported OS for QEMU guest agent
 NOT_FOR_PLATFORM=      Darwin-*-*
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-distlib-[0-9]*:../../devel/py-distlib
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
-TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson
-TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
-DEPENDS+=      ${PYPKGPREFIX}-qemu.qmp-[0-9]*:../../emulators/py-qemu.qmp
-
-PYTHON_VERSIONS_INCOMPATIBLE=  310 311 # py-sphinx
-
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            pkg-config perl
 UNLIMIT_RESOURCES=     datasize
 HAS_CONFIGURE=         yes
 
-PATCHDIR=              ../../emulators/qemu/patches
-DISTINFO_FILE=         ../../emulators/qemu/distinfo
 RCD_SCRIPTS=           qemu-guest-agent
 
 CONFLICTS+=            qemu-[0-9]*
@@ -44,14 +26,6 @@ GCC_REQD+=           7
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --interp-prefix=${PREFIX}/share/qemu
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+=       --python=${TOOL_PYTHONBIN}
-CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ENV+=                mansuffix=/${PKGMANDIR}
-ALL_ENV+=              MESON_RSP_THRESHOLD=262144
-
 CONFIGURE_ARGS+=       --enable-guest-agent
 CONFIGURE_ARGS+=       --disable-tools
 CONFIGURE_ARGS+=       --disable-xkbcommon

Added files:

Index: pkgsrc/emulators/qemu/Makefile.common
diff -u /dev/null pkgsrc/emulators/qemu/Makefile.common:1.1
--- /dev/null   Fri Aug 28 07:54:20 2026
+++ pkgsrc/emulators/qemu/Makefile.common       Fri Aug 28 07:54:20 2026
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile.common,v 1.1 2026/08/28 07:54:20 adam Exp $
+# used by emulators/qemu/Makefile
+# used by sysutils/qemu-guest-agent/Makefile
+
+QEMU_VERSION?= 11.1.1
+
+DISTNAME=      qemu-${QEMU_VERSION}
+MASTER_SITES=  https://download.qemu.org/
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.qemu.org/
+LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
+
+# From pythondeps.toml
+TOOL_DEPENDS+= meson>=1.5.0:../../devel/meson
+TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
+# From python/scripts/mkvenv.py
+TOOL_DEPENDS+= ${PYPKGPREFIX}-distlib-[0-9]*:../../devel/py-distlib
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pycotap>=1.1.0:../../devel/py-pycotap
+DEPENDS+=      ${PYPKGPREFIX}-pip>=20.3.4:../../devel/py-pip
+DEPENDS+=      ${PYPKGPREFIX}-qemu.qmp>=0.0.5:../../emulators/py-qemu.qmp
+DEPENDS+=      ${PYPKGPREFIX}-setuptools>=44.1.1:../../devel/py-setuptools
+DEPENDS+=      ${PYPKGPREFIX}-wheel>=0.34.2:../../devel/py-wheel
+
+DISTINFO_FILE= ../../emulators/qemu/distinfo
+PATCHDIR=      ../../emulators/qemu/patches
+
+PYTHON_VERSIONS_INCOMPATIBLE=  310 311 # py-sphinx
+
+CHECK_PORTABILITY_SKIP+=       scripts/gitlab-map-update
+
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
+CONFIGURE_ARGS+=       --interp-prefix=${PREFIX}/share/qemu
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --python=${PYTHONBIN}
+CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ENV+=                mansuffix=/${PKGMANDIR}
+ALL_ENV+=              MESON_RSP_THRESHOLD=262144

Prev by Date: CVS commit: pkgsrc/security/libgcrypt
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/security/libgcrypt
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index