diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile index d269ff07545e..cd469e25b153 100644 --- a/emulators/ares/Makefile +++ b/emulators/ares/Makefile @@ -1,212 +1,206 @@ PORTNAME= ares DISTVERSIONPREFIX= v -DISTVERSION= 147 -PORTREVISION= 5 +DISTVERSION= 148 CATEGORIES= emulators MASTER_SITES= https://github.com/${PORTNAME}-emulator/${PORTNAME}/releases/download/${DISTVERSIONFULL}/ DISTNAME= ${PORTNAME}-source DIST_SUBDIR= ${PORTNAME}/${DISTVERSION} -# fixes linker error when building PCE core without MD core, see also -# https://github.com/ares-emulator/ares/pull/2329 -PATCH_SITES= https://github.com/${PORTNAME}-emulator/${PORTNAME}/commit/ -PATCHFILES= adfc78f9523adce9fef1d7ac282e08ab7fc66dd4.patch:-p1 - MAINTAINER= bsdcode@disroot.org COMMENT= Multi-system emulator WWW= https://ares-emu.net LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE # Needs resolution by upstream, see also # https://github.com/ares-emulator/ares/issues/2350 BROKEN_i386= unsigned long long to size_type narrowing conversion issue introduced in version 147 BUILD_DEPENDS= librashader>0:devel/librashader USES= cmake compiler:c++20-lang gl gnome pkgconfig xorg USE_GL= opengl USE_GNOME= gtk30 USE_XORG= x11 xext xrandr xrender CMAKE_ARGS= -DARES_CORES="${_CORES:S/ /;/gW}" \ -DENABLE_CCACHE=${CCACHE_ENABLED} CMAKE_ON= ARES_BUILD_OFFICIAL \ ARES_SKIP_DEPS \ ARES_UNITY_CORES CMAKE_OFF= ARES_BUILD_LOCAL \ ARES_BUNDLE_SHADERS \ ARES_ENABLE_MINIMUM_CPU EXTRACT_AFTER_ARGS= --exclude thirdparty/GL \ --exclude thirdparty/KHR \ --exclude thirdparty/libchdr \ --exclude thirdparty/librashader \ --exclude thirdparty/sse2neon.h \ --exclude thirdparty/xxhash.h \ --no-same-owner --no-same-permissions NO_WRKSUBDIR= yes 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 \ OPENAL OPTIMIZED_CFLAGS OSS PCE PS1 SDL SFC SG \ SPEC UDEV USBHID WS OPTIONS_GROUP= AUDIO CORES INPUT OPTIMIZATION SHADER OPTIONS_GROUP_AUDIO= ALSA AO OPENAL OSS PULSEAUDIO OPTIONS_GROUP_CORES= A26 CV FC GB GBA MD MS MSX MYVISION N64 NG NGP \ PCE PS1 SFC SG SPEC WS OPTIONS_GROUP_INPUT= HOTKEYS UDEV USBHID OPTIONS_GROUP_OPTIMIZATION= ACCURACY LTO OPTIMIZED_CFLAGS OPTIONS_GROUP_SHADER= LIBRASHADER LIBRETRO # linking openal fails on i386, LLD_UNSAFE workaround fails with # /usr/local/bin/i386-unknown-freebsd14.1-ld.bfd: /usr/bin/../lib/LLVMgold.so: # error loading plugin: Cannot open "/usr/bin/../lib/LLVMgold.so" # on tools/sourcery target, so exclude OPENAL on i386 OPTIONS_EXCLUDE_i386= OPENAL OPTIONS_SUB= yes A26_DESC= Atari 2600 ACCURACY_DESC= Emulation accuracy over performance CHD_DESC= CHD format support via libchdr CV_DESC= ColecoVision FC_DESC= NES / Famicom 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 (implies ${LIBRETRO_IMPLIES}) MD_DESC= Sega Mega Drive / Genesis MSX_DESC= Microsoft MSX MS_DESC= Sega Master System / Mark III MYVISION_DESC= My Vision N64_DESC= Nintendo 64 NGP_DESC= Neo Geo Pocket / Neo Geo Pocket Color NG_DESC= Neo Geo (AES/MVS) PCE_DESC= PC-Engine / TurboGrafx PS1_DESC= PlayStation SFC_DESC= SNES / Super Famicom SG_DESC= Sega SG-1000 SPEC_DESC= ZX Spectrum TOOLS_DESC= Include supplemental tools and tests UDEV_DESC= Input support via UDEV USBHID_DESC= Input support via USBHID WS_DESC= WonderSwan / WonderSwan Color A26_VARS= _CORES+=a26 ACCURACY_CMAKE_BOOL= ARES_PROFILE_ACCURACY ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= ARES_ENABLE_ALSA AO_LIB_DEPENDS= libao.so:audio/libao AO_CMAKE_BOOL= ARES_ENABLE_AO CHD_LIB_DEPENDS= libchdr.so:devel/libchdr CHD_USES= localbase CHD_CMAKE_BOOL= ARES_ENABLE_CHD CV_VARS= _CORES+=cv FC_VARS= _CORES+=fc GBA_VARS= _CORES+=gba GB_VARS= _CORES+=gb HOTKEYS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-desktop-ui_input_hotkeys.cpp LIBRASHADER_LIB_DEPENDS= librashader.so:devel/librashader LIBRASHADER_CMAKE_BOOL= ARES_ENABLE_LIBRASHADER LIBRETRO_IMPLIES= LIBRASHADER _LIBRETRO_BR_DEPENDS= libretro-shaders-slang<0:games/libretro-shaders-slang LIBRETRO_BUILD_DEPENDS= ${_LIBRETRO_BR_DEPENDS} LIBRETRO_RUN_DEPENDS= ${_LIBRETRO_BR_DEPENDS} LTO_CMAKE_BOOL= ENABLE_IPO MD_BUILD_DEPENDS= xxhash>0:devel/xxhash MD_USES= localbase MD_VARS= _CORES+=md MSX_VARS= _CORES+=msx MS_VARS= _CORES+=ms MYVISION_VARS= _CORES+=myvision _N64_BR_DEPENDS= vulkan-loader>0:graphics/vulkan-loader _N64_BUILD_DEPENDS_aarch64= sse2neon>0:devel/sse2neon N64_BUILD_DEPENDS= ${_N64_BR_DEPENDS} \ ${_N64_BUILD_DEPENDS_${ARCH}} \ xxhash>0:devel/xxhash N64_RUN_DEPENDS= ${_N64_BR_DEPENDS} N64_USES= localbase N64_VARS= _CORES+=n64 NGP_VARS= _CORES+=ngp NG_VARS= _CORES+=ng OPENAL_USES= openal OPENAL_CMAKE_BOOL= ARES_ENABLE_OPENAL OPTIMIZED_CFLAGS_CFLAGS= -O3 OSS_CMAKE_BOOL= ARES_ENABLE_OSS PCE_VARS= _CORES+=pce PS1_VARS= _CORES+=ps1 PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio \ libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= ARES_ENABLE_PULSEAUDIO SDL_USES= sdl SDL_USE= SDL=sdl3 SDL_CMAKE_BOOL= ARES_ENABLE_SDL SFC_VARS= _CORES+=sfc SG_VARS= _CORES+=sg SPEC_VARS= _CORES+=spec TOOLS_CMAKE_BOOL= ARES_BUILD_OPTIONAL_TARGETS UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd UDEV_CMAKE_BOOL= ARES_ENABLE_UDEV USBHID_CMAKE_BOOL= ARES_ENABLE_USBHID WS_VARS= _CORES+=ws .include .if ${PORT_OPTIONS:MTOOLS} && (${PORT_OPTIONS:MGBA} || ${PORT_OPTIONS:MSFC}) PLIST_SUB+= TOOLSARM7TDMI="" .else PLIST_SUB+= TOOLSARM7TDMI="@comment " .endif .if ${PORT_OPTIONS:MTOOLS} && (${PORT_OPTIONS:MMD} || ${PORT_OPTIONS:MNG}) PLIST_SUB+= TOOLSM68000="" .else PLIST_SUB+= TOOLSM68000="@comment " .endif post-patch: ${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/finders/* post-install-LIBRETRO-on: ${LN} -s ${LOCALBASE}/share/libretro/shaders/shaders_slang ${STAGEDIR}${DATADIR}/Shaders .include diff --git a/emulators/ares/distinfo b/emulators/ares/distinfo index 31c45bb91726..b5fda227f3f5 100644 --- a/emulators/ares/distinfo +++ b/emulators/ares/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1766567627 -SHA256 (ares/147/ares-source.tar.gz) = dcedffc1676d497cfe7889e424335a38cc587c87fffebb917775ee5042962f69 -SIZE (ares/147/ares-source.tar.gz) = 9074663 -SHA256 (ares/147/adfc78f9523adce9fef1d7ac282e08ab7fc66dd4.patch) = 4503bf48bfe67448e17b462fc6c99aab0dba780ae8f6a6059a04af2b59901b4f -SIZE (ares/147/adfc78f9523adce9fef1d7ac282e08ab7fc66dd4.patch) = 563 +TIMESTAMP = 1780151282 +SHA256 (ares/148/ares-source.tar.gz) = 06b053d0f407d33272222efd55446d46bfd61859eea46b6ae16c0cc4fa1e51e5 +SIZE (ares/148/ares-source.tar.gz) = 5465693 diff --git a/emulators/ares/files/patch-thirdparty_CMakeLists.txt b/emulators/ares/files/patch-thirdparty_CMakeLists.txt index 0a9b749623bd..220a3f74dbbf 100644 --- a/emulators/ares/files/patch-thirdparty_CMakeLists.txt +++ b/emulators/ares/files/patch-thirdparty_CMakeLists.txt @@ -1,75 +1,71 @@ ---- thirdparty/CMakeLists.txt.orig 2025-08-27 21:41:50 UTC +--- thirdparty/CMakeLists.txt.orig 2026-05-28 12:42:30 UTC +++ thirdparty/CMakeLists.txt @@ -7,55 +7,9 @@ if(ARES_ENABLE_CHD) option(ARES_ENABLE_CHD "Enable CHD format support via libchdr" ON) if(ARES_ENABLE_CHD) - # lzma -- add_subdirectory(libchdr/deps/lzma-24.05 EXCLUDE_FROM_ALL) -- list(APPEND CHDR_LIBS lzma) +- add_subdirectory(libchdr/deps/lzma-25.01 EXCLUDE_FROM_ALL) - list(APPEND CHDR_INCLUDES lzma) - -- if(OS_MACOS) -- option(WITH_SYSTEM_ZLIB "Use system zlib" ON) -- endif() -- # zlib -- if(WITH_SYSTEM_ZLIB) -- find_package(ZLIB REQUIRED) -- list(APPEND PLATFORM_LIBS ZLIB::ZLIB) -- else() -- option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" OFF) -- add_subdirectory(libchdr/deps/zlib-1.3.1 EXCLUDE_FROM_ALL) -- set_target_properties( -- zlibstatic -- PROPERTIES POSITION_INDEPENDENT_CODE ON FOLDER thirdparty PREFIX "" -- ) -- list(APPEND CHDR_LIBS zlibstatic) -- endif() -- +- # miniz +- add_subdirectory(libchdr/deps/miniz-3.1.1 EXCLUDE_FROM_ALL) +- set_target_properties( +- miniz +- PROPERTIES POSITION_INDEPENDENT_CODE ON FOLDER thirdparty PREFIX "" +- ) +- list(APPEND CHDR_LIBS miniz) +- - # zstd - option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF) - option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF) -- add_subdirectory(libchdr/deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL) -- list(APPEND CHDR_LIBS libzstd_static) +- add_subdirectory(libchdr/deps/zstd-1.5.7 EXCLUDE_FROM_ALL) +- list(APPEND CHDR_LIBS zstd) - #-------------------------------------------------- - # chdr - #-------------------------------------------------- - - set( - CHDR_SOURCES - libchdr/src/libchdr_bitstream.c - libchdr/src/libchdr_cdrom.c - libchdr/src/libchdr_chd.c - libchdr/src/libchdr_flac.c - libchdr/src/libchdr_huffman.c +- libchdr/src/libchdr_codec_cdfl.c +- libchdr/src/libchdr_codec_cdlz.c +- libchdr/src/libchdr_codec_cdzl.c +- libchdr/src/libchdr_codec_cdzs.c +- libchdr/src/libchdr_codec_flac.c +- libchdr/src/libchdr_codec_huff.c +- libchdr/src/libchdr_codec_lzma.c +- libchdr/src/libchdr_codec_zlib.c +- libchdr/src/libchdr_codec_zstd.c +- libchdr/deps/lzma-25.01/src/LzmaDec.c - ) - - list(APPEND CHDR_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/libchdr/include) - - add_library(chdr-static STATIC ${CHDR_SOURCES}) - target_include_directories(chdr-static PUBLIC ${CHDR_INCLUDES} PUBLIC libchdr/include) - target_link_libraries(chdr-static PRIVATE ${CHDR_LIBS} ${PLATFORM_LIBS}) - target_compile_options( - chdr-static - PRIVATE $<$:-Wno-unreachable-code -Wno-unused-function> - ) + find_package(PkgConfig REQUIRED) + pkg_check_modules(libchdr REQUIRED IMPORTED_TARGET GLOBAL libchdr) + add_library(chdr-static ALIAS PkgConfig::libchdr) endif() add_library( -@@ -111,12 +65,4 @@ set_target_properties(sljit PROPERTIES FOLDER thirdpar +@@ -108,9 +62,4 @@ set_target_properties(sljit PROPERTIES FOLDER thirdpar set_target_properties(ymfm PROPERTIES FOLDER thirdparty PREFIX "") set_target_properties(tzxfile PROPERTIES FOLDER thirdparty PREFIX "") set_target_properties(sljit PROPERTIES FOLDER thirdparty PREFIX "") -if(ARES_ENABLE_CHD) - set_target_properties(chdr-static PROPERTIES FOLDER thirdparty PREFIX "") -- if(NOT WITH_SYSTEM_ZLIB) -- set_target_properties(zlib PROPERTIES FOLDER thirdparty PREFIX "") -- endif() -- set_target_properties(lzma PROPERTIES FOLDER thirdparty PREFIX "") -- set_target_properties(libzstd_static PROPERTIES FOLDER thirdparty PREFIX "") +- set_target_properties(miniz PROPERTIES FOLDER thirdparty PREFIX "") +- set_target_properties(zstd PROPERTIES FOLDER thirdparty PREFIX "") -endif() set_target_properties(qon PROPERTIES FOLDER thirdparty PREFIX "") -\ No newline at end of file