diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index 336f8ed244c6..7e380875731c 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -1,36 +1,35 @@ PORTNAME= fs2open DISTVERSIONPREFIX= release_ -DISTVERSION= 23_0_0 -PORTREVISION= 3 +DISTVERSION= 23_2_0 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org COMMENT= Open source video engine of FreeSpace 2 WWW= http://scp.indiegames.us LICENSE= VOLITION LICENSE_NAME= Volition Copyright LICENSE_FILE= ${WRKSRC}/Copying.md LICENSE_PERMS= dist-mirror auto-accept LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 USES= cmake compiler:c++11-lib lua:51 jpeg openal pkgconfig sdl USE_GITHUB= yes GH_ACCOUNT= scp-fs2open GH_PROJECT= fs2open.github.com GH_TUPLE= asarium:cmake-modules:7cef957:cmakemodules/cmake/external/rpavlik-cmake-modules \ asarium:libRocket:ecd648a:libRocket/lib/libRocket USE_SDL= sdl2 LDFLAGS_i386= -Wl,-znotext PLIST_FILES= bin/fs2_open do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/fs2_open \ ${STAGEDIR}${PREFIX}/bin .include diff --git a/games/fs2open/distinfo b/games/fs2open/distinfo index c85f6c2de61f..2885d10838b2 100644 --- a/games/fs2open/distinfo +++ b/games/fs2open/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1676137258 -SHA256 (scp-fs2open-fs2open.github.com-release_23_0_0_GH0.tar.gz) = 019a24feeef7a48f8170f0339c5530122b326bd88fb73e9d7515bfe9e5381aa8 -SIZE (scp-fs2open-fs2open.github.com-release_23_0_0_GH0.tar.gz) = 12210430 +TIMESTAMP = 1697284203 +SHA256 (scp-fs2open-fs2open.github.com-release_23_2_0_GH0.tar.gz) = 613fae44dd2e28e478d4edfb532f7ac26e4886c024ad64d649be57ec4ee55cef +SIZE (scp-fs2open-fs2open.github.com-release_23_2_0_GH0.tar.gz) = 12088343 SHA256 (asarium-cmake-modules-7cef957_GH0.tar.gz) = 5d1e7954bb92c61c1509ad0bb0d2274af4863621dc864199aac85c2d43921c0e SIZE (asarium-cmake-modules-7cef957_GH0.tar.gz) = 267299 SHA256 (asarium-libRocket-ecd648a_GH0.tar.gz) = 43864c375480c9eeac47643ae1c30947d9b236281e51e1d54d729c6d51cef6e4 SIZE (asarium-libRocket-ecd648a_GH0.tar.gz) = 2417439 diff --git a/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h b/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h deleted file mode 100644 index f12c9a3d6403..000000000000 --- a/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h +++ /dev/null @@ -1,11 +0,0 @@ ---- code/libs/renderdoc/renderdoc_app.h.orig 2021-01-27 17:07:03 UTC -+++ code/libs/renderdoc/renderdoc_app.h -@@ -43,6 +43,8 @@ - #define RENDERDOC_CC - #elif defined(SCP_SOLARIS) - #define RENDERDOC_CC -+#elif defined(__FreeBSD__) -+#define RENDERDOC_CC - #else - #error "Unknown platform" - #endif diff --git a/games/fs2open/files/patch-code_network_gtrack.cpp b/games/fs2open/files/patch-code_network_gtrack.cpp deleted file mode 100644 index 66f6b4511155..000000000000 --- a/games/fs2open/files/patch-code_network_gtrack.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- code/network/gtrack.cpp.orig 2021-01-27 17:07:03 UTC -+++ code/network/gtrack.cpp -@@ -27,6 +27,9 @@ - #include "network/ptrack.h" - #include "network/multi_fstracker.h" - -+#ifdef __FreeBSD__ -+#include -+#endif - - // check structs for size compatibility - SDL_COMPILE_TIME_ASSERT(game_packet_header, sizeof(game_packet_header) == 529); diff --git a/games/fs2open/files/patch-code_network_ptrack.cpp b/games/fs2open/files/patch-code_network_ptrack.cpp deleted file mode 100644 index 8b4dcb320ddb..000000000000 --- a/games/fs2open/files/patch-code_network_ptrack.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- code/network/ptrack.cpp.orig 2021-01-27 17:07:03 UTC -+++ code/network/ptrack.cpp -@@ -27,6 +27,9 @@ - #include "network/psnet2.h" - #include "network/multi_fstracker.h" - -+#ifdef __FreeBSD__ -+#include -+#endif - - // check structs for size compatibility - SDL_COMPILE_TIME_ASSERT(udp_packet_header, sizeof(udp_packet_header) == 497); diff --git a/games/fs2open/files/patch-code_network_valid.cpp b/games/fs2open/files/patch-code_network_valid.cpp deleted file mode 100644 index 790b9c9e564f..000000000000 --- a/games/fs2open/files/patch-code_network_valid.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- code/network/valid.cpp.orig 2021-01-27 17:07:03 UTC -+++ code/network/valid.cpp -@@ -29,6 +29,9 @@ - #include "network/multi_fstracker.h" - #include "io/timer.h" - -+#ifdef __FreeBSD__ -+#include -+#endif - - // check structs for size compatibility - SDL_COMPILE_TIME_ASSERT(vmt_validate_mission_req_struct, sizeof(vmt_validate_mission_req_struct) == 104); diff --git a/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp b/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp deleted file mode 100644 index df7e693ccedd..000000000000 --- a/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp +++ /dev/null @@ -1,47 +0,0 @@ ---- lib/vulkan-hpp/vulkan/vulkan.hpp.orig 2021-01-28 12:10:12 UTC -+++ lib/vulkan-hpp/vulkan/vulkan.hpp -@@ -61,7 +61,7 @@ - #endif - - #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 --# if defined(__linux__) || defined(__APPLE__) -+# if defined(__unix__) || defined(__APPLE__) - # include - # endif - -@@ -67953,7 +67953,7 @@ namespace VULKAN_HPP_NAMESPACE - DynamicLoader() : m_success( false ) - #endif - { --#if defined(__linux__) -+#if defined(__unix__) - m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); - #elif defined(__APPLE__) - m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); -@@ -67977,7 +67977,7 @@ namespace VULKAN_HPP_NAMESPACE - { - if ( m_library ) - { --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) || defined(__APPLE__) - dlclose( m_library ); - #elif defined(_WIN32) - FreeLibrary( m_library ); -@@ -67988,7 +67988,7 @@ namespace VULKAN_HPP_NAMESPACE - template - T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT - { --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) || defined(__APPLE__) - return (T)dlsym( m_library, function ); - #elif defined(_WIN32) - return (T)GetProcAddress( m_library, function ); -@@ -67999,7 +67999,7 @@ namespace VULKAN_HPP_NAMESPACE - - private: - bool m_success; --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__unix__) || defined(__APPLE__) - void *m_library; - #elif defined(_WIN32) - HMODULE m_library;