Index: head/games/fs2open/Makefile =================================================================== --- head/games/fs2open/Makefile (revision 563131) +++ head/games/fs2open/Makefile (revision 563132) @@ -1,38 +1,36 @@ # $FreeBSD$ PORTNAME= fs2open DISTVERSIONPREFIX= release_ -DISTVERSION= 19_0_0 +DISTVERSION= 21_0_0 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org COMMENT= Open source video engine of FreeSpace 2 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 + libpng.so:graphics/png \ + libfreetype.so:print/freetype2 -USES= cmake compiler:gcc-c++11-lib lua:51 jpeg openal pkgconfig sdl +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:6e5f399:libRocket/lib/libRocket + asarium:libRocket:ecd648a:libRocket/lib/libRocket USE_SDL= sdl2 - -CMAKE_OFF= ENABLE_COTIRE -CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen LDFLAGS_i386= -Wl,-znotext PLIST_FILES= bin/fs2_open do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/fs2_open \ ${STAGEDIR}${PREFIX}/bin .include Index: head/games/fs2open/distinfo =================================================================== --- head/games/fs2open/distinfo (revision 563131) +++ head/games/fs2open/distinfo (revision 563132) @@ -1,7 +1,7 @@ -TIMESTAMP = 1580053593 -SHA256 (scp-fs2open-fs2open.github.com-release_19_0_0_GH0.tar.gz) = cb15315f6f23f82b06df39a1eaeaec82ecaedcb5fd30b9596ba7cce2c138df6e -SIZE (scp-fs2open-fs2open.github.com-release_19_0_0_GH0.tar.gz) = 9357149 +TIMESTAMP = 1611835262 +SHA256 (scp-fs2open-fs2open.github.com-release_21_0_0_GH0.tar.gz) = 7fbe6031772947ef10998715cd587f6e0ffbc6a25b482e77278c99177040102a +SIZE (scp-fs2open-fs2open.github.com-release_21_0_0_GH0.tar.gz) = 10188793 SHA256 (asarium-cmake-modules-7cef957_GH0.tar.gz) = 5d1e7954bb92c61c1509ad0bb0d2274af4863621dc864199aac85c2d43921c0e SIZE (asarium-cmake-modules-7cef957_GH0.tar.gz) = 267299 -SHA256 (asarium-libRocket-6e5f399_GH0.tar.gz) = b137fafc4db1c191c79d2de4cd8840c8723d86314567515773d461b2f30ce10d -SIZE (asarium-libRocket-6e5f399_GH0.tar.gz) = 2417223 +SHA256 (asarium-libRocket-ecd648a_GH0.tar.gz) = 43864c375480c9eeac47643ae1c30947d9b236281e51e1d54d729c6d51cef6e4 +SIZE (asarium-libRocket-ecd648a_GH0.tar.gz) = 2417439 Index: head/games/fs2open/files/patch-code_model_modelread.cpp =================================================================== --- head/games/fs2open/files/patch-code_model_modelread.cpp (revision 563131) +++ head/games/fs2open/files/patch-code_model_modelread.cpp (nonexistent) @@ -1,35 +0,0 @@ ---- code/model/modelread.cpp.orig 2020-01-25 16:45:09 UTC -+++ code/model/modelread.cpp -@@ -5341,7 +5341,7 @@ void swap_bsp_sortnorms( polymodel * pm, ubyte * p ) - } - #endif // BIG_ENDIAN - --void swap_bsp_data( polymodel * /*pm*/, void * /*model_ptr*/ ) -+void swap_bsp_data( polymodel *pm, void *model_ptr ) - { - #if BYTE_ORDER == BIG_ENDIAN - ubyte *p = (ubyte *)model_ptr; -@@ -5394,10 +5394,13 @@ void swap_bsp_data( polymodel * /*pm*/, void * /*mode - } - - return; -+#else -+(void)pm; -+(void)model_ptr; - #endif - } - --void swap_sldc_data(ubyte * /*buffer*/) -+void swap_sldc_data(ubyte * buffer) - { - #if BYTE_ORDER == BIG_ENDIAN - char *type_p = (char *)(buffer); -@@ -5439,6 +5442,8 @@ void swap_sldc_data(ubyte * /*buffer*/) - shld_polys[i] = INTEL_INT(shld_polys[i]); - } - } -+#else -+(void)buffer; - #endif - } - Property changes on: head/games/fs2open/files/patch-code_model_modelread.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/fs2open/files/patch-cmake_toolchain-clang.cmake =================================================================== --- head/games/fs2open/files/patch-cmake_toolchain-clang.cmake (revision 563131) +++ head/games/fs2open/files/patch-cmake_toolchain-clang.cmake (revision 563132) @@ -1,23 +1,23 @@ ---- cmake/toolchain-clang.cmake.orig 2020-01-25 16:45:09 UTC +--- cmake/toolchain-clang.cmake.orig 2021-01-27 17:07:03 UTC +++ cmake/toolchain-clang.cmake @@ -10,8 +10,8 @@ option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsaniti option(CLANG_USE_LIBCXX "Use libc++" OFF) # 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}) -@@ -95,9 +95,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE}) +@@ -96,9 +96,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE}) set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) - - -set(CMAKE_EXE_LINKER_FLAGS "") if (CLANG_USE_LIBCXX) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi") Index: head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake =================================================================== --- head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake (revision 563131) +++ head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake (revision 563132) @@ -1,22 +1,13 @@ ---- cmake/toolchain-gcc.cmake.orig 2020-01-25 16:45:09 UTC +--- cmake/toolchain-gcc.cmake.orig 2021-01-28 12:41:41 UTC +++ cmake/toolchain-gcc.cmake -@@ -10,8 +10,8 @@ option(GCC_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize - option(GCC_ENABLE_SANITIZE_UNDEFINED "Enable -fsanitize=undefined" OFF) +@@ -12,8 +12,8 @@ option(GCC_USE_GOLD "Use the gold linker instead of th + option(GCC_GENERATE_GDB_INDEX "Adds linker option to generate the gdb index for debug builds" OFF) # 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(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{CFLAGS}) -@@ -107,8 +107,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE}) - - set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) - set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG}) -- --set(CMAKE_EXE_LINKER_FLAGS "") - - IF (MINGW) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import") Index: head/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h =================================================================== --- head/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h (revision 563131) +++ head/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h (revision 563132) @@ -1,11 +1,11 @@ ---- code/libs/renderdoc/renderdoc_app.h.orig 2020-01-28 14:50:19 UTC +--- code/libs/renderdoc/renderdoc_app.h.orig 2021-01-27 17:07:03 UTC +++ code/libs/renderdoc/renderdoc_app.h -@@ -39,6 +39,8 @@ +@@ -43,6 +43,8 @@ #define RENDERDOC_CC - #elif defined(__APPLE__) + #elif defined(SCP_SOLARIS) #define RENDERDOC_CC +#elif defined(__FreeBSD__) +#define RENDERDOC_CC #else #error "Unknown platform" #endif Index: head/games/fs2open/files/patch-code_network_gtrack.cpp =================================================================== --- head/games/fs2open/files/patch-code_network_gtrack.cpp (revision 563131) +++ head/games/fs2open/files/patch-code_network_gtrack.cpp (revision 563132) @@ -1,12 +1,12 @@ ---- code/network/gtrack.cpp.orig 2020-01-28 15:07:26 UTC +--- code/network/gtrack.cpp.orig 2021-01-27 17:07:03 UTC +++ code/network/gtrack.cpp -@@ -25,6 +25,9 @@ +@@ -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); Index: head/games/fs2open/files/patch-code_network_ptrack.cpp =================================================================== --- head/games/fs2open/files/patch-code_network_ptrack.cpp (revision 563131) +++ head/games/fs2open/files/patch-code_network_ptrack.cpp (revision 563132) @@ -1,12 +1,12 @@ ---- code/network/ptrack.cpp.orig 2020-01-28 15:15:11 UTC +--- code/network/ptrack.cpp.orig 2021-01-27 17:07:03 UTC +++ code/network/ptrack.cpp -@@ -25,6 +25,9 @@ +@@ -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); Index: head/games/fs2open/files/patch-code_network_valid.cpp =================================================================== --- head/games/fs2open/files/patch-code_network_valid.cpp (revision 563131) +++ head/games/fs2open/files/patch-code_network_valid.cpp (revision 563132) @@ -1,12 +1,12 @@ ---- code/network/valid.cpp.orig 2020-01-28 15:19:22 UTC +--- code/network/valid.cpp.orig 2021-01-27 17:07:03 UTC +++ code/network/valid.cpp -@@ -27,6 +27,9 @@ +@@ -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); Index: head/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp =================================================================== --- head/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp (nonexistent) +++ head/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp (revision 563132) @@ -0,0 +1,47 @@ +--- 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; Property changes on: head/games/fs2open/files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property