diff options
Diffstat (limited to 'games')
| -rw-r--r-- | games/fs2open/Makefile | 3 | ||||
| -rw-r--r-- | games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch | 66 | ||||
| -rw-r--r-- | games/melonds/Makefile | 34 | ||||
| -rw-r--r-- | games/melonds/distinfo | 6 | ||||
| -rw-r--r-- | games/melonds/files/patch-backport-43d091361e | 25 | ||||
| -rw-r--r-- | games/melonds/files/patch-backport-e6cc4b14b0 | 32 | ||||
| -rw-r--r-- | games/warzone2100/Makefile | 5 | ||||
| -rw-r--r-- | games/warzone2100/distinfo | 6 | ||||
| -rw-r--r-- | games/warzone2100/files/patch-cmake_FindZIP.cmake | 22 | ||||
| -rw-r--r-- | games/warzone2100/files/patch-lib_sdl_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | games/warzone2100/pkg-plist | 3 | ||||
| -rw-r--r-- | games/xtxf/Makefile | 8 | ||||
| -rw-r--r-- | games/xtxf/distinfo | 14 |
13 files changed, 103 insertions, 138 deletions
diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index 42b562c71f42..723f6532d838 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -7,6 +7,9 @@ MAINTAINER= pkubaj@FreeBSD.org COMMENT= Open source video engine of FreeSpace 2 WWW= http://scp.indiegames.us +# fix build with recent ffmpeg +EXTRA_PATCHES= ${FILESDIR}/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch:-p1 + LICENSE= VOLITION LICENSE_NAME= Volition Copyright LICENSE_FILE= ${WRKSRC}/Copying.md diff --git a/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch new file mode 100644 index 000000000000..2c456bb22a5f --- /dev/null +++ b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch @@ -0,0 +1,66 @@ +From af833f059cc0cfc925792e019f6c2b754c6d53c1 Mon Sep 17 00:00:00 2001 +From: Taylor Richards <taylor@notimaginative.com> +Date: Sun, 17 Aug 2025 17:09:41 -0400 +Subject: [PATCH] fix avcodec deprecation warnings + +--- + code/cutscene/ffmpeg/internal.cpp | 9 ++++++--- + code/sound/ffmpeg/FFmpegWaveFile.cpp | 3 ++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/code/cutscene/ffmpeg/internal.cpp b/code/cutscene/ffmpeg/internal.cpp +index be0920a5068..4f087d10191 100644 +--- a/code/cutscene/ffmpeg/internal.cpp ++++ b/code/cutscene/ffmpeg/internal.cpp +@@ -12,9 +12,10 @@ DecoderStatus::~DecoderStatus() { + videoCodec = nullptr; + + if (videoCodecCtx != nullptr) { +- avcodec_close(videoCodecCtx); + #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255) + avcodec_free_context(&videoCodecCtx); ++#else ++ avcodec_close(videoCodecCtx); + #endif + videoCodecCtx = nullptr; + } +@@ -24,9 +25,10 @@ DecoderStatus::~DecoderStatus() { + audioCodec = nullptr; + + if (audioCodecCtx != nullptr) { +- avcodec_close(audioCodecCtx); + #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255) + avcodec_free_context(&audioCodecCtx); ++#else ++ avcodec_close(audioCodecCtx); + #endif + audioCodecCtx = nullptr; + } +@@ -36,9 +38,10 @@ DecoderStatus::~DecoderStatus() { + subtitleCodec = nullptr; + + if (subtitleCodecCtx != nullptr) { +- avcodec_close(subtitleCodecCtx); + #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255) + avcodec_free_context(&subtitleCodecCtx); ++#else ++ avcodec_close(subtitleCodecCtx); + #endif + subtitleCodecCtx = nullptr; + } +diff --git a/code/sound/ffmpeg/FFmpegWaveFile.cpp b/code/sound/ffmpeg/FFmpegWaveFile.cpp +index ab1e0ddc520..77541d7b826 100644 +--- a/code/sound/ffmpeg/FFmpegWaveFile.cpp ++++ b/code/sound/ffmpeg/FFmpegWaveFile.cpp +@@ -151,9 +151,10 @@ FFmpegWaveFile::~FFmpegWaveFile() + av_frame_free(&m_decodeFrame); + + if (m_audioCodecCtx) { +- avcodec_close(m_audioCodecCtx); + #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255) + avcodec_free_context(&m_audioCodecCtx); ++#else ++ avcodec_close(m_audioCodecCtx); + #endif + m_audioCodecCtx = nullptr; + } diff --git a/games/melonds/Makefile b/games/melonds/Makefile index bd1dc8eef1b5..6e9c93bdc393 100644 --- a/games/melonds/Makefile +++ b/games/melonds/Makefile @@ -1,7 +1,7 @@ PORTNAME= melonds -PORTVERSION= 0.9.5 +PORTVERSION= 1.1 CATEGORIES= games -PKGNAMESUFFIX= -${FLAVOR} +PKGNAMESUFFIX= -qt6 MAINTAINER= henry.hu.sh@gmail.com COMMENT= Nintendo DS emulator @@ -12,33 +12,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= static_assert failed due to requirement 'sizeof(TestCase) == 4312' -LIB_DEPENDS= libslirp.so:net/libslirp +LIB_DEPENDS= libfaad.so:audio/faad \ + libenet.so:net/enet \ + libslirp.so:net/libslirp -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - -USES= cmake compiler:c++17-lang desktop-file-utils gnome \ - iconv libarchive pkgconfig qt:${FLAVOR:S/qt//} sdl kde:5 +USES= cmake compiler:c++17-lang desktop-file-utils gl gnome \ + iconv kde:6 libarchive pkgconfig qt:6 sdl xorg +USE_GL= egl opengl USE_GNOME= glib20 -USE_SDL= sdl2 USE_KDE= ecm:build - -.if ${FLAVOR} == qt5 -CMAKE_OFF= USE_QT6 -.else -CMAKE_ON= USE_QT6 -.endif +USE_QT= base multimedia +USE_SDL= sdl2 +USE_XORG= ice sm x11 xext USE_GITHUB= yes GH_ACCOUNT= melonDS-emu GH_PROJECT= melonDS -GH_TAGNAME= 0.9.5 - -qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 -qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5 -_USE_QT5= core gui network widgets multimedia buildtools:build qmake:build -_USE_QT6= base multimedia -USE_QT= ${_USE_QT${FLAVOR:S/qt//}} +CMAKE_ON= USE_SYSTEM_LIBSLIRP .include <bsd.port.mk> diff --git a/games/melonds/distinfo b/games/melonds/distinfo index 62ab9fcd2e1a..465197ac6014 100644 --- a/games/melonds/distinfo +++ b/games/melonds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689499885 -SHA256 (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 52c6b99340b8bba8c52b11a2242591f05e838c34ddd9ec20dcf1a6039405434a -SIZE (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 2496704 +TIMESTAMP = 1765272179 +SHA256 (melonDS-emu-melonDS-1.1_GH0.tar.gz) = 61e339bcb18a68a17485973637d972ea628c5624d7e6b8adf6870f895d5e26fd +SIZE (melonDS-emu-melonDS-1.1_GH0.tar.gz) = 3673157 diff --git a/games/melonds/files/patch-backport-43d091361e b/games/melonds/files/patch-backport-43d091361e deleted file mode 100644 index 0eaa9e42bbae..000000000000 --- a/games/melonds/files/patch-backport-43d091361e +++ /dev/null @@ -1,25 +0,0 @@ -From 43d091361ed6b400a68911147fd5fe524ccecf34 Mon Sep 17 00:00:00 2001 -From: RSDuck <RSDuck@users.noreply.github.com> -Date: Fri, 25 Nov 2022 23:47:36 +0100 -Subject: [PATCH] fix #1551 - ---- - src/frontend/duckstation/duckstation_compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/frontend/duckstation/duckstation_compat.h src/frontend/duckstation/duckstation_compat.h -index a661e926..fed37805 100644 ---- src/frontend/duckstation/duckstation_compat.h -+++ src/frontend/duckstation/duckstation_compat.h -@@ -12,6 +12,6 @@ - - #define Panic(msg) assert(false && msg) - --#define UnreachableCode() __builtin_unreachable -+#define UnreachableCode() __builtin_unreachable() - - #endif -\ No newline at end of file --- -2.41.0 - diff --git a/games/melonds/files/patch-backport-e6cc4b14b0 b/games/melonds/files/patch-backport-e6cc4b14b0 deleted file mode 100644 index 91ec9e0976a0..000000000000 --- a/games/melonds/files/patch-backport-e6cc4b14b0 +++ /dev/null @@ -1,32 +0,0 @@ -From e6cc4b14b0eb603001e968be9b1ace8a09e1bce1 Mon Sep 17 00:00:00 2001 -From: Nadia Holmquist Pedersen <nadia@nhp.sh> -Date: Sun, 16 Jul 2023 15:46:50 +0200 -Subject: [PATCH] Work around a strange bug in Qt5 that causes melonDS to crash - on launch - -...but only with LTO enabled -...but only on some UNIX systems -...but only with some additional build options except when it breaks - without any as well ---- - src/frontend/qt_sdl/CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git src/frontend/qt_sdl/CMakeLists.txt src/frontend/qt_sdl/CMakeLists.txt -index 0ae6ecea..24261030 100644 ---- src/frontend/qt_sdl/CMakeLists.txt -+++ src/frontend/qt_sdl/CMakeLists.txt -@@ -222,4 +222,10 @@ if (UNIX AND NOT APPLE) - - install(FILES ${CMAKE_SOURCE_DIR}/res/net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - install(TARGETS melonDS BUNDLE DESTINATION ${CMAKE_BINARY_DIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+ -+ if (NOT USE_QT6) -+ set_target_properties(melonDS PROPERTIES -+ INTERPROCEDURAL_OPTIMIZATION OFF -+ INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF) -+ endif() - endif() --- -2.41.0 - diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 48d51bcfee0a..299d7e137c3e 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,6 +1,5 @@ PORTNAME= warzone2100 -DISTVERSION= 4.6.1 -PORTREVISION= 1 +DISTVERSION= 4.6.2 CATEGORIES= games MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/${DISTVERSION}/ DISTNAME= ${PORTNAME}_src @@ -34,7 +33,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USES= cmake bison compiler:c++11-lib gl openal:al pkgconfig \ sdl sqlite tar:xz USE_GL= gl -USE_SDL= sdl2 +USE_SDL= sdl3 CMAKE_ON= WZ_DISABLE_FETCHCONTENT_GIT_CLONE \ CMAKE_DISABLE_FIND_PACKAGE_Asciidoctor \ CMAKE_DISABLE_FIND_PACKAGE_Git \ diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo index 0221650058a9..4febbf23e3cc 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758122255 -SHA256 (warzone2100-4.6.1/warzone2100_src.tar.xz) = 26ac5538460243f8a149d31264da71caa4d33ef6a8010037eff24e77278ca50b -SIZE (warzone2100-4.6.1/warzone2100_src.tar.xz) = 492456208 +TIMESTAMP = 1765299530 +SHA256 (warzone2100-4.6.2/warzone2100_src.tar.xz) = 856216dabeaf2e03ae8f7e758c395b27d21889fe8b5fe45f3afce700fde7d71f +SIZE (warzone2100-4.6.2/warzone2100_src.tar.xz) = 491311612 diff --git a/games/warzone2100/files/patch-cmake_FindZIP.cmake b/games/warzone2100/files/patch-cmake_FindZIP.cmake deleted file mode 100644 index 62eb09120fae..000000000000 --- a/games/warzone2100/files/patch-cmake_FindZIP.cmake +++ /dev/null @@ -1,22 +0,0 @@ ---- cmake/FindZIP.cmake.orig 2021-04-18 18:28:41 UTC -+++ cmake/FindZIP.cmake -@@ -29,8 +29,8 @@ set(_PF32BIT "ProgramFiles(x86)") - # - - # Search for 7-Zip --find_program(ZIP_EXECUTABLE NAMES 7z 7za PATHS "$ENV{ProgramFiles}/7-Zip" "$ENV{${_PF32BIT}}/7-Zip" "$ENV{ProgramW6432}/7-Zip") --if(ZIP_EXECUTABLE MATCHES "7z|7za") -+find_program(ZIP_EXECUTABLE NAMES 7zz REQUIRED) -+if(ZIP_EXECUTABLE MATCHES "7zz") - # Test whether 7-Zip supports the "-bb0" option to disable log output - execute_process(COMMAND ${ZIP_EXECUTABLE} i -bb0 - RESULT_VARIABLE 7z_bb_result -@@ -110,7 +110,7 @@ function(COMPRESS_ZIP) - message( FATAL_ERROR "Unsupported compression level \"${_parsedArguments_COMPRESSION_LEVEL}\" (must be: 0, 1, 3, 5, 7, 9)" ) - endif() - -- if(ZIP_EXECUTABLE MATCHES "7z|7za") -+ if(ZIP_EXECUTABLE MATCHES "7zz") - set(_zipExecutableOptions a -tzip -mtc=off) - if(DEFINED _parsedArguments_COMPRESSION_LEVEL) - # 7z command-line option for compression level (when in ZIP mode) is: "-mx=#" diff --git a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt deleted file mode 100644 index 6f307e792659..000000000000 --- a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/sdl/CMakeLists.txt.orig 2022-11-02 16:53:49 UTC -+++ lib/sdl/CMakeLists.txt -@@ -55,14 +55,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2 - find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET) - endif() - if(SDL2_FOUND) -- if (TARGET SDL2::SDL2-static) -- # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates -- get_target_property(_sdl2_include_dir SDL2::SDL2-static INTERFACE_INCLUDE_DIRECTORIES) -- test_link_to_sdl_target(SDL2::SDL2-static FALSE LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) -- if (_sdl2_include_dir AND LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) -- set(_sdl2_library SDL2::SDL2-static) -- endif() -- endif() - if (NOT _sdl2_library AND TARGET SDL2::SDL2) - # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates - get_target_property(_sdl2_include_dir SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES) diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist index 65f0635553e9..1492fd61b1f1 100644 --- a/games/warzone2100/pkg-plist +++ b/games/warzone2100/pkg-plist @@ -28,6 +28,7 @@ share/icons/net.wz2100.warzone2100.png %%NLS%%share/locale/hu/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/hu/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/id/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/id/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/it/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/it/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/ja_JP/LC_MESSAGES/warzone2100.mo @@ -49,6 +50,8 @@ share/icons/net.wz2100.warzone2100.png %%NLS%%share/locale/ru/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/sk/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/sl/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/sr_CS/LC_MESSAGES/warzone2100.mo +%%NLS%%share/locale/sr_CS/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/tr/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/tr/LC_MESSAGES/warzone2100_guide.mo %%NLS%%share/locale/tt_RU/LC_MESSAGES/warzone2100.mo diff --git a/games/xtxf/Makefile b/games/xtxf/Makefile index 6d0a03f46c79..a96a308e198f 100644 --- a/games/xtxf/Makefile +++ b/games/xtxf/Makefile @@ -1,5 +1,5 @@ PORTNAME= xtxf -DISTVERSION= 0.11.4 +DISTVERSION= 0.11.5 CATEGORIES= games MAINTAINER= slowdive@me.com @@ -9,13 +9,13 @@ WWW= https://github.com/charlesrocket/xtxf LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= zig>=0.14:lang/zig +BUILD_DEPENDS= zig>=0.15.1:lang/zig USE_GITHUB= yes GH_ACCOUNT= charlesrocket GH_TUPLE= termbox:termbox2:9c9281a:zig_termbox/../.cache/zig/p/N-V-__8AAOfjBAD89_CGaCDSoVLTnCjzs3NRNGCkfL9zNuNo \ - 00JCIV00:cova:4c56696:zig_cova/../.cache/zig/p/cova-0.10.1-AAAAAPqeBAAThnQ-eGLXG9tyPsBRehaw8ySs8nEPwMUy \ - charlesrocket:ghext:0.7.2:zig_ghext/../.cache/zig/p/ghext-0.7.2-dKaQN31QAABGONiBUrG8LuTUWwpEbiXF4syy_NmTdizp + 00JCIV00:cova:3fa729c:zig_cova/../.cache/zig/p/cova-0.10.1-_OE4Rw-xBAB9zj1dPhUxLKnar89L5nouEmYY6Q1S23jU \ + charlesrocket:ghext:0.7.4:zig_ghext/../.cache/zig/p/ghext-0.7.4-dKaQN8JPAAA7IjZbcuelgCivahSMKsFGrvE5LLM3RJyl BUILD_ARGS= --prefix ${PREFIX} ${WITH_DEBUG:U-Doptimize=ReleaseFast} \ ${WITH_PIE:D-Dpie} -Dcpu=${CPUTYPE:Ubaseline} --verbose diff --git a/games/xtxf/distinfo b/games/xtxf/distinfo index 41ae6784a843..897edc63bc23 100644 --- a/games/xtxf/distinfo +++ b/games/xtxf/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1754738873 -SHA256 (charlesrocket-xtxf-0.11.4_GH0.tar.gz) = 4dd2029868c838b3e1e716de05f27bd77af719a1c4c4a38ba0b0f538cab0714f -SIZE (charlesrocket-xtxf-0.11.4_GH0.tar.gz) = 17267 +TIMESTAMP = 1764628103 +SHA256 (charlesrocket-xtxf-0.11.5_GH0.tar.gz) = cb159878ff2b86ad001f7688ced84a2efa7e6c745b380e254e1937b5c5d05052 +SIZE (charlesrocket-xtxf-0.11.5_GH0.tar.gz) = 17491 SHA256 (termbox-termbox2-9c9281a_GH0.tar.gz) = 4781a10e1f8dedc52ed1c93f1c306ec97acf81654135efd125e779c99bceab77 SIZE (termbox-termbox2-9c9281a_GH0.tar.gz) = 81538 -SHA256 (00JCIV00-cova-4c56696_GH0.tar.gz) = de1bc17b6d68f3beaf440841d7d52199059ab250950a37c00a49af2a0059d1e0 -SIZE (00JCIV00-cova-4c56696_GH0.tar.gz) = 6132977 -SHA256 (charlesrocket-ghext-0.7.2_GH0.tar.gz) = 3a9a6fe581ea4b9c6bf851f11bcd51f872a0ab4416dc9728fffcee6a4debfd17 -SIZE (charlesrocket-ghext-0.7.2_GH0.tar.gz) = 8538 +SHA256 (00JCIV00-cova-3fa729c_GH0.tar.gz) = fc9ce7a5eac22d11f16f0af3fe9430a6b23a6ed1c1b5848644c04d42e873c037 +SIZE (00JCIV00-cova-3fa729c_GH0.tar.gz) = 6529870 +SHA256 (charlesrocket-ghext-0.7.4_GH0.tar.gz) = a5d1c628d411bb42d3533adc76ec0ba16b60fffd0fde062ba1f0c0abe3fe8d75 +SIZE (charlesrocket-ghext-0.7.4_GH0.tar.gz) = 8622 |
