diff options
Diffstat (limited to 'emulators')
47 files changed, 117 insertions, 713 deletions
diff --git a/emulators/Makefile b/emulators/Makefile index 16651319508e..266c35f64e87 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -120,7 +120,6 @@ SUBDIR += qemu-powernv SUBDIR += qemu-user-static SUBDIR += qemu-user-static-devel - SUBDIR += qemu8 SUBDIR += qmc2 SUBDIR += quasi88 SUBDIR += reicast diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile index 6ec6dc0301ee..d2e59fa9646a 100644 --- a/emulators/ares/Makefile +++ b/emulators/ares/Makefile @@ -1,8 +1,10 @@ PORTNAME= ares DISTVERSIONPREFIX= v -DISTVERSION= 144 +DISTVERSION= 145 PORTREVISION= 1 CATEGORIES= emulators +MASTER_SITES= https://github.com/${PORTNAME}-emulator/${PORTNAME}/releases/download/${DISTVERSIONFULL}/ +DISTNAME= ${PORTNAME}-source MAINTAINER= bsdcode@disroot.org COMMENT= Multi-system emulator @@ -14,16 +16,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= librashader>0:devel/librashader USES= cmake compiler:c++17-lang gl gnome pkgconfig xorg -USE_GITHUB= yes -GH_ACCOUNT= ares-emulator USE_GL= opengl USE_GNOME= gtk30 USE_XORG= x11 xext xrandr xrender CMAKE_ARGS= -DARES_CORES="${_CORES:S/ /;/gW}" \ - -DARES_VERSION_OVERRIDE=${DISTVERSIONFULL} \ -DENABLE_CCACHE=${CCACHE_ENABLED} -CMAKE_ON= ARES_SKIP_DEPS \ +CMAKE_ON= ARES_BUILD_OFFICIAL \ + ARES_SKIP_DEPS \ ARES_UNITY_CORES CMAKE_OFF= ARES_BUILD_LOCAL \ ARES_BUNDLE_SHADERS \ @@ -32,6 +32,8 @@ CMAKE_OFF= ARES_BUILD_LOCAL \ EXTRACT_AFTER_ARGS= --exclude thirdparty/librashader \ --no-same-owner --no-same-permissions +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} + OPTIONS_DEFINE= CHD SDL TOOLS OPTIONS_DEFAULT= A26 ALSA AO CHD CV FC GB GBA LIBRASHADER \ LIBRETRO LTO MD MS MSX MYVISION N64 NG NGP \ @@ -62,7 +64,7 @@ GBA_DESC= Game Boy Advance GB_DESC= Game Boy / Game Boy Color HOTKEYS_DESC= Inofficial hotkeys locking patch LIBRASHADER_DESC= Slang-shader support via librashader -LIBRETRO_DESC= Install slang-shaders from libretro +LIBRETRO_DESC= Install slang-shaders from libretro (implies ${LIBRETRO_IMPLIES}) MD_DESC= Sega Mega Drive / Genesis MSX_DESC= Microsoft MSX MS_DESC= Sega Master System / Mark III @@ -155,6 +157,8 @@ SG_VARS= _CORES+=sg SPEC_VARS= _CORES+=spec +# https://github.com/ares-emulator/ares/issues/2090 +TOOLS_IMPLIES= GBA MD NG SFC TOOLS_CMAKE_BOOL= ARES_BUILD_OPTIONAL_TARGETS UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd diff --git a/emulators/ares/distinfo b/emulators/ares/distinfo index 67421c24b118..6d6b5f6a7b60 100644 --- a/emulators/ares/distinfo +++ b/emulators/ares/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745841018 -SHA256 (ares-emulator-ares-v144_GH0.tar.gz) = 8d66fc880375293aaddbff575f21571ed9c7bc05bd5dd0e8e9ea65b104d5a458 -SIZE (ares-emulator-ares-v144_GH0.tar.gz) = 8959609 +TIMESTAMP = 1752185303 +SHA256 (ares-source.tar.gz) = 7a76acf87cca2903552683347fdf6f1cd06f436fa4e0c247108688785cbbd14b +SIZE (ares-source.tar.gz) = 8967048 diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile index 651e97e13a2f..307da6124c7b 100644 --- a/emulators/catapult/Makefile +++ b/emulators/catapult/Makefile @@ -1,6 +1,6 @@ PORTNAME= catapult PORTVERSION= 18.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/ DISTNAME= openmsx-${PORTNAME}-${PORTVERSION} diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 5db1b3bb3ee3..56bda1777a87 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -104,7 +104,7 @@ post-patch: .endif post-configure: - @${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${_DISTDIR},} \ + @${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${DISTDIR}/,} \ ${BUILD_WRKSRC}/dist/compatibility_list/ .include <bsd.port.post.mk> diff --git a/emulators/dosbox-staging/Makefile b/emulators/dosbox-staging/Makefile index b013dfafdf98..0b75575cc5de 100644 --- a/emulators/dosbox-staging/Makefile +++ b/emulators/dosbox-staging/Makefile @@ -1,6 +1,7 @@ PORTNAME= dosbox-staging DISTVERSIONPREFIX= v DISTVERSION= 0.82.2 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= makc@FreeBSD.org diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile index 5e494aad2821..3695fa607252 100644 --- a/emulators/es-de/Makefile +++ b/emulators/es-de/Makefile @@ -1,7 +1,6 @@ PORTNAME= es-de DISTVERSIONPREFIX= v -DISTVERSION= 3.2.0 -PORTREVISION= 1 +DISTVERSION= 3.3.0 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org @@ -29,7 +28,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu \ liblunasvg.so:graphics/lunasvg \ - libpoppler.so:graphics/poppler \ + libpoppler-cpp.so:graphics/poppler \ libpugixml.so:textproc/pugixml \ librlottie.so:graphics/rlottie RUN_DEPENDS= ${_BR_DEPENDS} diff --git a/emulators/es-de/distinfo b/emulators/es-de/distinfo index c3e2a5486a63..d77a0d35d056 100644 --- a/emulators/es-de/distinfo +++ b/emulators/es-de/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743784837 -SHA256 (emulationstation-de-v3.2.0.tar.bz2) = dbe8e087042e49ec58d893a2408acbb45409b8b8f6f90afcbd9ad1219da612d3 -SIZE (emulationstation-de-v3.2.0.tar.bz2) = 72149068 +TIMESTAMP = 1752597245 +SHA256 (emulationstation-de-v3.3.0.tar.bz2) = e191f2ab66fdb0aea98369c4e5d94dd414a873d00b0129dfb65a502429f7eb93 +SIZE (emulationstation-de-v3.3.0.tar.bz2) = 72775703 diff --git a/emulators/es-de/files/patch-es-app_CMakeLists.txt b/emulators/es-de/files/patch-es-app_CMakeLists.txt new file mode 100644 index 000000000000..534d9feeea1c --- /dev/null +++ b/emulators/es-de/files/patch-es-app_CMakeLists.txt @@ -0,0 +1,11 @@ +--- es-app/CMakeLists.txt.orig 2025-07-15 16:46:41 UTC ++++ es-app/CMakeLists.txt +@@ -147,7 +147,7 @@ else() + else() + include_directories(${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src) + add_executable(es-de ${ES_SOURCES} ${ES_HEADERS}) +- target_link_libraries(es-de ${COMMON_LIBRARIES} ${CMAKE_DL_LIBS} es-core lunasvg::lunasvg) ++ target_link_libraries(es-de ${COMMON_LIBRARIES} ${CMAKE_DL_LIBS} es-core) + set_target_properties(es-de PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() + diff --git a/emulators/es-de/pkg-plist b/emulators/es-de/pkg-plist index b21bd1041343..75a84449b9d3 100644 --- a/emulators/es-de/pkg-plist +++ b/emulators/es-de/pkg-plist @@ -25,6 +25,9 @@ share/applications/org.es_de.frontend.desktop %%DATADIR%%/licenses/DroidSans %%DATADIR%%/licenses/FFmpeg %%DATADIR%%/licenses/FontAwesome +%%DATADIR%%/licenses/Fontconfig +%%DATADIR%%/licenses/FreeImage +%%DATADIR%%/licenses/FreeType %%DATADIR%%/licenses/Freesound_CC0 %%DATADIR%%/licenses/Freesound_CCBY %%DATADIR%%/licenses/GLEW @@ -32,23 +35,31 @@ share/applications/org.es_de.frontend.desktop %%DATADIR%%/licenses/GNUFreeFont %%DATADIR%%/licenses/HarfBuzz %%DATADIR%%/licenses/ICU +%%DATADIR%%/licenses/LibTIFF %%DATADIR%%/licenses/LunaSVG %%DATADIR%%/licenses/MAME %%DATADIR%%/licenses/NanumSquareNeo %%DATADIR%%/licenses/NotoEmoji %%DATADIR%%/licenses/Ogg +%%DATADIR%%/licenses/OpenJPEG +%%DATADIR%%/licenses/OpenSSL %%DATADIR%%/licenses/OpenSans %%DATADIR%%/licenses/Opus %%DATADIR%%/licenses/PhosphorIcons %%DATADIR%%/licenses/Poppler +%%DATADIR%%/licenses/SDL %%DATADIR%%/licenses/UTF8-CPP %%DATADIR%%/licenses/Vorbis +%%DATADIR%%/licenses/curl %%DATADIR%%/licenses/libgit2 +%%DATADIR%%/licenses/libiconv %%DATADIR%%/licenses/libintl -%%DATADIR%%/licenses/libvpx +%%DATADIR%%/licenses/libjpeg-turbo +%%DATADIR%%/licenses/libpng %%DATADIR%%/licenses/linear-es-de %%DATADIR%%/licenses/modern-es-de %%DATADIR%%/licenses/modern-es-de_nsoicons +%%DATADIR%%/licenses/pugixml %%DATADIR%%/licenses/rlottie %%DATADIR%%/licenses/slate-es-de %%DATADIR%%/licenses/ubuntu-font-licence-1.0 @@ -219,20 +230,24 @@ share/applications/org.es_de.frontend.desktop %%DATADIR%%/resources/graphics/textinput_focused.svg %%DATADIR%%/resources/graphics/white.png %%DATADIR%%/resources/graphics/window_icon_256.png +%%NLS%%%%DATADIR%%/resources/locale/bs_BA/LC_MESSAGES/bs_BA.mo %%NLS%%%%DATADIR%%/resources/locale/ca_ES/LC_MESSAGES/ca_ES.mo %%NLS%%%%DATADIR%%/resources/locale/de_DE/LC_MESSAGES/de_DE.mo %%NLS%%%%DATADIR%%/resources/locale/en_GB/LC_MESSAGES/en_GB.mo %%NLS%%%%DATADIR%%/resources/locale/en_US/LC_MESSAGES/en_US.mo %%NLS%%%%DATADIR%%/resources/locale/es_ES/LC_MESSAGES/es_ES.mo %%NLS%%%%DATADIR%%/resources/locale/fr_FR/LC_MESSAGES/fr_FR.mo +%%NLS%%%%DATADIR%%/resources/locale/hr_HR/LC_MESSAGES/hr_HR.mo %%NLS%%%%DATADIR%%/resources/locale/it_IT/LC_MESSAGES/it_IT.mo %%NLS%%%%DATADIR%%/resources/locale/ja_JP/LC_MESSAGES/ja_JP.mo %%NLS%%%%DATADIR%%/resources/locale/ko_KR/LC_MESSAGES/ko_KR.mo %%NLS%%%%DATADIR%%/resources/locale/nl_NL/LC_MESSAGES/nl_NL.mo %%NLS%%%%DATADIR%%/resources/locale/pl_PL/LC_MESSAGES/pl_PL.mo %%NLS%%%%DATADIR%%/resources/locale/pt_BR/LC_MESSAGES/pt_BR.mo +%%NLS%%%%DATADIR%%/resources/locale/pt_PT/LC_MESSAGES/pt_PT.mo %%NLS%%%%DATADIR%%/resources/locale/ro_RO/LC_MESSAGES/ro_RO.mo %%NLS%%%%DATADIR%%/resources/locale/ru_RU/LC_MESSAGES/ru_RU.mo +%%NLS%%%%DATADIR%%/resources/locale/sr_RS/LC_MESSAGES/sr_RS.mo %%NLS%%%%DATADIR%%/resources/locale/sv_SE/LC_MESSAGES/sv_SE.mo %%NLS%%%%DATADIR%%/resources/locale/zh_CN/LC_MESSAGES/zh_CN.mo %%NLS%%%%DATADIR%%/resources/locale/zh_TW/LC_MESSAGES/zh_TW.mo @@ -252,17 +267,23 @@ share/applications/org.es_de.frontend.desktop %%DATADIR%%/resources/sounds/select.wav %%DATADIR%%/resources/sounds/systembrowse.wav %%DATADIR%%/resources/systems/android/es_find_rules.xml +%%DATADIR%%/resources/systems/android/es_import_rules.xml %%DATADIR%%/resources/systems/android/es_systems.xml %%DATADIR%%/resources/systems/haiku/es_find_rules.xml +%%DATADIR%%/resources/systems/haiku/es_import_rules.xml %%DATADIR%%/resources/systems/haiku/es_systems.xml %%DATADIR%%/resources/systems/linux/es_find_rules.xml +%%DATADIR%%/resources/systems/linux/es_import_rules.xml %%DATADIR%%/resources/systems/linux/es_systems.xml %%DATADIR%%/resources/systems/macos/es_find_rules.xml +%%DATADIR%%/resources/systems/macos/es_import_rules.xml %%DATADIR%%/resources/systems/macos/es_systems.xml %%DATADIR%%/resources/systems/unix/es_find_rules.xml +%%DATADIR%%/resources/systems/unix/es_import_rules.xml %%DATADIR%%/resources/systems/unix/es_systems.xml %%DATADIR%%/resources/systems/windows/es_find_rules.xml %%DATADIR%%/resources/systems/windows/es_find_rules_portable.xml +%%DATADIR%%/resources/systems/windows/es_import_rules.xml %%DATADIR%%/resources/systems/windows/es_systems.xml %%DATADIR%%/themes/linear-es-de/CREDITS.md %%DATADIR%%/themes/linear-es-de/LICENSE diff --git a/emulators/flycast/Makefile b/emulators/flycast/Makefile index 40740987bb9b..2366f019499b 100644 --- a/emulators/flycast/Makefile +++ b/emulators/flycast/Makefile @@ -1,7 +1,7 @@ PORTNAME= flycast DISTVERSIONPREFIX= v DISTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org @@ -20,10 +20,11 @@ LIB_DEPENDS= libchdr.so:devel/libchdr \ USES= cmake compiler:c++20-lang pkgconfig sdl USE_GITHUB= yes GH_ACCOUNT= flyinghead +GH_TUPLE= vinniefalco:LuaBridge:5d21e35633a1f87ed08af115b07d3386096f792b:LuaBridge/core/deps/luabridge \ + GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:6eb62e1515072827db992c2befd80b71b2d04329:VulkanMemoryAllocator/core/deps/VulkanMemoryAllocator \ + RetroAchievements:rcheevos:563230b1c249774b4852c944dc7cdcb952c9e8e8:rcheevos/core/deps/rcheevos USE_SDL= sdl2 -.include "${.CURDIR}/Makefile.tuples" - CMAKE_ON= USE_HOST_LIBCHDR OPTIONS_DEFINE= DOCS LUA OPENMP VULKAN @@ -63,15 +64,4 @@ post-install-DOCS-on: (cd ${WRKSRC}/docs && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -# For maintainer (do not forget to clean up Makefile.tuples afterwards to -# remove useless submodules) -Makefile.tuples:: - ${RM} -f ${.CURDIR}/Makefile.tuples - ${RM} -rf ${WRKDIR}/.maintainer.checkout - ${MKDIR} ${WRKDIR}/.maintainer.checkout - (cd ${WRKDIR}/.maintainer.checkout && \ - git clone --recursive --branch=${DISTVERSIONPREFIX}${DISTVERSION} \ - https://github.com/${GH_ACCOUNT}/${PORTNAME} . && \ - ${SH} ${FILESDIR}/gen_gh_tuple.sh > ${.CURDIR}/Makefile.tuples) - .include <bsd.port.mk> diff --git a/emulators/flycast/Makefile.tuples b/emulators/flycast/Makefile.tuples deleted file mode 100644 index 3dc85b571e43..000000000000 --- a/emulators/flycast/Makefile.tuples +++ /dev/null @@ -1,4 +0,0 @@ -GH_TUPLE= \ - vinniefalco:LuaBridge:5d21e35633a1f87ed08af115b07d3386096f792b:LuaBridge/core/deps/luabridge \ - GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:6eb62e1515072827db992c2befd80b71b2d04329:VulkanMemoryAllocator/core/deps/VulkanMemoryAllocator \ - RetroAchievements:rcheevos:563230b1c249774b4852c944dc7cdcb952c9e8e8:rcheevos/core/deps/rcheevos \ diff --git a/emulators/flycast/files/gen_gh_tuple.sh b/emulators/flycast/files/gen_gh_tuple.sh deleted file mode 100644 index ab014ef5f473..000000000000 --- a/emulators/flycast/files/gen_gh_tuple.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -echo "GH_TUPLE= \\" -for _sm_root in $(find . -type f -name .gitmodules | sed 's/\.gitmodules$//' | sort) -do - ( - cd "${_sm_root}" - - # Crawl name|path|url list of submodules within _sm_root - grep -e '^\[submodule "' -e 'path = ' -e 'url = ' .gitmodules | \ - sed -E -e 's|.*"([^"]+)".*|\1|' -e 's|.*= ||' | \ - paste - - - | \ - sed -E 's/[[:space:]]+/|/g' | \ - while read _sm - do - _sm_name=$(echo "${_sm}" | cut -d '|' -f 1) - _sm_path=$(echo "${_sm}" | cut -d '|' -f 2) - _sm_url=$(echo "${_sm}" | cut -d '|' -f 3) - - _sm_prefix=$(echo "${_sm_root}" | sed 's|^\./||') - - _account_project=$(echo "${_sm_url}" | sed -e 's|^https://github.com/||' -e 's|/|:|g' -e 's|\.git$||') - _group=$(echo "${_account_project}" | cut -d ':' -f 2 | tr -cd 'a-zA-Z0-9_') - _tagname_group_subdir=$(git submodule status "${_sm_path}" | sed -E -e 's|^.||' -e "s|[[:space:]]+|:${_group}/${_sm_prefix}|" -e 's|[[:space:]]+.*$||') - echo -e "\t${_account_project}:${_tagname_group_subdir} \\" - done - ) -done -echo "" diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index d1ba9c78eb75..0c368a701c7d 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -1,6 +1,6 @@ PORTNAME= fuse PORTVERSION= 1.6.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION} diff --git a/emulators/magia/Makefile b/emulators/magia/Makefile index 81588293a169..982480a237d4 100644 --- a/emulators/magia/Makefile +++ b/emulators/magia/Makefile @@ -1,7 +1,7 @@ PORTNAME= magia DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 27 +PORTREVISION= 28 CATEGORIES= emulators MAINTAINER= ports@FreeBSD.org diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 793f30a06ba3..c4cda0872bf7 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,6 +1,6 @@ PORTNAME= mame DISTVERSION= 0.277 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators games PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/emulators/nemu/Makefile b/emulators/nemu/Makefile index 38c020a170ad..e8a4917abe13 100644 --- a/emulators/nemu/Makefile +++ b/emulators/nemu/Makefile @@ -1,6 +1,7 @@ PORTNAME= nemu DISTVERSIONPREFIX= v DISTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= arrowd@FreeBSD.org diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 8ae5f69a4b14..b4210cb7b275 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -39,7 +39,7 @@ GH_TUPLE?= hrydgard:glslang:8.13.3743-948-g50e0708:glslang/ext/glslang \ RetroAchievements:rcheevos:v11.6.0-gef0e22b:rcheevos/ext/rcheevos \ Tencent:rapidjson:v1.1.0-415-g73063f5:rapidjson/ext/rapidjson \ hrydgard:ppsspp-lua:7648485:lua/ext/lua -EXCLUDE= libpng17 libzip zlib +EXCLUDE= libzip zlib USE_GL= glew opengl CMAKE_ON= ${LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR CMAKE_OFF= USE_DISCORD diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index f23a958cd677..9724d1baccae 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= qemu -DISTVERSION= 9.2.0.20250530 +DISTVERSION= 10.0.20250630 CATEGORIES= emulators PKGNAMESUFFIX= -devel DIST_SUBDIR= qemu/${PORTVERSION} @@ -23,11 +23,11 @@ USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t localbase:ldflags \ ninja perl5 pkgconfig python:build shebangfix tar:xz xorg USE_GITLAB= yes GL_ACCOUNT= qemu-project -GL_TAGNAME= 3e82ddaa8db260a232dbbbf488d8ac7851d124c5 +GL_TAGNAME= 0d0fc3f4658937fb81fcc16a89738e83bd8d4795 GL_TUPLE= qemu-project:keycodemapdb:f5772a62ec52591ff6870b7e8ef32482371f22c6:keycodemapdb/subprojects/keycodemapdb \ qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/subprojects/dtc \ qemu-project:libvfio-user:0b28d205572c80b568a1003db2c8f37ca333e4d7:libvfio/subprojects/libvfio-user \ - qemu-project:meson:f3adf71b85960da3ff22914cd1a5ce885d3b6a67:meson/meson \ + qemu-project:meson:68d29ef7f62df5481aa4de8eaf421f25243f4cb2:meson/meson \ qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/subprojects/berkeley-softfloat-3 \ qemu-project:berkeley-testfloat-3:e7af9751d9f9fd3b47911f51a5cfd08af256a9ab:berkeleytestfloat3/subprojects/berkeley-testfloat-3 USE_GNOME= cairo glib20 diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index 14ddbab33df2..98727eef212b 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1748977683 -SHA256 (qemu/9.2.0.20250530/qemu-project-qemu-3e82ddaa8db260a232dbbbf488d8ac7851d124c5_GL0.tar.gz) = 06463a3861b7a0dc1d219f408e8647e94117b28d43e967c58cdb0a099d57233d -SIZE (qemu/9.2.0.20250530/qemu-project-qemu-3e82ddaa8db260a232dbbbf488d8ac7851d124c5_GL0.tar.gz) = 39823482 -SHA256 (qemu/9.2.0.20250530/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195 -SIZE (qemu/9.2.0.20250530/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580 -SHA256 (qemu/9.2.0.20250530/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7 -SIZE (qemu/9.2.0.20250530/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556 -SHA256 (qemu/9.2.0.20250530/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe -SIZE (qemu/9.2.0.20250530/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943 -SHA256 (qemu/9.2.0.20250530/qemu-project-meson-f3adf71b85960da3ff22914cd1a5ce885d3b6a67_GL0.tar.gz) = 4397f6612c43c21f3db239c68138a51cbd2d3a20a2b905d0d85135159d70f605 -SIZE (qemu/9.2.0.20250530/qemu-project-meson-f3adf71b85960da3ff22914cd1a5ce885d3b6a67_GL0.tar.gz) = 4907863 -SHA256 (qemu/9.2.0.20250530/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757 -SIZE (qemu/9.2.0.20250530/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741 -SHA256 (qemu/9.2.0.20250530/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df -SIZE (qemu/9.2.0.20250530/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308 +TIMESTAMP = 1751498296 +SHA256 (qemu/10.0.20250630/qemu-project-qemu-0d0fc3f4658937fb81fcc16a89738e83bd8d4795_GL0.tar.gz) = 15207cad59b6b4b0b72e6ac740b0cbb3766cbf5a87ef9e1346284b14febcb6ef +SIZE (qemu/10.0.20250630/qemu-project-qemu-0d0fc3f4658937fb81fcc16a89738e83bd8d4795_GL0.tar.gz) = 39963969 +SHA256 (qemu/10.0.20250630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195 +SIZE (qemu/10.0.20250630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580 +SHA256 (qemu/10.0.20250630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7 +SIZE (qemu/10.0.20250630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556 +SHA256 (qemu/10.0.20250630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe +SIZE (qemu/10.0.20250630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943 +SHA256 (qemu/10.0.20250630/qemu-project-meson-68d29ef7f62df5481aa4de8eaf421f25243f4cb2_GL0.tar.gz) = 836c21bb3a0413f3028fce19e2a939c3f581668161b12b208b559b2bdf46876c +SIZE (qemu/10.0.20250630/qemu-project-meson-68d29ef7f62df5481aa4de8eaf421f25243f4cb2_GL0.tar.gz) = 4913620 +SHA256 (qemu/10.0.20250630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757 +SIZE (qemu/10.0.20250630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741 +SHA256 (qemu/10.0.20250630/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df +SIZE (qemu/10.0.20250630/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308 diff --git a/emulators/qemu-powernv/Makefile b/emulators/qemu-powernv/Makefile index 7ad516404576..afa1246d1c90 100644 --- a/emulators/qemu-powernv/Makefile +++ b/emulators/qemu-powernv/Makefile @@ -1,6 +1,6 @@ PORTNAME= qemu-powernv PORTVERSION= 3.0.50 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= http://people.freebsd.org/~kbowling/distfiles/ diff --git a/emulators/qemu8/Makefile b/emulators/qemu8/Makefile deleted file mode 100644 index 13f6e2a4ac07..000000000000 --- a/emulators/qemu8/Makefile +++ /dev/null @@ -1,194 +0,0 @@ -PORTNAME= qemu -DISTVERSION= 8.2.10 -PORTREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= https://download.qemu.org/ -DIST_SUBDIR= qemu/${PORTVERSION} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= QEMU CPU Emulator ${${FLAVOR}_COMMENT} - 8.X.X -WWW= https://www.qemu.org/ - -LICENSE= GPLv2 - -DEPRECATED= No value in maintaining older QEMU versions on FreeBSD -EXPIRATION_DATE= 2025-06-30 - -ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le -# We need to check if it build with other ARCHS - -BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS+= libfdt.so:sysutils/dtc \ - libzstd.so:archivers/zstd \ - libslirp.so:net/libslirp -.if ${FLAVOR:U} != nox11 -LIB_DEPENDS+= libepoxy.so:graphics/libepoxy -.endif - -FLAVORS= default nox11 -FLAVOR?= ${FLAVORS:[1]} -default_PKGNAMESUFFIX= 8 -default_CONFLICTS_INSTALL= qemu-devel qemu-nox11 qemu-tools qemu-utils \ - qemu7* qemu8* -nox11_PKGNAMESUFFIX= 8-nox11 -nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu* qemu7* qemu-guest-agent -nox11_COMMENT= (without X11) - -USES= cpe gmake gnome ninja perl5 pkgconfig python:build shebangfix tar:xz -SHEBANG_FILES= scripts/xml-preprocess.py -USE_GNOME= glib20 -USE_PERL5= build -USES+= iconv:wchar_t -.if ${FLAVOR:U} != nox11 -USE_GNOME+= cairo -.endif - -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --cc=${CC} \ - --disable-guest-agent \ - --disable-kvm \ - --disable-linux-aio \ - --disable-linux-user \ - --disable-xen \ - --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \ - --extra-ldflags=-L${LOCALBASE}/lib \ - --extra-ldflags=-L/usr/lib \ - --localstatedir=/var \ - --mandir=${PREFIX}/share/man \ - --prefix=${PREFIX} \ - --python=${PYTHON_CMD} -CONFIGURE_ARGS+= --enable-fdt=system \ - --enable-netmap - -CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} -WITHOUT_CPU_CFLAGS= yes #to avoid problems with register allocation - -PORTDOCS= .buildinfo _static/* about/* dbus-dbusindex.html devel/* docs \ - genindex.html index.html interop/* objects.inv search.html \ - searchindex.js specs/* system/* tools/* user/* - -OPTIONS_DEFINE= CAPSTONE CDROM_DMA CURL DEBUG DOCS GNUTLS GTK3 \ - ISCSI JPEG OPENGL PNG SAMBA SASL STATIC_LINK \ - STRIP USBREDIR VDE X11 X86_TARGETS -OPTIONS_DEFAULT= CDROM_DMA CURL GNUTLS GTK3 JPEG NCURSES_DEFAULT \ - OPENGL PNG SASL VDE X11 -OPTIONS_SINGLE= NCURSES -OPTIONS_SINGLE_NCURSES= NCURSES_BASE NCURSES_DEFAULT NCURSES_PORT -.if ${FLAVOR:U} == nox11 -OPTIONS_EXCLUDE:= GTK3 OPENGL X11 -.endif -OPTIONS_SUB= yes -CAPSTONE_DESC= Disassembly framework support -CDROM_DMA_DESC= IDE CDROM DMA -GNUTLS_DESC= gnutls dependency (vnc encryption) -ISCSI_DESC= libiscsi dependency (iSCSI client for emulated drives) -JPEG_DESC= jpeg dependency (vnc lossy compression) -NCURSES_BASE_DESC= Depend on ncurses in base -NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) -NCURSES_PORT_DESC= Depend on devel/ncurses in ports -PNG_DESC= png dependency (vnc compression) -SAMBA_DESC= samba dependency (for -smb) -SASL_DESC= cyrus-sasl dependency (vnc encryption) -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_LIB_DEPENDS= libcapstone.so:devel/capstone -CAPSTONE_CONFIGURE_ON= --enable-capstone \ - --extra-cflags=-I${LOCALBASE}/include/capstone -CAPSTONE_CONFIGURE_OFF= --disable-capstone -CURL_LIB_DEPENDS= libcurl.so:ftp/curl -CURL_CONFIGURE_OFF= --disable-curl -DEBUG_CONFIGURE_ON= --enable-debug -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ - sphinx-build:textproc/py-sphinx@${PY_FLAVOR} -DOCS_CONFIGURE_ENABLE= docs -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_CONFIGURE_OFF= --disable-gnutls -GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -GTK3_USES= gettext gl -GTK3_USE= GNOME=gdkpixbuf,gtk30,vte3 \ - XORG=x11,xext -GTK3_CONFIGURE_OFF= --disable-gtk \ - --disable-vte -ISCSI_LIB_DEPENDS= libiscsi.so:net/libiscsi -ISCSI_CONFIGURE_OFF= --disable-libiscsi -JPEG_USES= jpeg -JPEG_CONFIGURE_OFF= --disable-vnc-jpeg -NCURSES_BASE_USES= ncurses:base -NCURSES_DEFAULT_USES= ncurses -NCURSES_PORT_USES= ncurses:port -OPENGL_USES= gl -OPENGL_USE= GL=gbm,gl -OPENGL_CONFIGURE_OFF= --disable-opengl -PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CONFIGURE_OFF= --disable-png -SAMBA_USES= samba:run # smbd -SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_CONFIGURE_OFF= --disable-vnc-sasl -STATIC_LINK_PREVENTS= GTK3 X11 -STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static -STATIC_LINK_CONFIGURE_ON= --static -STRIP_CONFIGURE_OFF= --disable-strip -USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_CONFIGURE_OFF= --disable-usb-redir -VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 -VDE_CONFIGURE_OFF= --disable-vde -X11_USES= sdl -X11_USE= GNOME=gdkpixbuf \ - SDL=sdl2 \ - XORG=x11,xext -X11_CONFIGURE_ENABLE= sdl -.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) -X86_TARGETS_LIB_DEPENDS_OFF= libdw.so:devel/elfutils -X86_TARGETS_USES_OFF= xorg -X86_TARGETS_USE_OFF= XORG=pixman,x11 -X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user' -.endif - -.include <bsd.port.options.mk> - -.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) -.if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=x86_64 -.endif - -.if ${ARCH} == "powerpc" -CFLAGS+= -D_CALL_SYSV -MAKE_ARGS+= ARCH=ppc -USE_GCC= yes -.endif - -.if ${ARCH:Mpowerpc64*} || ${ARCH:Maarch64} -CONFIGURE_ARGS+= --disable-bsd-user -MAKE_ARGS+= ARCH=${ARCH:C/powerpc64.*/ppc64/} -PLIST_SUB+= BSDUSER="@comment " -.else -PLIST_SUB+= BSDUSER="" -.endif - -PLIST_SUB+= LINUXBOOT_DMA="" -.endif - -post-patch-CDROM_DMA-off: - @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h - -do-build: - cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} - -do-install: - cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} DESTDIR=${STAGEDIR} ${GMAKE} install - -.if !target(post-install) -post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc - ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* - -post-install-DOCS-on: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) -.endif - -.include <bsd.port.mk> diff --git a/emulators/qemu8/distinfo b/emulators/qemu8/distinfo deleted file mode 100644 index 4324ab19d3db..000000000000 --- a/emulators/qemu8/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1743065368 -SHA256 (qemu/8.2.10/qemu-8.2.10.tar.xz) = 37b4a643da8ed6015eef35f5d7f06e7259d9c95359965a0a98e9667c621ab2bb -SIZE (qemu/8.2.10/qemu-8.2.10.tar.xz) = 132685948 diff --git a/emulators/qemu8/files/patch-block_export_fuse.c b/emulators/qemu8/files/patch-block_export_fuse.c deleted file mode 100644 index 03b9cc8b5994..000000000000 --- a/emulators/qemu8/files/patch-block_export_fuse.c +++ /dev/null @@ -1,69 +0,0 @@ ---- block/export/fuse.c.orig 2023-12-19 21:24:34 UTC -+++ block/export/fuse.c -@@ -690,12 +690,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t - return; - } - --#ifdef CONFIG_FALLOCATE_PUNCH_HOLE -- if (mode & FALLOC_FL_KEEP_SIZE) { -- length = MIN(length, blk_len - offset); -- } --#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */ -- - if (!mode) { - /* We can only fallocate at the EOF with a truncate */ - if (offset < blk_len) { -@@ -715,53 +709,6 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t - ret = fuse_do_truncate(exp, offset + length, true, - PREALLOC_MODE_FALLOC); - } --#ifdef CONFIG_FALLOCATE_PUNCH_HOLE -- else if (mode & FALLOC_FL_PUNCH_HOLE) { -- if (!(mode & FALLOC_FL_KEEP_SIZE)) { -- fuse_reply_err(req, EINVAL); -- return; -- } -- -- do { -- int size = MIN(length, BDRV_REQUEST_MAX_BYTES); -- -- ret = blk_pwrite_zeroes(exp->common.blk, offset, size, -- BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK); -- if (ret == -ENOTSUP) { -- /* -- * fallocate() specifies to return EOPNOTSUPP for unsupported -- * operations -- */ -- ret = -EOPNOTSUPP; -- } -- -- offset += size; -- length -= size; -- } while (ret == 0 && length > 0); -- } --#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */ --#ifdef CONFIG_FALLOCATE_ZERO_RANGE -- else if (mode & FALLOC_FL_ZERO_RANGE) { -- if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) { -- /* No need for zeroes, we are going to write them ourselves */ -- ret = fuse_do_truncate(exp, offset + length, false, -- PREALLOC_MODE_OFF); -- if (ret < 0) { -- fuse_reply_err(req, -ret); -- return; -- } -- } -- -- do { -- int size = MIN(length, BDRV_REQUEST_MAX_BYTES); -- -- ret = blk_pwrite_zeroes(exp->common.blk, -- offset, size, 0); -- offset += size; -- length -= size; -- } while (ret == 0 && length > 0); -- } --#endif /* CONFIG_FALLOCATE_ZERO_RANGE */ - else { - ret = -EOPNOTSUPP; - } diff --git a/emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h b/emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h deleted file mode 100644 index 07d731fd4f54..000000000000 --- a/emulators/qemu8/files/patch-bsd-user_host_i386_host-signal.h +++ /dev/null @@ -1,10 +0,0 @@ ---- bsd-user/host/i386/host-signal.h.orig 2022-12-14 16:28:45 UTC -+++ bsd-user/host/i386/host-signal.h -@@ -12,6 +12,7 @@ - #include <sys/param.h> - #include <sys/ucontext.h> - #include <machine/trap.h> -+#include <vm/vm.h> - #include <vm/pmap.h> - #include <machine/pmap.h> - diff --git a/emulators/qemu8/files/patch-util_cpuinfo-ppc.c b/emulators/qemu8/files/patch-util_cpuinfo-ppc.c deleted file mode 100644 index af9999a22108..000000000000 --- a/emulators/qemu8/files/patch-util_cpuinfo-ppc.c +++ /dev/null @@ -1,34 +0,0 @@ ---- util/cpuinfo-ppc.c.orig 2024-01-29 19:13:22 UTC -+++ util/cpuinfo-ppc.c -@@ -6,13 +6,21 @@ - #include "qemu/osdep.h" - #include "host/cpuinfo.h" - --#include <asm/cputable.h> - #ifdef CONFIG_GETAUXVAL - # include <sys/auxv.h> - #else -+# ifdef __linux__ -+# include <asm/cputable.h> -+# elif defined(__FreeBSD__) -+# include <machine/cpu.h> -+# endif - # include "elf.h" - #endif - -+#ifndef PPC_FEATURE2_ARCH_3_1 -+# define PPC_FEATURE2_ARCH_3_1 0x00040000 -+#endif -+ - unsigned cpuinfo; - - /* Called both as constructor and (possibly) via other constructors. */ -@@ -53,7 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi - * always have both anyway, since VSX came with Power7 - * and crypto came with Power8. - */ -- if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) { -+ if (hwcap2 & PPC_FEATURE2_HAS_VEC_CRYPTO) { - info |= CPUINFO_CRYPTO; - } - } diff --git a/emulators/qemu8/files/patch-util_meson.build b/emulators/qemu8/files/patch-util_meson.build deleted file mode 100644 index 1e42351652d7..000000000000 --- a/emulators/qemu8/files/patch-util_meson.build +++ /dev/null @@ -1,15 +0,0 @@ ---- util/meson.build.orig 2023-12-19 21:24:35 UTC -+++ util/meson.build -@@ -102,11 +102,7 @@ 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/qemu8/files/qemu-ifdown.sample b/emulators/qemu8/files/qemu-ifdown.sample deleted file mode 100644 index 89d9a9bff436..000000000000 --- a/emulators/qemu8/files/qemu-ifdown.sample +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec true diff --git a/emulators/qemu8/files/qemu-ifup.sample b/emulators/qemu8/files/qemu-ifup.sample deleted file mode 100644 index 89d9a9bff436..000000000000 --- a/emulators/qemu8/files/qemu-ifup.sample +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec true diff --git a/emulators/qemu8/pkg-descr b/emulators/qemu8/pkg-descr deleted file mode 100644 index 592b7660dd49..000000000000 --- a/emulators/qemu8/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -QEMU is a FAST! processor emulator using dynamic translation to achieve -good emulation speed. -QEMU has two operating modes: - - * Full system emulation. In this mode, QEMU emulates a full system -(for example a PC), including a processor and various peripherials. -It can be used to launch different Operating Systems without rebooting -the PC or to debug system code. - * User mode emulation (Linux host only). In this mode, QEMU can launch -Linux processes compiled for one CPU on another CPU. It can be used to -launch the Wine Windows API emulator or to ease cross-compilation and -cross-debugging. - -As QEMU requires no host kernel patches to run, it is very safe and easy to use. diff --git a/emulators/qemu8/pkg-message b/emulators/qemu8/pkg-message deleted file mode 100644 index ac6e871ff11c..000000000000 --- a/emulators/qemu8/pkg-message +++ /dev/null @@ -1,76 +0,0 @@ -[ -{ type: install - message: <<EOM -FreeBSD host notes -================== - -- Needs to set net.link.tap.user_open sysctl in order to use /dev/tap* - networking as non-root. Don't forget to adjust device node permissions in - /etc/devfs.rules. - -- Expect timer problems when guest kernel HZ is > hosts. The linux 2.6 - kernel uses 1000 by default btw. (changed to 250 later, and recent linux - kernels now no longer have a fixed HZ, aka `tickless kernel'...) - Enabling /dev/rtc doesn't seem to help either (not included since it needs - a patch to emulators/rtc.) - -- The -smb option (smb-export local dir to guest using the default - slirp networking) needs the samba port/package installed - in addition to qemu. (SAMBA knob.) - -- If you want to use usb devices connected to the host in the guest - yot can use usbredir over the network (see below); also unless you are - running qemu as root you then need to fix permissions for /dev/ugen* - device nodes: if you are on 5.x or later (devfs) put a rule in - /etc/devfs.rules, activate it in /etc/rc.conf and run /etc/rc.d/devfs - restart. Example devfs.rules: - - [ugen_ruleset=20] - add path 'ugen*' mode 660 group operator - - corresponding rc.conf line: - - devfs_system_ruleset="ugen_ruleset" - -- Still usb: since the hub is no longer attached to the uchi controller and - the wakeup mechanism, resume interrupt is not implemented yet linux guests - will suspend the bus, i.e. they wont see devices usb_add'ed after its - (linux') uhci module got loaded. Workaround: either add devices before - linux loads the module or rmmod and modprobe it afterwards. [Not sure - if this still applies to the new libusb host code used on recent - 10-current.] - -- If you get repeated `atapi_poll called!' console messages with FreeBSD - guests or other weird cdrom problems then thats probably because the guest - has atapicam loaded, which for reasons still to be determined has problems - with qemu's now by default enabled cdrom dma. You can build the port with - CDROM_DMA disabled to disable it. [Looks like this is fixed in recent - FreeBSD guest versions.] - -- If you build qemu wihout SDL and then get crashes running it try passing it - -nographic. This should probably be default in that case... - -- qemu's network boot roms (-boot n) have a bug when bootfiles sizes are a - multiple of blksize, if this affects you (like with FreeBSD's /boot/pxeboot) - you can do like - - cp /boot/pxeboot pxeboot-qemu && chmod +w pxeboot-qemu && echo >>pxeboot-qemu - - and then use pxeboot-qemu. Actually you need recent btx code - (from after 7.0 was released) because of the real mode boot - problem, so use at least pxeboot from there. And I just did that - for the pxeboot extracted out of - - ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/200805/7.0-STABLE-200805-i386-bootonly.iso - - and placed it here: - - http://people.freebsd.org/~nox/qemu/pxeboot-qemu - -- If you use slirp (usernet, the default) and want to mount nfs into the guest - and you are not running qemu as root, then mountd(8) on the exporting box - needs to be run with -n in order to accept requests from ports >= 1024. - -EOM -} -] diff --git a/emulators/qemu8/pkg-plist b/emulators/qemu8/pkg-plist deleted file mode 100644 index ecfff8c9de72..000000000000 --- a/emulators/qemu8/pkg-plist +++ /dev/null @@ -1,180 +0,0 @@ -%%CURL%%bin/elf2dmp -%%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-arm -bin/qemu-edid -%%BSDUSER%%bin/qemu-i386 -bin/qemu-img -bin/qemu-io -%%GTK3%%bin/qemu-keymap -bin/qemu-nbd -bin/qemu-storage-daemon -%%NO_X86_TARGETS%%bin/qemu-system-aarch64 -%%NO_X86_TARGETS%%bin/qemu-system-alpha -%%NO_X86_TARGETS%%bin/qemu-system-avr -%%NO_X86_TARGETS%%bin/qemu-system-arm -%%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 -%%NO_X86_TARGETS%%bin/qemu-system-mips -%%NO_X86_TARGETS%%bin/qemu-system-mips64 -%%NO_X86_TARGETS%%bin/qemu-system-mips64el -%%NO_X86_TARGETS%%bin/qemu-system-mipsel -%%NO_X86_TARGETS%%bin/qemu-system-nios2 -%%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-riscv32 -%%NO_X86_TARGETS%%bin/qemu-system-riscv64 -%%NO_X86_TARGETS%%bin/qemu-system-rx -%%NO_X86_TARGETS%%bin/qemu-system-s390x -%%NO_X86_TARGETS%%bin/qemu-system-sh4 -%%NO_X86_TARGETS%%bin/qemu-system-sh4eb -%%NO_X86_TARGETS%%bin/qemu-system-sparc -%%NO_X86_TARGETS%%bin/qemu-system-sparc64 -%%NO_X86_TARGETS%%bin/qemu-system-tricore -bin/qemu-system-x86_64 -%%NO_X86_TARGETS%%bin/qemu-system-xtensa -%%NO_X86_TARGETS%%bin/qemu-system-xtensaeb -%%BSDUSER%%bin/qemu-x86_64 -include/qemu-plugin.h -%%PORTDOCS%%share/man/man1/qemu.1.gz -%%PORTDOCS%%share/man/man1/qemu-img.1.gz -%%PORTDOCS%%share/man/man7/qemu-block-drivers.7.gz -%%PORTDOCS%%share/man/man7/qemu-cpu-models.7.gz -%%PORTDOCS%%share/man/man8/qemu-nbd.8.gz -%%PORTDOCS%%share/man/man8/qemu-pr-helper.8.gz -%%PORTDOCS%%share/man/man7/qemu-qmp-ref.7.gz -%%PORTDOCS%%share/man/man1/qemu-storage-daemon.1.gz -%%PORTDOCS%%share/man/man7/qemu-storage-daemon-qmp-ref.7.gz -@sample etc/qemu-ifup.sample -@sample etc/qemu-ifdown.sample -%%DATADIR%%/QEMU,tcx.bin -%%DATADIR%%/QEMU,cgthree.bin -%%DATADIR%%/bios-256k.bin -%%DATADIR%%/bios-microvm.bin -%%DATADIR%%/bios.bin -%%DATADIR%%/canyonlands.dtb -%%DATADIR%%/edk2-aarch64-code.fd -%%DATADIR%%/edk2-arm-code.fd -%%DATADIR%%/edk2-arm-vars.fd -%%DATADIR%%/edk2-i386-code.fd -%%DATADIR%%/edk2-i386-secure-code.fd -%%DATADIR%%/edk2-i386-vars.fd -%%DATADIR%%/edk2-licenses.txt -%%DATADIR%%/edk2-x86_64-code.fd -%%DATADIR%%/edk2-x86_64-secure-code.fd -%%DATADIR%%/efi-e1000.rom -%%DATADIR%%/efi-e1000e.rom -%%DATADIR%%/efi-eepro100.rom -%%DATADIR%%/efi-ne2k_pci.rom -%%DATADIR%%/efi-pcnet.rom -%%DATADIR%%/efi-rtl8139.rom -%%DATADIR%%/efi-virtio.rom -%%DATADIR%%/efi-vmxnet3.rom -%%DATADIR%%/firmware/50-edk2-i386-secure.json -%%DATADIR%%/firmware/50-edk2-x86_64-secure.json -%%DATADIR%%/firmware/60-edk2-aarch64.json -%%DATADIR%%/firmware/60-edk2-arm.json -%%DATADIR%%/firmware/60-edk2-i386.json -%%DATADIR%%/firmware/60-edk2-x86_64.json -%%DATADIR%%/hppa-firmware.img -%%DATADIR%%/keymaps/ar -%%DATADIR%%/keymaps/bepo -%%DATADIR%%/keymaps/cz -%%DATADIR%%/keymaps/da -%%DATADIR%%/keymaps/de -%%DATADIR%%/keymaps/de-ch -%%DATADIR%%/keymaps/en-gb -%%DATADIR%%/keymaps/en-us -%%DATADIR%%/keymaps/es -%%DATADIR%%/keymaps/et -%%DATADIR%%/keymaps/fi -%%DATADIR%%/keymaps/fo -%%DATADIR%%/keymaps/fr -%%DATADIR%%/keymaps/fr-be -%%DATADIR%%/keymaps/fr-ca -%%DATADIR%%/keymaps/fr-ch -%%DATADIR%%/keymaps/hr -%%DATADIR%%/keymaps/hu -%%DATADIR%%/keymaps/is -%%DATADIR%%/keymaps/it -%%DATADIR%%/keymaps/ja -%%DATADIR%%/keymaps/lt -%%DATADIR%%/keymaps/lv -%%DATADIR%%/keymaps/mk -%%DATADIR%%/keymaps/nl -%%DATADIR%%/keymaps/no -%%DATADIR%%/keymaps/pl -%%DATADIR%%/keymaps/pt -%%DATADIR%%/keymaps/pt-br -%%DATADIR%%/keymaps/ru -%%DATADIR%%/keymaps/sl -%%DATADIR%%/keymaps/sv -%%DATADIR%%/keymaps/th -%%DATADIR%%/keymaps/tr -%%DATADIR%%/linuxboot.bin -%%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin -%%DATADIR%%/multiboot.bin -%%DATADIR%%/multiboot_dma.bin -%%DATADIR%%/npcm7xx_bootrom.bin -%%DATADIR%%/openbios-ppc -%%DATADIR%%/openbios-sparc32 -%%DATADIR%%/openbios-sparc64 -%%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.bin -%%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.bin -%%DATADIR%%/palcode-clipper -%%DATADIR%%/petalogix-ml605.dtb -%%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%%/qboot.rom -%%DATADIR%%/qemu-nsis.bmp -%%DATADIR%%/qemu_vga.ndrv -%%DATADIR%%/s390-ccw.img -%%DATADIR%%/s390-netboot.img -%%DATADIR%%/slof.bin -%%DATADIR%%/u-boot-sam460-20100605.bin -%%DATADIR%%/vgabios.bin -%%DATADIR%%/vgabios-ati.bin -%%DATADIR%%/vgabios-cirrus.bin -%%DATADIR%%/vgabios-qxl.bin -%%DATADIR%%/vgabios-stdvga.bin -%%DATADIR%%/vgabios-virtio.bin -%%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 -%%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 -share/icons/hicolor/256x256/apps/qemu.png -share/icons/hicolor/32x32/apps/qemu.bmp -share/icons/hicolor/32x32/apps/qemu.png -share/icons/hicolor/48x48/apps/qemu.png -share/icons/hicolor/512x512/apps/qemu.png -share/icons/hicolor/64x64/apps/qemu.png -share/icons/hicolor/scalable/apps/qemu.svg -share/applications/qemu.desktop -%%GTK3%%share/locale/bg/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/de_DE/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/fr_FR/LC_MESSAGES/qemu.mo -%%GTK3%%share/locale/hu/LC_MESSAGES/qemu.mo -%%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 diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile index 85764c295d86..bbf1c7d55fcd 100644 --- a/emulators/tiemu3/Makefile +++ b/emulators/tiemu3/Makefile @@ -1,6 +1,6 @@ PORTNAME= tiemu3 PORTVERSION= 3.03 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= emulators MASTER_SITES= SF/gtktiemu/tiemu-linux/TIEmu%20${DISTVERSION} DISTNAME= tiemu-${DISTVERSION} diff --git a/emulators/uconvert/Makefile b/emulators/uconvert/Makefile index b09faab579bf..8fbd72f7e8ce 100644 --- a/emulators/uconvert/Makefile +++ b/emulators/uconvert/Makefile @@ -1,7 +1,7 @@ PORTNAME= uconvert DISTVERSIONPREFIX= v DISTVERSION= 1.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators graphics MAINTAINER= otis@FreeBSD.org diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile index 19516c211e1f..7b6efa0001d2 100644 --- a/emulators/virtualbox-ose-70/Makefile +++ b/emulators/virtualbox-ose-70/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.0.26 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/vvd:docs diff --git a/emulators/virtualbox-ose-71/Makefile b/emulators/virtualbox-ose-71/Makefile index 1941d1f63133..7642c320ea48 100644 --- a/emulators/virtualbox-ose-71/Makefile +++ b/emulators/virtualbox-ose-71/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.1.10 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/vvd:docs diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 074579b964f6..0c88e2ffe41b 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 5.2.44 -PORTREVISION?= 32 +PORTREVISION?= 33 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/bofh/emulators/virtualbox-ose-legacy:docs diff --git a/emulators/virtualbox-ose-nox11-70/Makefile b/emulators/virtualbox-ose-nox11-70/Makefile index 26ca950b260b..8a6125129844 100644 --- a/emulators/virtualbox-ose-nox11-70/Makefile +++ b/emulators/virtualbox-ose-nox11-70/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= -nox11-70 MASTERDIR= ${.CURDIR}/../virtualbox-ose-70 diff --git a/emulators/virtualbox-ose-nox11-71/Makefile b/emulators/virtualbox-ose-nox11-71/Makefile index 66d0c82c9bc9..8c75dc172337 100644 --- a/emulators/virtualbox-ose-nox11-71/Makefile +++ b/emulators/virtualbox-ose-nox11-71/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -nox11-71 MASTERDIR= ${.CURDIR}/../virtualbox-ose-71 diff --git a/emulators/virtualbox-ose-nox11-legacy/Makefile b/emulators/virtualbox-ose-nox11-legacy/Makefile index e99d77e7eb63..fcb49d1c8f52 100644 --- a/emulators/virtualbox-ose-nox11-legacy/Makefile +++ b/emulators/virtualbox-ose-nox11-legacy/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 32 +PORTREVISION= 33 PKGNAMESUFFIX= -nox11-legacy MASTERDIR= ${.CURDIR}/../virtualbox-ose-legacy diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile index a2dbb21fef32..12036182cd1e 100644 --- a/emulators/virtualbox-ose-nox11/Makefile +++ b/emulators/virtualbox-ose-nox11/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 15 +PORTREVISION= 16 PKGNAMESUFFIX= -nox11 MASTERDIR= ${.CURDIR}/../virtualbox-ose diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 0ffd039cf2fe..0dab90413e05 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose DISTVERSION= 6.1.50 -PORTREVISION?= 15 +PORTREVISION?= 16 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/bofh/emulators/virtualbox-ose:docs diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile index d15e80c07fef..c20867fd409d 100644 --- a/emulators/visualboyadvance-m/Makefile +++ b/emulators/visualboyadvance-m/Makefile @@ -58,6 +58,7 @@ GVBAM_USE= GNOME=gtkmm24,pangox-compat GVBAM_CMAKE_BOOL= ENABLE_GTK LINK_LIB_DEPENDS= libsfml-system.so:devel/sfml LINK_CMAKE_BOOL= ENABLE_LINK +LINK_BROKEN= Does not build LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_RUN_DEPENDS= lircd:comms/lirc LIRC_CMAKE_BOOL= ENABLE_LIRC diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh index 64d82459c219..04595f6c104c 100644 --- a/emulators/wine-devel/files/pkg32.sh +++ b/emulators/wine-devel/files/pkg32.sh @@ -1,19 +1,23 @@ #!/bin/sh -e -if [ "$(id -u)" = 0 ] -then +if [ "$(id -u)" = 0 ]; then echo "Don't run this script as root!" exit 1 fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" +ABI_FILE=/usr/lib32/libc.so.7 -if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] -then +if [ ! -f $ABI_FILE ]; then + echo "\"$ABI_FILE\" not found; exiting." + exit 1 +fi + +if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then mkdir -p "$I386_ROOT/usr/share/keys" ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" fi # Show what we're going to do, then do it. -echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" -exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +exec pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 13b3d6e84b7c..013bd97963f6 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 10.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.0/ @@ -35,6 +35,7 @@ CONFIGURE_ARGS+=--verbose \ --without-capi \ --without-coreaudio \ --without-dbus \ + --without-ffmpeg \ --without-gettext --without-gettextpo \ --without-gphoto \ --without-gssapi \ diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh index 64d82459c219..04595f6c104c 100644 --- a/emulators/wine/files/pkg32.sh +++ b/emulators/wine/files/pkg32.sh @@ -1,19 +1,23 @@ #!/bin/sh -e -if [ "$(id -u)" = 0 ] -then +if [ "$(id -u)" = 0 ]; then echo "Don't run this script as root!" exit 1 fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" +ABI_FILE=/usr/lib32/libc.so.7 -if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] -then +if [ ! -f $ABI_FILE ]; then + echo "\"$ABI_FILE\" not found; exiting." + exit 1 +fi + +if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then mkdir -p "$I386_ROOT/usr/share/keys" ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" fi # Show what we're going to do, then do it. -echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" -exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +exec pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 247f106f1fc9..b69cba9c8771 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,6 +1,6 @@ PORTNAME= yuzu PORTVERSION= s20240301 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb @@ -136,7 +136,7 @@ WEBENGINE_CMAKE_BOOL= YUZU_USE_QT_WEB_ENGINE WEBENGINE_IMPLIES= GUI post-extract: - @${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${_DISTDIR},} \ + @${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${DISTDIR}/,} \ ${WRKSRC}/dist/compatibility_list/ post-patch: |