diff options
Diffstat (limited to 'emulators')
28 files changed, 172 insertions, 66 deletions
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile index d8f379380948..e0aabc698b6c 100644 --- a/emulators/fceux/Makefile +++ b/emulators/fceux/Makefile @@ -1,7 +1,7 @@ PORTNAME= fceux DISTVERSIONPREFIX= v DISTVERSION= 2.6.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators games PATCH_SITES= https://github.com/TASEmulators/fceux/commit/ diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 780df3c6d185..1a8817b44846 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -17,6 +17,7 @@ BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ bash:shells/bash LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libinotify.so:devel/libinotify \ + liblzo2.so:archivers/lzo2 \ libzstd.so:archivers/zstd USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t localbase:ldflags \ diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist index 77bcdb96f6c0..9a8b55dc08e4 100644 --- a/emulators/qemu-devel/pkg-plist +++ b/emulators/qemu-devel/pkg-plist @@ -64,6 +64,8 @@ share/man/man7/qemu-storage-daemon-qmp-ref.7.gz %%DATADIR%%/bios.bin %%DATADIR%%/dtb/bamboo.dtb %%DATADIR%%/dtb/canyonlands.dtb +%%DATADIR%%/dtb/pegasos1.dtb +%%DATADIR%%/dtb/pegasos2.dtb %%DATADIR%%/dtb/petalogix-ml605.dtb %%DATADIR%%/dtb/petalogix-s3adsp1800.dtb %%DATADIR%%/edk2-aarch64-code.fd diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 4b868c0f35c2..35582fad668b 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -49,6 +49,7 @@ CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_ON+= ${GLSLANG FFMPEG FLATBUFFERS HIDAPI LIBPNG LIBUSB MINIUPNPC PUGIXML RTMIDI XXHASH ZSTD:L:S/^/USE_SYSTEM_/} CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS +CMAKE_ARGS+= -DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" LDFLAGS+= -Wl,--as-needed # GLU OPTIONS_DEFINE= ALSA EVDEV FAUDIO JACK LTO OPENCV PULSEAUDIO SDL SNDIO VULKAN diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile index 29a8b2eb4963..ca6e82c9e081 100644 --- a/emulators/virtualbox-ose-70/Makefile +++ b/emulators/virtualbox-ose-70/Makefile @@ -31,12 +31,11 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-70 -USES= compiler:c++14-lang cpe gnome iconv pkgconfig qt:5 ssl tar:bzip2 +USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USE_BINUTILS= yes USE_GNOME= libxml2 -USE_QT= buildtools:build linguisttools:build USE_RC_SUBR= vboxheadless vboxwatchdog HAS_CONFIGURE= yes @@ -126,7 +125,7 @@ PYTHON_USE= PYTHON=distutils,noegginfo,noflavors PYTHON_CONFIGURE_OFF= --disable-python PYTHON_VARS= pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0 QT5_IMPLIES= X11 -QT5_USES= gl qmake:no_env xorg +QT5_USES= gl qmake:no_env qt:5 xorg QT5_USE= QT=buildtools:build,core,dbus,gui,linguisttools:build,opengl \ QT=printsupport,widgets,x11extras,xml XORG=xcb GL=gl QT5_CONFIGURE_ON= --enable-qt5 @@ -330,6 +329,12 @@ post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ ${WRKSRC}/src/VBox/Runtime/Makefile.kmk +post-patch-NLS-off: + @${ECHO} 'VBOX_WITH_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_MAIN_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_PUEL_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_VBOXMANAGE_NLS =' >> ${WRKSRC}/LocalConfig.kmk + do-build: cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' diff --git a/emulators/virtualbox-ose-70/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-70/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp index 70b459e94da7..03027b3dc445 100644 --- a/emulators/virtualbox-ose-70/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp +++ b/emulators/virtualbox-ose-70/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp @@ -1,6 +1,6 @@ ---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2021-01-07 15:34:20 UTC +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2025-04-11 12:02:56 UTC +++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp -@@ -67,8 +67,8 @@ +@@ -77,8 +77,8 @@ # include <net/if.h> # include <pwd.h> /* getpwuid */ # include <unistd.h> @@ -11,7 +11,7 @@ # endif # ifdef RT_OS_OS2 # include <net/if_dl.h> -@@ -528,7 +528,7 @@ static void vgsvcVMInfoWriteFixedProperties(void) +@@ -535,7 +535,7 @@ static void vgsvcVMInfoWriteFixedProperties(void) } @@ -20,7 +20,7 @@ /* * Simple wrapper to work around compiler-specific va_list madness. */ -@@ -555,12 +555,6 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -562,12 +562,6 @@ static int vgsvcVMInfoWriteUsers(void) #ifdef RT_OS_WINDOWS rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList); @@ -33,7 +33,7 @@ #elif defined(RT_OS_HAIKU) /** @todo Haiku: Port logged on user info retrieval. */ rc = VERR_NOT_IMPLEMENTED; -@@ -586,7 +580,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -593,7 +587,7 @@ static int vgsvcVMInfoWriteUsers(void) while ( (ut_user = getutxent()) && RT_SUCCESS(rc)) { @@ -42,7 +42,7 @@ VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid); # else VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n", -@@ -621,7 +615,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -628,7 +622,7 @@ static int vgsvcVMInfoWriteUsers(void) } # ifdef VBOX_WITH_DBUS @@ -51,7 +51,7 @@ DBusError dbErr; DBusConnection *pConnection = NULL; int rc2 = RTDBusLoadLib(); -@@ -830,7 +824,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -837,7 +831,7 @@ static int vgsvcVMInfoWriteUsers(void) if ( fHaveLibDbus && dbus_error_is_set(&dbErr)) dbus_error_free(&dbErr); @@ -60,7 +60,7 @@ # endif /* VBOX_WITH_DBUS */ /** @todo Fedora/others: Handle systemd-loginctl. */ -@@ -867,7 +861,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -874,7 +868,7 @@ static int vgsvcVMInfoWriteUsers(void) RTMemFree(papszUsers); endutxent(); /* Close utmpx file. */ @@ -69,3 +69,19 @@ Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList)); +@@ -1168,6 +1162,15 @@ static int vgsvcVMInfoWriteNetwork(void) + + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported); + VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down"); ++ ++# ifdef RT_OS_FREEBSD /** @todo Check the other guests. */ ++ RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Name", cIfsReported); ++ int rc2 = RTStrValidateEncoding(pIfCurr->ifa_name); ++ if (RT_SUCCESS(rc2)) ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", pIfCurr->ifa_name); ++ else ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL); ++# endif + + cIfsReported++; + } diff --git a/emulators/virtualbox-ose-71/Makefile b/emulators/virtualbox-ose-71/Makefile index f0ee8e8fe57e..7524f114d6a2 100644 --- a/emulators/virtualbox-ose-71/Makefile +++ b/emulators/virtualbox-ose-71/Makefile @@ -27,12 +27,11 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-71 -USES= compiler:c++17-lang cpe gnome iconv pkgconfig qt:6 ssl tar:bzip2 +USES= compiler:c++17-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USE_BINUTILS= yes USE_GNOME= libxml2 -USE_QT= tools:build USE_RC_SUBR= vboxheadless vboxwatchdog HAS_CONFIGURE= yes @@ -122,7 +121,7 @@ PYTHON_USE= PYTHON=distutils,noegginfo,noflavors PYTHON_CONFIGURE_OFF= --disable-python PYTHON_VARS= pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0 QT6_IMPLIES= X11 -QT6_USES= gl qmake:no_env xorg +QT6_USES= gl qmake:no_env qt:6 xorg QT6_USE= QT=base,scxml,tools,translations \ XORG=xcb GL=gl QT6_CONFIGURE_OFF= --disable-qt @@ -327,6 +326,12 @@ post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ ${WRKSRC}/src/VBox/Runtime/Makefile.kmk +post-patch-NLS-off: + @${ECHO} 'VBOX_WITH_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_MAIN_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_PUEL_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_VBOXMANAGE_NLS =' >> ${WRKSRC}/LocalConfig.kmk + do-build: cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' diff --git a/emulators/virtualbox-ose-71/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-71/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp index 70b459e94da7..7a52a9103251 100644 --- a/emulators/virtualbox-ose-71/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp +++ b/emulators/virtualbox-ose-71/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp @@ -1,6 +1,6 @@ ---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2021-01-07 15:34:20 UTC +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2025-10-16 14:25:31 UTC +++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp -@@ -67,8 +67,8 @@ +@@ -77,8 +77,8 @@ # include <net/if.h> # include <pwd.h> /* getpwuid */ # include <unistd.h> @@ -11,16 +11,16 @@ # endif # ifdef RT_OS_OS2 # include <net/if_dl.h> -@@ -528,7 +528,7 @@ static void vgsvcVMInfoWriteFixedProperties(void) +@@ -573,7 +573,7 @@ static void vgsvcVMInfoWriteFixedProperties(void) } -#if defined(VBOX_WITH_DBUS) && defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */ +#if defined(VBOX_WITH_DBUS) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) /* Not yet for Solaris. */ /* - * Simple wrapper to work around compiler-specific va_list madness. + * Simple wrappers to work around compiler-specific va_list madness. */ -@@ -555,12 +555,6 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -702,12 +702,6 @@ static int vgsvcVMInfoWriteUsers(void) #ifdef RT_OS_WINDOWS rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList); @@ -33,7 +33,7 @@ #elif defined(RT_OS_HAIKU) /** @todo Haiku: Port logged on user info retrieval. */ rc = VERR_NOT_IMPLEMENTED; -@@ -586,7 +580,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -733,7 +727,7 @@ static int vgsvcVMInfoWriteUsers(void) while ( (ut_user = getutxent()) && RT_SUCCESS(rc)) { @@ -42,7 +42,7 @@ VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid); # else VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n", -@@ -621,7 +615,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -749,7 +743,7 @@ static int vgsvcVMInfoWriteUsers(void) } # ifdef VBOX_WITH_DBUS @@ -51,7 +51,7 @@ DBusError dbErr; DBusConnection *pConnection = NULL; int rc2 = RTDBusLoadLib(); -@@ -830,7 +824,7 @@ static int vgsvcVMInfoWriteUsers(void) +@@ -1074,7 +1068,7 @@ static int vgsvcVMInfoWriteUsers(void) if ( fHaveLibDbus && dbus_error_is_set(&dbErr)) dbus_error_free(&dbErr); @@ -59,8 +59,8 @@ +# endif /* RT_OS_LINUX || RT_OS_FREEBSD */ # endif /* VBOX_WITH_DBUS */ - /** @todo Fedora/others: Handle systemd-loginctl. */ -@@ -867,7 +861,7 @@ static int vgsvcVMInfoWriteUsers(void) + /* Calc the string length. */ +@@ -1109,7 +1103,7 @@ static int vgsvcVMInfoWriteUsers(void) RTMemFree(papszUsers); endutxent(); /* Close utmpx file. */ @@ -69,3 +69,19 @@ Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList)); +@@ -1403,6 +1397,15 @@ static int vgsvcVMInfoWriteNetwork(void) + + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported); + VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down"); ++ ++# ifdef RT_OS_FREEBSD /** @todo Check the other guests. */ ++ RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Name", cIfsReported); ++ int rc2 = RTStrValidateEncoding(pIfCurr->ifa_name); ++ if (RT_SUCCESS(rc2)) ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", pIfCurr->ifa_name); ++ else ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL); ++# endif + + cIfsReported++; + } diff --git a/emulators/virtualbox-ose-72/Makefile b/emulators/virtualbox-ose-72/Makefile index 45bd8b9a18a5..ddd477c24c7d 100644 --- a/emulators/virtualbox-ose-72/Makefile +++ b/emulators/virtualbox-ose-72/Makefile @@ -28,12 +28,12 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-72 -USES= compiler:c++17-lang cpe gnome iconv pkgconfig qt:6 ssl tar:bzip2 +USES= compiler:c++17-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USE_BINUTILS= yes USE_GNOME= libxml2 -USE_QT= tools:build +#USE_QT= tools:build USE_RC_SUBR= vboxheadless vboxwatchdog HAS_CONFIGURE= yes @@ -123,7 +123,7 @@ PYTHON_USE= PYTHON=distutils,noegginfo,noflavors PYTHON_CONFIGURE_OFF= --disable-python PYTHON_VARS= pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0 QT6_IMPLIES= X11 -QT6_USES= gl qmake:no_env xorg +QT6_USES= gl qmake:no_env qt:6 xorg QT6_USE= QT=base,scxml,tools,translations \ XORG=xcb GL=gl QT6_CONFIGURE_OFF= --disable-qt @@ -328,6 +328,12 @@ post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ ${WRKSRC}/src/VBox/Runtime/Makefile.kmk +post-patch-NLS-off: + @${ECHO} 'VBOX_WITH_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_MAIN_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_PUEL_NLS =' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_VBOXMANAGE_NLS =' >> ${WRKSRC}/LocalConfig.kmk + do-build: cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' diff --git a/emulators/virtualbox-ose-72/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-72/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp index 0c463e3d9923..a6b7c5d6285c 100644 --- a/emulators/virtualbox-ose-72/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp +++ b/emulators/virtualbox-ose-72/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp @@ -1,4 +1,4 @@ ---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2025-08-13 19:41:16 UTC +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2025-10-17 08:52:40 UTC +++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp @@ -77,8 +77,8 @@ # include <net/if.h> @@ -69,3 +69,19 @@ Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList)); +@@ -1403,6 +1397,15 @@ static int vgsvcVMInfoWriteNetwork(void) + + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported); + VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down"); ++ ++# ifdef RT_OS_FREEBSD /** @todo Check the other guests. */ ++ RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Name", cIfsReported); ++ int rc2 = RTStrValidateEncoding(pIfCurr->ifa_name); ++ if (RT_SUCCESS(rc2)) ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", pIfCurr->ifa_name); ++ else ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL); ++# endif + + cIfsReported++; + } diff --git a/emulators/virtualbox-ose-additions-70/Makefile b/emulators/virtualbox-ose-additions-70/Makefile index 066f84154f32..a2c569f7873d 100644 --- a/emulators/virtualbox-ose-additions-70/Makefile +++ b/emulators/virtualbox-ose-additions-70/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.0.26 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/ PKGNAMESUFFIX?= -additions-70 diff --git a/emulators/virtualbox-ose-additions-71/Makefile b/emulators/virtualbox-ose-additions-71/Makefile index 3a252cd3362b..1c2a4f7319fa 100644 --- a/emulators/virtualbox-ose-additions-71/Makefile +++ b/emulators/virtualbox-ose-additions-71/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.1.14 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/ PKGNAMESUFFIX?= -additions-71 diff --git a/emulators/virtualbox-ose-additions-72/Makefile b/emulators/virtualbox-ose-additions-72/Makefile index 6196899a7ad8..c597ed99b598 100644 --- a/emulators/virtualbox-ose-additions-72/Makefile +++ b/emulators/virtualbox-ose-additions-72/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.2.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/ PKGNAMESUFFIX?= -additions-72 diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile index e9067d5fd9b4..da59aef65d43 100644 --- a/emulators/virtualbox-ose-additions-legacy/Makefile +++ b/emulators/virtualbox-ose-additions-legacy/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 5.2.44 -PORTREVISION?= 8 +PORTREVISION?= 9 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/ PKGNAMESUFFIX?= -additions-legacy diff --git a/emulators/virtualbox-ose-additions-nox11-70/Makefile b/emulators/virtualbox-ose-additions-nox11-70/Makefile index a9a2be2575ba..8a54512f59a6 100644 --- a/emulators/virtualbox-ose-additions-nox11-70/Makefile +++ b/emulators/virtualbox-ose-additions-nox11-70/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -additions-nox11-70 MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions-70 diff --git a/emulators/virtualbox-ose-additions-nox11-71/Makefile b/emulators/virtualbox-ose-additions-nox11-71/Makefile index ef057aa1f5f2..5060b0545b7b 100644 --- a/emulators/virtualbox-ose-additions-nox11-71/Makefile +++ b/emulators/virtualbox-ose-additions-nox11-71/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -additions-nox11-71 MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions-71 diff --git a/emulators/virtualbox-ose-additions-nox11-72/Makefile b/emulators/virtualbox-ose-additions-nox11-72/Makefile index ed7edcf49366..59e4e48e8416 100644 --- a/emulators/virtualbox-ose-additions-nox11-72/Makefile +++ b/emulators/virtualbox-ose-additions-nox11-72/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -additions-nox11-72 MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions-72 diff --git a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile index c02115f2eb3b..7fef05133b84 100644 --- a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile +++ b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 7 +PORTREVISION= 9 PKGNAMESUFFIX= -additions-nox11-legacy MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions-legacy diff --git a/emulators/virtualbox-ose-additions-nox11/Makefile b/emulators/virtualbox-ose-additions-nox11/Makefile index be1a45194f0a..a13626bde395 100644 --- a/emulators/virtualbox-ose-additions-nox11/Makefile +++ b/emulators/virtualbox-ose-additions-nox11/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 3 PKGNAMESUFFIX= -additions-nox11 MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 66227db1aceb..fb8245fa6633 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 6.1.50 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/ PKGNAMESUFFIX?= -additions diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp index 8f6810a5bc82..bfcd88c67974 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp @@ -1,4 +1,4 @@ ---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2017-03-08 17:15:20 UTC +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2020-07-09 16:50:08 UTC +++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp @@ -71,8 +71,8 @@ # include <net/if.h> @@ -11,7 +11,7 @@ # endif # ifdef RT_OS_OS2 # include <net/if_dl.h> -@@ -531,7 +531,7 @@ static void vgsvcVMInfoWriteFixedPropert +@@ -531,7 +531,7 @@ static void vgsvcVMInfoWriteFixedProperties(void) } @@ -69,3 +69,19 @@ Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList)); +@@ -1152,6 +1146,15 @@ static int vgsvcVMInfoWriteNetwork(void) + + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported); + VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down"); ++ ++# ifdef RT_OS_FREEBSD /** @todo Check the other guests. */ ++ RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Name", cIfsReported); ++ int rc2 = RTStrValidateEncoding(pIfCurr->ifa_name); ++ if (RT_SUCCESS(rc2)) ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", pIfCurr->ifa_name); ++ else ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL); ++# endif + + cIfsReported++; + } diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp index 70b459e94da7..b1ccef033ff1 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp @@ -1,4 +1,4 @@ ---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2021-01-07 15:34:20 UTC +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2024-01-11 12:11:39 UTC +++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp @@ -67,8 +67,8 @@ # include <net/if.h> @@ -69,3 +69,19 @@ Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList)); +@@ -1154,6 +1148,15 @@ static int vgsvcVMInfoWriteNetwork(void) + + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported); + VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, pIfCurr->ifa_flags & IFF_UP ? "Up" : "Down"); ++ ++# ifdef RT_OS_FREEBSD /** @todo Check the other guests. */ ++ RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Name", cIfsReported); ++ int rc2 = RTStrValidateEncoding(pIfCurr->ifa_name); ++ if (RT_SUCCESS(rc2)) ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", pIfCurr->ifa_name); ++ else ++ VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL); ++# endif + + cIfsReported++; + } diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 87520160aa8b..9ae1b3bc8440 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= wine -DISTVERSION= 10.18 -PORTREVISION= 1 +DISTVERSION= 10.20 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.x/ @@ -68,7 +67,9 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GECKO GNUTLS MONO V4L WAYLAND X11 +# GECKO and MONO are intentionally kept at the end since they are just +# used to depends at runtime on wine-gecko-devel and wine-mono-devel +OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GNUTLS V4L WAYLAND X11 GECKO MONO OPTIONS_DEFAULT= ALSA FFMPEG GNUTLS WAYLAND X11 OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 930ce6712983..65e988aa3d6e 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761986980 -SHA256 (wine-10.18.tar.xz) = 51fb7273d65d09dea032c4a5e2197b12724b27ca360e1a622b2373d1ee50ad7b -SIZE (wine-10.18.tar.xz) = 32970828 +TIMESTAMP = 1764503402 +SHA256 (wine-10.20.tar.xz) = 81b4a153958f6247fe5041d5df65eadcbbeea1b6ba8cda24eb7e3d7ce2d1fe3c +SIZE (wine-10.20.tar.xz) = 33151284 diff --git a/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 b/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 index 7c6c62b9fe58..4c77701ff27a 100644 --- a/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 +++ b/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 @@ -27,7 +27,7 @@ to minimize divergence and risk on 64-bit x86). const void *data; unsigned int data_size; unsigned int data_offset; -@@ -158,6 +156,28 @@ static void put_string( const struct string_id *str ) +@@ -139,6 +137,28 @@ static void put_string( const struct string_id *str ) } } @@ -56,7 +56,7 @@ to minimize divergence and risk on 64-bit x86). /* check the file header */ /* all values must be zero except header size */ static int check_header(void) -@@ -179,7 +199,7 @@ static int check_header(void) +@@ -160,7 +180,7 @@ static int check_header(void) } /* load the next resource from the current file */ @@ -64,8 +64,8 @@ to minimize divergence and risk on 64-bit x86). +static void load_next_resource( DLLSPEC *spec ) { unsigned int hdr_size; - struct resource *res = add_resource( spec ); -@@ -189,9 +209,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) + struct resource *res = ARRAY_ADD( &spec->resources, struct resource ); +@@ -170,9 +190,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); @@ -75,7 +75,7 @@ to minimize divergence and risk on 64-bit x86). res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; if ((const unsigned char *)res->data < input_buffer || (const unsigned char *)res->data >= input_buffer + input_buffer_size) -@@ -220,7 +237,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) +@@ -201,7 +218,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) if ((ret = check_header())) { @@ -84,10 +84,10 @@ to minimize divergence and risk on 64-bit x86). } return ret; } -@@ -473,7 +490,7 @@ void output_resources( DLLSPEC *spec ) +@@ -441,7 +458,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.balign 4\n" ); - output( ".L__wine_spec_res_%d:\n", i ); + output( ".L__wine_spec_res_%d:\n", i++ ); - output( "\t.incbin \"%s\",%d,%d\n", res->input_name, res->input_offset, res->data_size ); + dump_res_data( res ); } diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c deleted file mode 100644 index bdabb53ea341..000000000000 --- a/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dlls/ntdll/unix/signal_i386.c.orig 2025-10-03 21:01:38 UTC -+++ dlls/ntdll/unix/signal_i386.c -@@ -827,7 +827,7 @@ static void fixup_frame_fpu_state( struct syscall_fram - if (FPUX_sig(sigcontext)) - { - if (user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE]) -- frame->u.xsave = *FPUX_sig(sigcontext); -+ frame->u.xsave = *((XSAVE_FORMAT *) FPUX_sig(sigcontext)); - else - fpux_to_fpu( &frame->u.fsave, FPUX_sig(sigcontext) ); - frame->xstate.Mask = XSTATE_MASK_LEGACY; diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index 47d8fcc90f2c..9008572125d3 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -10,6 +10,9 @@ if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ] then printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine" printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine-devel mesa-dri" + + printf "In the case of FreeBSD 15.0, use wine64 instead or use Poudriere if 32bit is needed\n" + ABI=$(pkg config ABI | sed s/amd64/i386/) FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"` cat <<- HERE @@ -20,6 +23,7 @@ then FreeBSD:$FREEBSD_VERSION_MAJOR:i386 to the relevant output directories. See pkg.conf(5) for more info. HERE + exit 1 fi diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index cbbfdee6007e..875eaa438fcc 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -98,6 +98,7 @@ include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h include/wine/svcctl.h include/wine/svcctl.idl +include/wine/unixlib.h include/wine/windows/accctrl.h include/wine/windows/access.idl include/wine/windows/aclapi.h @@ -591,6 +592,7 @@ include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/icodecapi.h include/wine/windows/icodecapi.idl +include/wine/windows/icu.h include/wine/windows/idispids.h include/wine/windows/ieautomation.h include/wine/windows/ieautomation.idl @@ -934,6 +936,7 @@ include/wine/windows/rstloc.idl include/wine/windows/rstnot.idl include/wine/windows/rstscr.idl include/wine/windows/rstupd.idl +include/wine/windows/rstvw.idl include/wine/windows/rstxsc.idl include/wine/windows/rtlsupportapi.h include/wine/windows/rtutils.h @@ -1090,6 +1093,8 @@ include/wine/windows/vsstyle.h include/wine/windows/vssym32.h include/wine/windows/vswriter.h include/wine/windows/vswriter.idl +include/wine/windows/vwchp.idl +include/wine/windows/vwflt.idl include/wine/windows/wbemcli.h include/wine/windows/wbemcli.idl include/wine/windows/wbemdisp.h @@ -1528,6 +1533,7 @@ lib/wine/%%WINEARCH%%-unix/libhlink.a lib/wine/%%WINEARCH%%-unix/libhtmlhelp.a lib/wine/%%WINEARCH%%-unix/libhttpapi.a lib/wine/%%WINEARCH%%-unix/libicmui.a +lib/wine/%%WINEARCH%%-unix/libicu.a lib/wine/%%WINEARCH%%-unix/libieframe.a lib/wine/%%WINEARCH%%-unix/libimagehlp.a lib/wine/%%WINEARCH%%-unix/libimm32.a @@ -1956,6 +1962,9 @@ lib/wine/%%WINEARCH%%-windows/iccvid.dll lib/wine/%%WINEARCH%%-windows/icinfo.exe lib/wine/%%WINEARCH%%-windows/icmp.dll lib/wine/%%WINEARCH%%-windows/icmui.dll +lib/wine/%%WINEARCH%%-windows/icu.dll +lib/wine/%%WINEARCH%%-windows/icuin.dll +lib/wine/%%WINEARCH%%-windows/icuuc.dll lib/wine/%%WINEARCH%%-windows/ieframe.dll lib/wine/%%WINEARCH%%-windows/ieproxy.dll lib/wine/%%WINEARCH%%-windows/iertutil.dll @@ -2093,6 +2102,7 @@ lib/wine/%%WINEARCH%%-windows/libhlink.a lib/wine/%%WINEARCH%%-windows/libhtmlhelp.a lib/wine/%%WINEARCH%%-windows/libhttpapi.a lib/wine/%%WINEARCH%%-windows/libicmui.a +lib/wine/%%WINEARCH%%-windows/libicu.a lib/wine/%%WINEARCH%%-windows/libieframe.a lib/wine/%%WINEARCH%%-windows/libimagehlp.a lib/wine/%%WINEARCH%%-windows/libimm32.a @@ -2364,6 +2374,7 @@ lib/wine/%%WINEARCH%%-windows/msvcrt.dll lib/wine/%%WINEARCH%%-windows/msvcrt20.dll lib/wine/%%WINEARCH%%-windows/msvcrt40.dll lib/wine/%%WINEARCH%%-windows/msvcrtd.dll +lib/wine/%%WINEARCH%%-windows/msvdsp.dll lib/wine/%%WINEARCH%%-windows/msvfw32.dll lib/wine/%%WINEARCH%%-windows/msvidc32.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/msvideo.dll16 @@ -2589,6 +2600,7 @@ lib/wine/%%WINEARCH%%-windows/vdmdbg.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/ver.dll16 lib/wine/%%WINEARCH%%-windows/version.dll lib/wine/%%WINEARCH%%-windows/vga.dll +lib/wine/%%WINEARCH%%-windows/vidreszr.dll lib/wine/%%WINEARCH%%-windows/view.exe lib/wine/%%WINEARCH%%-windows/virtdisk.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/vmm.vxd |