From nobody Sat Oct 14 16:10:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S77dJ5h42z4wxBl; Sat, 14 Oct 2023 16:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S77dJ4ql0z4Jl1; Sat, 14 Oct 2023 16:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697299828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWdX4mKLjvstHxhIH8Yp8P37XGjJYyaLbdLaMSOuAl0=; b=QNdhDfPZg1TdBuwMcqqlkMxS4BRTwYW9Go0ffdf0pUnRgUSH3OVmlEOBYm3WPDrpFvXToK O9+PRLkjf5QCwzau1UpQkVk1UkPEB/eI5FCS2pILrhZjnZvwhLDwfLb2CaKFmTAuFgX7ip shaxn37X1pHrWjucz/o5cZT1B10fgipE5GboF02smN7sqcVmQ05JTkgqPs/zOfhMLkQ4s5 s9yGpHA2u9YMHECsr31YkxrQVQGVpHlMl2V/JovfLVjJ13M4L0FpUxUCSeHyITPFOzk7KG QFXeL1jHYdIkp837i9FdBShL6qfI/yZoMeTa1caypQroGp75aBmbBX04ICoIHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697299828; a=rsa-sha256; cv=none; b=kjOF9FkjhyELML9d5LgTeO4ylZs5LhU3udvajGZBh0lL+cXVHcyRWGaByBFZvqm9b5OpBT 7zPrv92F4aRMlIQQaYw/KLEnuKuLiWewg/CgbEOQ2mVDQryLO4jo0oBasO99seVwEuAxIb R3PPvda/MAXW0tLKazVaEWXEi4Z7LlJ1QoLwUg0B33AW0urdrBdGorZ48DcvV7iBDHQ1ZT Lt6Wg/Qi4mAH1XB27Frw4Kx/+46pyHQYJZXQu+YJSj3JJ44CBJZnBF+IxKz9kqz/3XPjd/ CME0N+SApkCVMokxzKBzj0mH/yYP2Php7K5V3eH7YMrgvrUl2cfMQ++xhbaSOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697299828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWdX4mKLjvstHxhIH8Yp8P37XGjJYyaLbdLaMSOuAl0=; b=IFC25ODQWZKCBh4ZLEQFLWkoNzt3UBBMk+0j9AUdy1YWGkPNNes0Qtu+cRcoPsdCMwXcM+ lyyKcKMBcFYtNZ2Yj4L97j0yj4Y6Ftc3Vlh9YqTmxy/Jv558+bF2SA9cCWgFEQiBqwtHG0 c6CpxVHHzvZxkQtXGjVh/QCZHz87olOdmem8whTntTnJKpBqKjx32rv1JobXwO8Fgvs0Wg buW8NFSICdpjLi5kfsj7PX/+heytitAGZrBHv+MeJrxQtOJUF5VqCBfSvSCxxI9VTN4r80 TdSWucIvhP9X/uM2eZM1KKfK7M3Fr1EuTRYcfCFY9d0tiLkTBbd6MjmhjmN4wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S77dJ3tPtzcMM; Sat, 14 Oct 2023 16:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39EGASMT055933; Sat, 14 Oct 2023 16:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39EGAS1D055930; Sat, 14 Oct 2023 16:10:28 GMT (envelope-from git) Date: Sat, 14 Oct 2023 16:10:28 GMT Message-Id: <202310141610.39EGAS1D055930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3e761d0315b9 - main - games/fs2open: update to 23.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e761d0315b9f1bb82545357d79fb25ff0678468 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e761d0315b9f1bb82545357d79fb25ff0678468 commit 3e761d0315b9f1bb82545357d79fb25ff0678468 Author: Piotr Kubaj AuthorDate: 2023-10-14 14:39:19 +0000 Commit: Piotr Kubaj CommitDate: 2023-10-14 16:10:26 +0000 games/fs2open: update to 23.2.0 --- games/fs2open/Makefile | 3 +- games/fs2open/distinfo | 6 +-- .../patch-code_libs_renderdoc_renderdoc__app.h | 11 ----- games/fs2open/files/patch-code_network_gtrack.cpp | 12 ------ games/fs2open/files/patch-code_network_ptrack.cpp | 12 ------ games/fs2open/files/patch-code_network_valid.cpp | 12 ------ .../files/patch-lib_vulkan-hpp_vulkan_vulkan.hpp | 47 ---------------------- 7 files changed, 4 insertions(+), 99 deletions(-) diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index 336f8ed244c6..7e380875731c 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -1,7 +1,6 @@ PORTNAME= fs2open DISTVERSIONPREFIX= release_ -DISTVERSION= 23_0_0 -PORTREVISION= 3 +DISTVERSION= 23_2_0 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org diff --git a/games/fs2open/distinfo b/games/fs2open/distinfo index c85f6c2de61f..2885d10838b2 100644 --- a/games/fs2open/distinfo +++ b/games/fs2open/distinfo @@ -1,6 +1,6 @@ -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 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;