games/fs2open: update to 19.0.0

8 files changed, 64 insertions, 35 deletions

diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile
index ea09b7e5bd1c..baab1fae5e52 100644
--- a/games/fs2open/Makefile
+++ b/games/fs2open/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	fs2open
 DISTVERSIONPREFIX=	release_
-DISTVERSION=	3_8_0
-PORTREVISION=	3
+DISTVERSION=	19_0_0
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT=	Open source video engine of FreeSpace 2
 
 LICENSE=	VOLITION
 LICENSE_NAME=	Volition Copyright
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/Copying.md
 LICENSE_PERMS=	dist-mirror auto-accept
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
@@ -23,9 +22,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	scp-fs2open
 GH_PROJECT=	fs2open.github.com
 GH_TUPLE=	asarium:cmake-modules:7cef957:cmakemodules/cmake/external/rpavlik-cmake-modules \
-		sakra:cotire:40a46bf:cotire/cmake/external/cotire
+		asarium:libRocket:6e5f399:libRocket/lib/libRocket
 USE_SDL=	sdl2
 
+CMAKE_OFF=	ENABLE_COTIRE
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 
 PLIST_FILES=	bin/fs2_open
diff --git a/games/fs2open/distinfo b/games/fs2open/distinfo
index 6d8a1255e15f..b0386898c0b1 100644
--- a/games/fs2open/distinfo
+++ b/games/fs2open/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1556835470
-SHA256 (scp-fs2open-fs2open.github.com-release_3_8_0_GH0.tar.gz) = c932d86daa2fe3dedf533a8904ed0cc9916bfe8ccf8e1cffcc20911a88d36457
-SIZE (scp-fs2open-fs2open.github.com-release_3_8_0_GH0.tar.gz) = 8711455
+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
 SHA256 (asarium-cmake-modules-7cef957_GH0.tar.gz) = 5d1e7954bb92c61c1509ad0bb0d2274af4863621dc864199aac85c2d43921c0e
 SIZE (asarium-cmake-modules-7cef957_GH0.tar.gz) = 267299
-SHA256 (sakra-cotire-40a46bf_GH0.tar.gz) = f58794a6c7fa639c6797083a56fc21df0a94cc689c881bf6e3f50439ad313d58
-SIZE (sakra-cotire-40a46bf_GH0.tar.gz) = 62758
+SHA256 (asarium-libRocket-6e5f399_GH0.tar.gz) = b137fafc4db1c191c79d2de4cd8840c8723d86314567515773d461b2f30ce10d
+SIZE (asarium-libRocket-6e5f399_GH0.tar.gz) = 2417223
diff --git a/games/fs2open/files/patch-cmake_toolchain-clang.cmake b/games/fs2open/files/patch-cmake_toolchain-clang.cmake
index 6c59ec26b40d..d28921cb956c 100644
--- a/games/fs2open/files/patch-cmake_toolchain-clang.cmake
+++ b/games/fs2open/files/patch-cmake_toolchain-clang.cmake
@@ -1,7 +1,7 @@
---- cmake/toolchain-clang.cmake.orig	2017-08-22 16:56:27 UTC
+--- cmake/toolchain-clang.cmake.orig	2020-01-25 16:45:09 UTC
 +++ cmake/toolchain-clang.cmake
-@@ -8,8 +8,8 @@ option(CLANG_ENABLE_LEAK_CHECK "Enable -fsanitize=leak
- option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF)
+@@ -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")
@@ -11,16 +11,7 @@
  
  # For C and C++, the values can be overwritten independently
  if(DEFINED ENV{CXXFLAGS})
-@@ -80,7 +80,7 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
- 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
- endif()
- 
--set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable")
-+set(COMPILER_FLAGS_RELEASE "-Wno-unused-variable")
- 
- set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
- 
-@@ -93,9 +93,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+@@ -95,9 +95,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})
@@ -28,5 +19,5 @@
 -
 -set(CMAKE_EXE_LINKER_FLAGS "")
  
- if (SANITIZE_FLAGS)
- 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}")
+ if (CLANG_USE_LIBCXX)
+ 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
diff --git a/games/fs2open/files/patch-cmake_toolchain-gcc.cmake b/games/fs2open/files/patch-cmake_toolchain-gcc.cmake
index e3b6613deaa7..e1a4ecc4e602 100644
--- a/games/fs2open/files/patch-cmake_toolchain-gcc.cmake
+++ b/games/fs2open/files/patch-cmake_toolchain-gcc.cmake
@@ -1,4 +1,4 @@
---- cmake/toolchain-gcc.cmake.orig	2017-08-22 16:56:27 UTC
+--- cmake/toolchain-gcc.cmake.orig	2020-01-25 16:45:09 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)
@@ -11,16 +11,7 @@
  
  # For C and C++, the values can be overwritten independently
  if(DEFINED ENV{CFLAGS})
-@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated 
- 
- set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
- 
--set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
-+set(COMPILER_FLAGS_RELEASE "-Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
- 
- set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
- 
-@@ -100,8 +100,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+@@ -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})
diff --git a/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h b/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h
new file mode 100644
index 000000000000..abd5a79df359
--- /dev/null
+++ b/games/fs2open/files/patch-code_libs_renderdoc_renderdoc__app.h
@@ -0,0 +1,11 @@
+--- code/libs/renderdoc/renderdoc_app.h.orig	2020-01-28 14:50:19 UTC
++++ code/libs/renderdoc/renderdoc_app.h
+@@ -39,6 +39,8 @@
+ #define RENDERDOC_CC
+ #elif defined(__APPLE__)
+ #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
new file mode 100644
index 000000000000..a6b07be683b1
--- /dev/null
+++ b/games/fs2open/files/patch-code_network_gtrack.cpp
@@ -0,0 +1,12 @@
+--- code/network/gtrack.cpp.orig	2020-01-28 15:07:26 UTC
++++ code/network/gtrack.cpp
+@@ -25,6 +25,9 @@
+ #include "network/ptrack.h"
+ #include "network/multi_fstracker.h"
+ 
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#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
new file mode 100644
index 000000000000..26709d9cf10f
--- /dev/null
+++ b/games/fs2open/files/patch-code_network_ptrack.cpp
@@ -0,0 +1,12 @@
+--- code/network/ptrack.cpp.orig	2020-01-28 15:15:11 UTC
++++ code/network/ptrack.cpp
+@@ -25,6 +25,9 @@
+ #include "network/psnet2.h"
+ #include "network/multi_fstracker.h"
+ 
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#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
new file mode 100644
index 000000000000..931cdac13c88
--- /dev/null
+++ b/games/fs2open/files/patch-code_network_valid.cpp
@@ -0,0 +1,12 @@
+--- code/network/valid.cpp.orig	2020-01-28 15:19:22 UTC
++++ code/network/valid.cpp
+@@ -27,6 +27,9 @@
+ #include "network/multi_fstracker.h"
+ #include "io/timer.h"
+ 
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#endif
+ 
+ // check structs for size compatibility
+ SDL_COMPILE_TIME_ASSERT(vmt_validate_mission_req_struct, sizeof(vmt_validate_mission_req_struct) == 104);