fs2open: update to fs2open-21.0.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fs2open: update to fs2open-21.0.0
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 31 Jan 2021 09:33:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Jan 31 11:33:40 2021 +0200
Changeset:	72faebeb0cb21ba5f58f00e7a07b644c39f1c6a3

Modified Files:
	fs2open/Makefile
	fs2open/distinfo
	fs2open/patches/patch-cmake_toolchain-gcc.cmake
	fs2open/patches/patch-code_osapi_dialogs.cpp
	fs2open/patches/patch-lib_libpcp_src_net_gateway.c
Added Files:
	fs2open/patches/patch-code_network_psnet2.cpp
	fs2open/patches/patch-lib_CMakeLists.txt
	fs2open/patches/patch-lib_antlr4-cpp-runtime_CMakeLists.txt
Removed Files:
	fs2open/patches/patch-code_libs_renderdoc_renderdoc__app.h
	fs2open/patches/patch-code_network_multi__portfwd.cpp

Log Message:
fs2open: update to fs2open-21.0.0

(The major version number denotes the year of release, fs2open-20.0.0 was not released.)

Announcement:

Release: 21.0.0

on: January 27, 2021, 11:33:43 am
Another year, another release!

Change log: (chronologically ordered)
  * More OpenGL optimizations
  * Full type information output for Lua documentation. Very useful for
    writing Lua scripts.
  * A new -weaponspew command-line option for printing MediaVP-style
    statistics, plus a weapon comparison spreadsheet, to the debug log.
  * Improved ship lookup behavior in SEXPs for improved performance.
  * BPTC/BC7 texture compression support
  * Refactoring and new features for the ship lab.
  * Missile multi-lock. It's finally in an official build!
  * Enhancements to the model code in preparation for cool features in
    21.2.
  * IPv6 support for multiplayer
  * A lot of general fixes for multiplayer.

For a summary of changes from a modders point of view, you can check
out EatThePaths summary here: https://www.hard-light.net/forums/
index.php?topic=97094.0

Deprecations:
  * Dropped support for Windows XP
  * Scripting:
      - ba.getFrametime(): The parameter value was used incorrectly
        inside the implementation. To avoid breaking existing scripts
        and to improve readability this has been split into
        ba.getMissionFrametime() and ba.getRealFrametime().
      - gr.drawMonochromeImage(): gr.drawImage() got a new parameter
        for drawing monochrome images and is more flexible in general
        so the monochrome variant is no longer needed.

Deprecations are a mechanism in FSO where a certain feature or aspect
of the engine has changed or is no longer supported. Since this would
normally break existing mods we have the mod table feature "$Target
Version:" with which a mod can specify what version of FSO it was
developed with. The features listed above will be removed or changed
when the target version of a mod is at least the version released in
this post.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=72faebeb0cb21ba5f58f00e7a07b644c39f1c6a3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fs2open/Makefile                                   | 26 +++++++++++++++++----
 fs2open/distinfo                                   | 27 ++++++++++++++--------
 fs2open/patches/patch-cmake_toolchain-gcc.cmake    |  8 +++----
 .../patch-code_libs_renderdoc_renderdoc__app.h     | 19 ---------------
 .../patches/patch-code_network_multi__portfwd.cpp  | 16 -------------
 fs2open/patches/patch-code_network_psnet2.cpp      | 16 +++++++++++++
 fs2open/patches/patch-code_osapi_dialogs.cpp       | 13 +++--------
 fs2open/patches/patch-lib_CMakeLists.txt           | 13 +++++++++++
 .../patch-lib_antlr4-cpp-runtime_CMakeLists.txt    | 20 ++++++++++++++++
 fs2open/patches/patch-lib_libpcp_src_net_gateway.c | 22 +++++++++---------
 10 files changed, 107 insertions(+), 73 deletions(-)

diffs:
diff --git a/fs2open/Makefile b/fs2open/Makefile
index 7b95e8acf2..c665e3bdf0 100644
--- a/fs2open/Makefile
+++ b/fs2open/Makefile
@@ -1,16 +1,29 @@
 # $NetBSD: Makefile,v 1.9 2015/08/18 20:48:41 yhardy Exp $
 #
 
-DISTNAME=	fs2_open_19_0_0-source-Unix
-PKGNAME=	fs2_open-19.0.0
+DISTNAME=	release_21_0_0
+PKGNAME=	fs2_open-21.0.0
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GITHUB:=scp-fs2open/fs2open.github.com/releases/download/release_19_0_0/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=scp-fs2open/fs2open.github.com/archive/}
+DIST_SUBDIR=	fs2_open
+DISTFILES+=	${DEFAULT_DISTFILES}
+DISTFILES+=	${GIT_CMAKE_MOD}.tar.gz
+DISTFILES+=	${GIT_LIBROCKET}.tar.gz
+
+GIT_CMAKE_MOD=	0875d124fd6f0a7b775227e1790f17dcf45a7ec6 #asarium
+GIT_CMAKE_MOD=	6a748896188fdf3f885820ccd686393ea5215dbf #rpavlik
+GIT_LIBROCKET=	ecd648a43aff8a9f3daf064d75ca5725237d5b38
+
+SITES.${GIT_CMAKE_MOD}.tar.gz= \
+		${MASTER_SITE_GITHUB:=rpavlik/}cmake-modules/archive/
+SITES.${GIT_LIBROCKET}.tar.gz= \
+		${MASTER_SITE_GITHUB:=asarium/}libRocket/archive/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://scp.indiegames.us/
 COMMENT=	Freespace 2 source code project
 
-WRKSRC=		${WRKDIR}/fs2open.github.com
+WRKSRC=		${WRKDIR}/fs2open.github.com-release_21_0_0
 
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
@@ -19,11 +32,16 @@ USE_TOOLS+=	pkg-config
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
 CMAKE_ARGS+=	-DBINARY_DESTINATION=bin
+CMAKE_ARGS+=	-DENABLE_COTIRE=OFF
+CMAKE_ARGS+=	-DFSO_BUILD_INCLUDED_LIBS=OFF
+CMAKE_ARGS+=	-DFSO_BUILD_WITH_VULKAN=OFF
 
 LUA_VERSIONS_ACCEPTED=	51
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/build
+	${CP} -R ${WRKDIR}/cmake-modules-${GIT_CMAKE_MOD}/* ${WRKSRC}/cmake/external/rpavlik-cmake-modules/
+	${CP} -R ${WRKDIR}/libRocket-${GIT_LIBROCKET}/* ${WRKSRC}/lib/libRocket/
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
diff --git a/fs2open/distinfo b/fs2open/distinfo
index 442105916d..d6c052f5fa 100644
--- a/fs2open/distinfo
+++ b/fs2open/distinfo
@@ -1,16 +1,25 @@
 $NetBSD: distinfo,v 1.6 2015/08/18 20:48:41 yhardy Exp $
 
-SHA1 (fs2_open_19_0_0-source-Unix.tar.gz) = 4ab780c25fc3e813d7fb319259ff7c214e271152
-RMD160 (fs2_open_19_0_0-source-Unix.tar.gz) = 465e5dc4f917f0fa4e0be04c1b9e3a39264b8b5e
-SHA512 (fs2_open_19_0_0-source-Unix.tar.gz) = c0d6824037064a6efa733c2361cccfaed8da5fa31eb5683ac4996239e2a4fe4c31d85cf7e9708ee9e5ebaf9ac1e5ef8a178380866e864d359f3ab82c26c5789d
-Size (fs2_open_19_0_0-source-Unix.tar.gz) = 12195030 bytes
+SHA1 (fs2_open/6a748896188fdf3f885820ccd686393ea5215dbf.tar.gz) = c11bcf821fc6ab68674cab077e83e9f233461af5
+RMD160 (fs2_open/6a748896188fdf3f885820ccd686393ea5215dbf.tar.gz) = ad15a96122bfec222ee4c87895346937e8fdfad6
+SHA512 (fs2_open/6a748896188fdf3f885820ccd686393ea5215dbf.tar.gz) = 25e6589d11605cbbcc3918a2d6faf9cc39dc47e8a0ccc9f491e63a8d7da339da5679a4073c3529b6d141a281e096e6aae9406712b7a66285afb948163f0e5a11
+Size (fs2_open/6a748896188fdf3f885820ccd686393ea5215dbf.tar.gz) = 241373 bytes
+SHA1 (fs2_open/ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) = 526eb9faca2db63953ea219a264717fc81b3f9cd
+RMD160 (fs2_open/ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) = 63cd363719f397dcfa62828d0ce983697337dd86
+SHA512 (fs2_open/ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) = 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+Size (fs2_open/ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) = 2417905 bytes
+SHA1 (fs2_open/release_21_0_0.tar.gz) = ea8932aed05a26bf4a3fdc19230a45f2eae7a686
+RMD160 (fs2_open/release_21_0_0.tar.gz) = 05eb8527307a5070eb53c8e78ab77b86b4406ea0
+SHA512 (fs2_open/release_21_0_0.tar.gz) = d9dab6b1bf8d0e8a1f8367fbe28fc74f95aed7f1b871770333a1a96497a46219fbd72f4e6deab22eee4b3aac2f664c3a8dbd27a851962e5a021281f653797115
+Size (fs2_open/release_21_0_0.tar.gz) = 10188793 bytes
 SHA1 (patch-cmake_platform-unix.cmake) = 54de840e05b9ac738e84e9e33f17ce623599ec6d
 SHA1 (patch-cmake_platforms.cmake) = b91c2544b2225f7d00fa35272dd2b20725e1ba3e
 SHA1 (patch-cmake_toolchain-clang.cmake) = b3c9375059a56d2963e60d83bac38e690ea6eabc
-SHA1 (patch-cmake_toolchain-gcc.cmake) = 957a15184012f3924f265ca467bcf5875d15ff96
-SHA1 (patch-code_libs_renderdoc_renderdoc__app.h) = 8c7179a15fc5015bd8f27267fda237f3e9c7b15e
-SHA1 (patch-code_network_multi__portfwd.cpp) = 4f08bfa9b1376a9c7c054067ff993dac157280c2
-SHA1 (patch-code_osapi_dialogs.cpp) = 10eb8c64f633c6b4db62bee7bc56e07631e22f08
+SHA1 (patch-cmake_toolchain-gcc.cmake) = 3ff59fe7a0a9381ee392b7964610580f272cdd7c
+SHA1 (patch-code_network_psnet2.cpp) = dbdf0451182918c1d2f934afa3ccf58e8774898c
+SHA1 (patch-code_osapi_dialogs.cpp) = ba8156bccffde88b97903f7d263ac1138bfe4eef
 SHA1 (patch-freespace2_CMakeLists.txt) = 78cfadc9c91c90636c60bba164be387bf39b9a11
-SHA1 (patch-lib_libpcp_src_net_gateway.c) = 47cf7aff4231c5b1914609bde7025d8f9def8d67
+SHA1 (patch-lib_CMakeLists.txt) = 534d5c89b47e926a1093c040f358adc01dd30196
+SHA1 (patch-lib_antlr4-cpp-runtime_CMakeLists.txt) = 148d82805e564374baf962191092c2b3940cde5b
+SHA1 (patch-lib_libpcp_src_net_gateway.c) = a05116a7ce0fcde029b27745488d4328d739ecd1
 SHA1 (patch-lib_libpcp_src_net_sock__ntop.c) = 8d1dc4326c714010f6632ab7d229874e4357a982
diff --git a/fs2open/patches/patch-cmake_toolchain-gcc.cmake b/fs2open/patches/patch-cmake_toolchain-gcc.cmake
index f08d716ab6..4d6073c123 100644
--- a/fs2open/patches/patch-cmake_toolchain-gcc.cmake
+++ b/fs2open/patches/patch-cmake_toolchain-gcc.cmake
@@ -2,14 +2,14 @@ $NetBSD$
 
 Keep the linker flags (which include the rpath).
 
---- cmake/toolchain-gcc.cmake.orig	2019-11-03 18:11:21.000000000 +0000
+--- cmake/toolchain-gcc.cmake.orig	2021-01-27 17:07:03.000000000 +0000
 +++ cmake/toolchain-gcc.cmake
-@@ -108,7 +108,7 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLA
+@@ -122,7 +122,7 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLA
  set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
  set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
  
--set(CMAKE_EXE_LINKER_FLAGS "")
-+#set(CMAKE_EXE_LINKER_FLAGS "")
+-set(CMAKE_EXE_LINKER_FLAGS "${LINKER_FLAGS}")
++#set(CMAKE_EXE_LINKER_FLAGS "${LINKER_FLAGS}")
  
  IF (MINGW)
  	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import")
diff --git a/fs2open/patches/patch-code_libs_renderdoc_renderdoc__app.h b/fs2open/patches/patch-code_libs_renderdoc_renderdoc__app.h
deleted file mode 100644
index 17a9306866..0000000000
--- a/fs2open/patches/patch-code_libs_renderdoc_renderdoc__app.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Add support for NetBSD and OpenBSD.
-
---- code/libs/renderdoc/renderdoc_app.h.orig	2019-08-28 23:04:20.000000000 +0000
-+++ code/libs/renderdoc/renderdoc_app.h
-@@ -39,6 +39,12 @@
- #define RENDERDOC_CC
- #elif defined(__APPLE__)
- #define RENDERDOC_CC
-+#elif defined(__FreeBSD__)
-+#define RENDERDOC_CC
-+#elif defined(__NetBSD__)
-+#define RENDERDOC_CC
-+#elif defined(__OpenBSD__)
-+#define RENDERDOC_CC
- #else
- #error "Unknown platform"
- #endif
diff --git a/fs2open/patches/patch-code_network_multi__portfwd.cpp b/fs2open/patches/patch-code_network_multi__portfwd.cpp
deleted file mode 100644
index e09a79adcb..0000000000
--- a/fs2open/patches/patch-code_network_multi__portfwd.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-AI_V4MAPPED is not defined on all platforms, define to 0 if necessary.
-
---- code/network/multi_portfwd.cpp.orig	2019-12-15 06:53:29.495797393 +0000
-+++ code/network/multi_portfwd.cpp
-@@ -187,6 +187,9 @@ static bool PF_get_addr(const char *host
- 
- 	hints.ai_family = AF_UNSPEC;
- 	hints.ai_socktype = SOCK_DGRAM;
-+#ifndef AI_V4MAPPED
-+# define AI_V4MAPPED 0
-+#endif
- 	hints.ai_flags = AI_V4MAPPED;
- 
- 	if (host == nullptr) {
diff --git a/fs2open/patches/patch-code_network_psnet2.cpp b/fs2open/patches/patch-code_network_psnet2.cpp
new file mode 100644
index 0000000000..2c684f56b6
--- /dev/null
+++ b/fs2open/patches/patch-code_network_psnet2.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+AI_V4MAPPED is not defined on all platforms, define to 0 if necessary.
+
+--- code/network/psnet2.cpp.orig	2021-01-27 17:07:03.000000000 +0000
++++ code/network/psnet2.cpp
+@@ -1113,6 +1113,9 @@ bool psnet_get_addr(const char *host, co
+ 
+ 	hints.ai_family = AF_UNSPEC;
+ 	hints.ai_socktype = 0;
++#ifndef AI_V4MAPPED
++#define AI_V4MAPPED 0
++#endif
+ 	hints.ai_flags = AI_V4MAPPED;
+ 
+ 	if (flags & ADDR_FLAG_NUMERIC_SERVICE) {
diff --git a/fs2open/patches/patch-code_osapi_dialogs.cpp b/fs2open/patches/patch-code_osapi_dialogs.cpp
index e004744d6a..9fdbc434e7 100644
--- a/fs2open/patches/patch-code_osapi_dialogs.cpp
+++ b/fs2open/patches/patch-code_osapi_dialogs.cpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Provide fallback error messages to stderr.
 
---- code/osapi/dialogs.cpp.orig	2019-12-16 14:07:42.626176361 +0000
+--- code/osapi/dialogs.cpp.orig	2021-01-27 17:07:03.000000000 +0000
 +++ code/osapi/dialogs.cpp
 @@ -11,6 +11,7 @@
  
@@ -12,7 +12,7 @@ Provide fallback error messages to stderr.
  
  extern "C" {
  #include <lauxlib.h>
-@@ -251,6 +252,9 @@ namespace os
+@@ -248,6 +249,9 @@ namespace os
  			if (SDL_ShowMessageBox(&boxData, &buttonId) < 0)
  			{
  				// Call failed
@@ -22,20 +22,13 @@ Provide fallback error messages to stderr.
  				buttonId = 1; // No action
  			}
  
-@@ -335,6 +339,9 @@ namespace os
+@@ -332,6 +336,12 @@ namespace os
  			if (SDL_ShowMessageBox(&boxData, &buttonId) < 0)
  			{
  				// Call failed
 +				std::cerr << "(SDL_ShowMessageBox failed: " << SDL_GetError() << ")" << std::endl;
 +				std::cerr << boxData.message << std::endl;
 +				std::cerr.flush();
- 				abort();
- 			}
- 
-@@ -403,6 +410,9 @@ namespace os
- 			if (SDL_ShowMessageBox(&boxData, &buttonId) < 0)
- 			{
- 				// Call failed
 +				std::cerr << "(SDL_ShowMessageBox failed: " << SDL_GetError() << ")" << std::endl;
 +				std::cerr << boxData.message << std::endl;
 +				std::cerr.flush();
diff --git a/fs2open/patches/patch-lib_CMakeLists.txt b/fs2open/patches/patch-lib_CMakeLists.txt
new file mode 100644
index 0000000000..5fc2096007
--- /dev/null
+++ b/fs2open/patches/patch-lib_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Don't use prebuilt binaries.
+
+--- lib/CMakeLists.txt.orig	2021-01-27 17:07:03.000000000 +0000
++++ lib/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ 
+-include(prebuilt.cmake)
++#include(prebuilt.cmake)
+ 
+ ADD_SUBDIRECTORY(libjpeg)
+ 
diff --git a/fs2open/patches/patch-lib_antlr4-cpp-runtime_CMakeLists.txt b/fs2open/patches/patch-lib_antlr4-cpp-runtime_CMakeLists.txt
new file mode 100644
index 0000000000..77c88965e3
--- /dev/null
+++ b/fs2open/patches/patch-lib_antlr4-cpp-runtime_CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Why is a license installed to the binary destination? Other licenses
+are not installed, so just take it out.
+
+--- lib/antlr4-cpp-runtime/CMakeLists.txt.orig	2021-01-27 17:07:03.000000000 +0000
++++ lib/antlr4-cpp-runtime/CMakeLists.txt
+@@ -191,9 +191,9 @@ configure_package_config_file(
+ endif(ANTLR4_INSTALL)
+ 
+ # Slight changes from the standard distribution to fit better with how we handle things
+-install(FILES LICENSE.txt
+-        DESTINATION "${BINARY_DESTINATION}"
+-        RENAME "Antlr4_LICENSE.txt")
++#install(FILES LICENSE.txt
++#        DESTINATION "${BINARY_DESTINATION}"
++#        RENAME "Antlr4_LICENSE.txt")
+ 
+ #if(EXISTS LICENSE.txt)
+ #install(FILES LICENSE.txt
diff --git a/fs2open/patches/patch-lib_libpcp_src_net_gateway.c b/fs2open/patches/patch-lib_libpcp_src_net_gateway.c
index 5b8990bf5e..77b4a15965 100644
--- a/fs2open/patches/patch-lib_libpcp_src_net_gateway.c
+++ b/fs2open/patches/patch-lib_libpcp_src_net_gateway.c
@@ -1,15 +1,15 @@
 $NetBSD$
 
-Also support NetbSD and OpenBSD.
+Also support NetBSD and OpenBSD.
 
---- lib/libpcp/src/net/gateway.c.orig	2019-12-15 06:53:29.677263118 +0000
+--- lib/libpcp/src/net/gateway.c.orig	2021-01-27 17:07:03.000000000 +0000
 +++ lib/libpcp/src/net/gateway.c
-@@ -62,7 +62,7 @@
- #include "pcp_win_defines.h"
- #endif
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/sysctl.h>
- #include <net/if_dl.h>          //struct sockaddr_dl
- #define USE_SOCKET_ROUTE
+@@ -50,7 +50,7 @@
+ #define USE_NETLINK
+ #elif defined(WIN32)
+ #define USE_WIN32_CODE
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
++#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define USE_SYSCTL_NET_ROUTE
+ #elif defined(BSD) || defined(__FreeBSD_kernel__)
+ #define USE_SYSCTL_NET_ROUTE
Prev by Date: RigelEngine: update to RigelEngine-0.7.1
Next by Date: auto-admin: auto-change-*: Prune nfs mounts from find search
Previous by Thread: RigelEngine: update to RigelEngine-0.7.1
Next by Thread: auto-admin: auto-change-*: Prune nfs mounts from find search
Indexes:
Home | Main Index | Thread Index | Old Index