Date: Wed, 11 Feb 2026 11:46:49 +0000 From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cf03fa0b9d11 - main - games/fs2open: update to 25.0.0 Message-ID: <698c6c29.27911.12a441ca@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf03fa0b9d11ad27b2d4073f7241e1e3f07fc5a6 commit cf03fa0b9d11ad27b2d4073f7241e1e3f07fc5a6 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2026-02-10 11:35:47 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2026-02-11 11:46:44 +0000 games/fs2open: update to 25.0.0 --- games/fs2open/Makefile | 7 +-- games/fs2open/distinfo | 6 +- .../af833f059cc0cfc925792e019f6c2b754c6d53c1.patch | 66 ---------------------- .../files/patch-cmake_toolchain-clang.cmake | 31 ++++++---- games/fs2open/files/patch-code_CMakeLists.txt | 18 ------ .../patch-code_graphics_opengl_gropenglopenxr.cpp | 20 ------- games/fs2open/files/patch-code_graphics_openxr.cpp | 18 ------ .../files/patch-code_graphics_openxr__internal.h | 18 ------ games/fs2open/files/patch-lib_CMakeLists.txt | 12 ---- 9 files changed, 25 insertions(+), 171 deletions(-) diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index f04001cab779..28b062985f4c 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -1,16 +1,12 @@ PORTNAME= fs2open DISTVERSIONPREFIX= release_ -DISTVERSION= 24_2_0 -PORTREVISION= 1 +DISTVERSION= 25_0_0 CATEGORIES= games 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 @@ -29,6 +25,7 @@ GH_TUPLE= asarium:cmake-modules:7cef957:cmakemodules/cmake/external/rpavlik-cmak asarium:libRocket:ae8a8d9:libRocket/lib/libRocket USE_SDL= sdl2 +CMAKE_OFF= FSO_BUILD_WITH_OPENXR LDFLAGS_i386= -Wl,-znotext PLIST_FILES= bin/fs2_open diff --git a/games/fs2open/distinfo b/games/fs2open/distinfo index 940989166a1a..820e9514e005 100644 --- a/games/fs2open/distinfo +++ b/games/fs2open/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1762251304 -SHA256 (scp-fs2open-fs2open.github.com-release_24_2_0_GH0.tar.gz) = 7b3756156c7faac9ac3013bc8c07415c1232bb340753ca457860231acc843f77 -SIZE (scp-fs2open-fs2open.github.com-release_24_2_0_GH0.tar.gz) = 10958574 +TIMESTAMP = 1770714233 +SHA256 (scp-fs2open-fs2open.github.com-release_25_0_0_GH0.tar.gz) = be2a1b55856fcf68a3d08e50141a29d26520c21b6089743a00e2a733dab0517a +SIZE (scp-fs2open-fs2open.github.com-release_25_0_0_GH0.tar.gz) = 11459432 SHA256 (asarium-cmake-modules-7cef957_GH0.tar.gz) = 5d1e7954bb92c61c1509ad0bb0d2274af4863621dc864199aac85c2d43921c0e SIZE (asarium-cmake-modules-7cef957_GH0.tar.gz) = 267299 SHA256 (asarium-libRocket-ae8a8d9_GH0.tar.gz) = e3cb4561dca373a9fc7bb2501820ff19ea2ef00bf1a1ad70cdca1ebbf7b2976f diff --git a/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch deleted file mode 100644 index 2c456bb22a5f..000000000000 --- a/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch +++ /dev/null @@ -1,66 +0,0 @@ -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/fs2open/files/patch-cmake_toolchain-clang.cmake b/games/fs2open/files/patch-cmake_toolchain-clang.cmake index 713ccdb2d82a..d581448b4e6b 100644 --- a/games/fs2open/files/patch-cmake_toolchain-clang.cmake +++ b/games/fs2open/files/patch-cmake_toolchain-clang.cmake @@ -1,13 +1,22 @@ ---- cmake/toolchain-clang.cmake.orig 2024-10-28 01:17:49 UTC +--- cmake/toolchain-clang.cmake.orig 2026-02-10 10:48:25 UTC +++ cmake/toolchain-clang.cmake -@@ -10,8 +10,8 @@ option(CLANG_USE_LIBCXX "Use libc++" OFF) - option(CLANG_USE_LIBCXX "Use libc++" OFF) +@@ -15,7 +15,7 @@ if(IS_X86) - # These are the default values --set(C_BASE_FLAGS "-march=native -pipe") --set(CXX_BASE_FLAGS "-march=native -pipe") -+set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}") -+set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}") - - # For C and C++, the values can be overwritten independently - if(DEFINED ENV{CXXFLAGS}) + if(IS_X86) + if(FORCED_NATIVE_SIMD_INSTRUCTIONS) +- set(CLANG_EXTENSIONS "-march=native") ++ set(CLANG_EXTENSIONS "") + elseif (FSO_INSTRUCTION_SET STREQUAL "") + set(CLANG_EXTENSIONS "-march=x86-64") + elseif (FSO_INSTRUCTION_SET STREQUAL "SSE") +@@ -34,8 +34,8 @@ elseif(IS_ARM) + set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} ${CLANG_EXTENSIONS}") + elseif(IS_ARM) + if(FORCED_NATIVE_SIMD_INSTRUCTIONS) +- set(C_BASE_FLAGS "${C_BASE_FLAGS} -march=native") +- set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -march=native") ++ set(C_BASE_FLAGS "${C_BASE_FLAGS}") ++ set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS}") + endif () + elseif(IS_RISCV) + # Default C/CXX_BASE_FLAGS are fine for RISC-V diff --git a/games/fs2open/files/patch-code_CMakeLists.txt b/games/fs2open/files/patch-code_CMakeLists.txt deleted file mode 100644 index 9ada582f3bfa..000000000000 --- a/games/fs2open/files/patch-code_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- code/CMakeLists.txt.orig 2025-11-04 12:53:34 UTC -+++ code/CMakeLists.txt -@@ -79,7 +79,7 @@ target_link_libraries(code PUBLIC imgui) - - target_link_libraries(code PUBLIC imgui) - --IF(NOT APPLE) -+IF(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - target_link_libraries(code PUBLIC OpenXR::openxr_loader) - target_include_directories(code PUBLIC OpenXR::Headers) - ENDIF() -@@ -139,4 +139,4 @@ set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_ - set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN[variant=Debug] "NO") - - # Prevent GCC warnings in third-party BitOp... see GitHub #4366 --suppress_file_warnings(scripting/lua/bitop/bit.c) -\ No newline at end of file -+suppress_file_warnings(scripting/lua/bitop/bit.c) diff --git a/games/fs2open/files/patch-code_graphics_opengl_gropenglopenxr.cpp b/games/fs2open/files/patch-code_graphics_opengl_gropenglopenxr.cpp deleted file mode 100644 index 0d633841388b..000000000000 --- a/games/fs2open/files/patch-code_graphics_opengl_gropenglopenxr.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- code/graphics/opengl/gropenglopenxr.cpp.orig 2025-11-04 13:07:36 UTC -+++ code/graphics/opengl/gropenglopenxr.cpp -@@ -21,7 +21,7 @@ - #include "graphics/opengl/ShaderProgram.h" - #include "osapi/osapi.h" - --#if defined __APPLE_CC__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ - - //Not supported - -@@ -38,7 +38,7 @@ - - #include <SDL_syswm.h> - --#ifndef __APPLE_CC__ -+#if !defined __APPLE_CC__ && !defined __FreeBSD__ - - //SETUP FUNCTIONS OGL - SCP_vector<const char*> gr_opengl_openxr_get_extensions() { diff --git a/games/fs2open/files/patch-code_graphics_openxr.cpp b/games/fs2open/files/patch-code_graphics_openxr.cpp deleted file mode 100644 index 827388a667d7..000000000000 --- a/games/fs2open/files/patch-code_graphics_openxr.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- code/graphics/openxr.cpp.orig 2025-11-04 13:12:38 UTC -+++ code/graphics/openxr.cpp -@@ -9,7 +9,7 @@ std::unique_ptr<star[]> Stars_XRBuffer; - - std::unique_ptr<star[]> Stars_XRBuffer; - --#ifndef __APPLE_CC__ -+#if !defined(__APPLE_CC__) && !defined(__FreeBSD__) - - #define XR_MAKE_VERSION_SHORT(major, minor, patch) \ - ((((major) & 0x3ffU) << 20) | (((minor) & 0x3ffU) << 10) | ((patch) & 0x3ffU)) -@@ -545,4 +545,4 @@ OpenXRTrackingInfo openxr_start_stereo_frame() { retur - - OpenXRTrackingInfo openxr_start_stereo_frame() { return OpenXRTrackingInfo{}; } - --#endif -\ No newline at end of file -+#endif diff --git a/games/fs2open/files/patch-code_graphics_openxr__internal.h b/games/fs2open/files/patch-code_graphics_openxr__internal.h deleted file mode 100644 index 32b81e952150..000000000000 --- a/games/fs2open/files/patch-code_graphics_openxr__internal.h +++ /dev/null @@ -1,18 +0,0 @@ ---- code/graphics/openxr_internal.h.orig 2025-11-04 13:00:12 UTC -+++ code/graphics/openxr_internal.h -@@ -7,7 +7,7 @@ - #include <type_traits> - #include <tl/optional.hpp> - --#ifndef __APPLE_CC__ -+#if !defined(__APPLE_CC__) && !defined(__FreeBSD__) - - #include <openxr/openxr.h> - #include <openxr/openxr_platform.h> -@@ -51,4 +51,4 @@ tl::optional<typename std::result_of<openxr_fnc(arg_t. - return func(std::forward<arg_t>(args)...); - } - --#endif -\ No newline at end of file -+#endif diff --git a/games/fs2open/files/patch-lib_CMakeLists.txt b/games/fs2open/files/patch-lib_CMakeLists.txt deleted file mode 100644 index 027db1ab3a36..000000000000 --- a/games/fs2open/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/CMakeLists.txt.orig 2025-11-04 12:49:44 UTC -+++ lib/CMakeLists.txt -@@ -61,6 +61,6 @@ ADD_SUBDIRECTORY(imgui) - - ADD_SUBDIRECTORY(imgui) - --if(NOT APPLE) -+if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - add_subdirectory(openxr) --endif() -\ No newline at end of file -+endif()home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698c6c29.27911.12a441ca>