From fb67688700a58fea1018d081e482896346c9a792 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Mon, 4 Dec 2023 20:27:20 -0800 Subject: [PATCH] =?UTF-8?q?graphics/bgfx:=20update=201.121.8558-454=20?= =?UTF-8?q?=E2=86=92=201.124.8632-460?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by: portscout --- graphics/bgfx/Makefile | 10 ++++++---- graphics/bgfx/distinfo | 18 +++++++++--------- ...h-bgfx_examples_common_entry_entry__x11.cpp | 11 +++++++++++ .../patch-bimg_3rdparty_nvtt_nvcore_debug.h | 4 ++-- .../bgfx/files/patch-bx_include_bx_platform.h | 4 ++-- graphics/bgfx/files/patch-bx_src_mutex.cpp | 11 +++++++++++ graphics/bgfx/files/patch-bx_src_os.cpp | 13 +++++++++++++ graphics/bgfx/files/patch-bx_src_thread.cpp | 11 +++++++++++ 8 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 graphics/bgfx/files/patch-bgfx_examples_common_entry_entry__x11.cpp create mode 100644 graphics/bgfx/files/patch-bx_src_mutex.cpp create mode 100644 graphics/bgfx/files/patch-bx_src_os.cpp create mode 100644 graphics/bgfx/files/patch-bx_src_thread.cpp diff --git a/graphics/bgfx/Makefile b/graphics/bgfx/Makefile index b4bfa5910bf1e..5fa76e8302455 100644 --- a/graphics/bgfx/Makefile +++ b/graphics/bgfx/Makefile @@ -1,6 +1,6 @@ PORTNAME= bgfx DISTVERSIONPREFIX= v -DISTVERSION= 1.121.8558-454 +DISTVERSION= 1.124.8632-460 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -17,15 +17,17 @@ USE_XORG= ice x11 xext sm USE_GITHUB= yes GH_ACCOUNT= bkaradzic GH_PROJECT= bgfx.cmake -GH_TUPLE= bkaradzic:bgfx:8b6a6bd:bgfx/bgfx \ - bkaradzic:bimg:ec02df8:bimg/bimg \ - bkaradzic:bx:198cd12:bx/bx +GH_TUPLE= bkaradzic:bgfx:5de37d0:bgfx/bgfx \ + bkaradzic:bimg:6c4d188:bimg/bimg \ + bkaradzic:bx:be3e348:bx/bx CMAKE_OFF= BGFX_BUILD_EXAMPLES BGFX_INSTALL_EXAMPLES \ BGFX_CUSTOM_TARGETS CMAKE_ARGS= -DBGFX_LIBRARY_TYPE=SHARED CMAKE_TESTING_ON= BGFX_BUILD_TESTS # 1 test fails, see https://github.com/bkaradzic/bgfx/issues/3123 +CXXFLAGS+= -Dftello64=ftello -Dfseeko64=fseeko + post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/licences diff --git a/graphics/bgfx/distinfo b/graphics/bgfx/distinfo index ad5fac00ec1e0..3542df376e191 100644 --- a/graphics/bgfx/distinfo +++ b/graphics/bgfx/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1690955330 -SHA256 (bkaradzic-bgfx.cmake-v1.121.8558-454_GH0.tar.gz) = e8cd069998303e5d30d3c24d42c66d3a1248bbb4407299f1e3db073583d1b8f1 -SIZE (bkaradzic-bgfx.cmake-v1.121.8558-454_GH0.tar.gz) = 32759 -SHA256 (bkaradzic-bgfx-8b6a6bd_GH0.tar.gz) = ff6b15fd99d2c8f1adaf5df409a5fba9fb7eccc86f29f80182f7679badbd32d8 -SIZE (bkaradzic-bgfx-8b6a6bd_GH0.tar.gz) = 103033373 -SHA256 (bkaradzic-bimg-ec02df8_GH0.tar.gz) = 0828e01e22129caf877afeed060308a58c39a49d7d242e2f921fc10910e97315 -SIZE (bkaradzic-bimg-ec02df8_GH0.tar.gz) = 760301 -SHA256 (bkaradzic-bx-198cd12_GH0.tar.gz) = d98149f907e61dbbad6710c75a268a26a36fc911b06966eae11def09772d590b -SIZE (bkaradzic-bx-198cd12_GH0.tar.gz) = 1591739 +TIMESTAMP = 1701722705 +SHA256 (bkaradzic-bgfx.cmake-v1.124.8632-460_GH0.tar.gz) = 6cafca3937fc8403cfdb4ac1500903123f5f41a6be59f345d448b092f41e2907 +SIZE (bkaradzic-bgfx.cmake-v1.124.8632-460_GH0.tar.gz) = 32656 +SHA256 (bkaradzic-bgfx-5de37d0_GH0.tar.gz) = 5f0733c0900905d5b2c392cd43eb5cd73a62f5bbb8885a469363e9c4e734243d +SIZE (bkaradzic-bgfx-5de37d0_GH0.tar.gz) = 93498568 +SHA256 (bkaradzic-bimg-6c4d188_GH0.tar.gz) = 309f6f835e7dbf11464e7dca9cc3afa36a2b722c738b8bf8eace7d70a32c1a84 +SIZE (bkaradzic-bimg-6c4d188_GH0.tar.gz) = 744797 +SHA256 (bkaradzic-bx-be3e348_GH0.tar.gz) = 0c41d97731561f99579edbfad9d03b693961e69a05123dfe1ac5c85e82fb0047 +SIZE (bkaradzic-bx-be3e348_GH0.tar.gz) = 1596168 diff --git a/graphics/bgfx/files/patch-bgfx_examples_common_entry_entry__x11.cpp b/graphics/bgfx/files/patch-bgfx_examples_common_entry_entry__x11.cpp new file mode 100644 index 0000000000000..c9ae65a1f308f --- /dev/null +++ b/graphics/bgfx/files/patch-bgfx_examples_common_entry_entry__x11.cpp @@ -0,0 +1,11 @@ +--- bgfx/examples/common/entry/entry_x11.cpp.orig 2023-11-28 06:38:45 UTC ++++ bgfx/examples/common/entry/entry_x11.cpp +@@ -5,7 +5,7 @@ + + #include "entry_p.h" + +-#if ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_LINUX || BX_PLATFORM_RPI) ++#if ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_LINUX || BX_PLATFORM_BSD || BX_PLATFORM_RPI) + + #define XK_MISCELLANY + #define XK_LATIN1 diff --git a/graphics/bgfx/files/patch-bimg_3rdparty_nvtt_nvcore_debug.h b/graphics/bgfx/files/patch-bimg_3rdparty_nvtt_nvcore_debug.h index b017509dac6f4..3ba09ac1ca941 100644 --- a/graphics/bgfx/files/patch-bimg_3rdparty_nvtt_nvcore_debug.h +++ b/graphics/bgfx/files/patch-bimg_3rdparty_nvtt_nvcore_debug.h @@ -1,6 +1,6 @@ ---- bimg/3rdparty/nvtt/nvcore/debug.h.orig 2023-02-07 16:06:32 UTC +--- bimg/3rdparty/nvtt/nvcore/debug.h.orig 2023-11-23 17:42:13 UTC +++ bimg/3rdparty/nvtt/nvcore/debug.h -@@ -165,7 +165,7 @@ namespace nv +@@ -166,7 +166,7 @@ NVCORE_API void NV_CDECL nvDebugPrint( const char *msg namespace nv { inline bool isValidPtr(const void * ptr) { diff --git a/graphics/bgfx/files/patch-bx_include_bx_platform.h b/graphics/bgfx/files/patch-bx_include_bx_platform.h index d94ffa1425ba9..3247c48c1ea78 100644 --- a/graphics/bgfx/files/patch-bx_include_bx_platform.h +++ b/graphics/bgfx/files/patch-bx_include_bx_platform.h @@ -1,6 +1,6 @@ ---- bx/include/bx/platform.h.orig 2023-08-02 05:50:26 UTC +--- bx/include/bx/platform.h.orig 2023-11-23 18:12:05 UTC +++ bx/include/bx/platform.h -@@ -464,7 +464,7 @@ +@@ -472,7 +472,7 @@ static_assert(false, "\n\n" #if BX_PLATFORM_BSD \ || BX_PLATFORM_HAIKU \ || BX_PLATFORM_HURD diff --git a/graphics/bgfx/files/patch-bx_src_mutex.cpp b/graphics/bgfx/files/patch-bx_src_mutex.cpp new file mode 100644 index 0000000000000..801ccef2b5727 --- /dev/null +++ b/graphics/bgfx/files/patch-bx_src_mutex.cpp @@ -0,0 +1,11 @@ +--- bx/src/mutex.cpp.orig 2023-12-04 22:18:54 UTC ++++ bx/src/mutex.cpp +@@ -5,6 +5,8 @@ + + #include + ++#include ++ + #if BX_CONFIG_SUPPORTS_THREADING + + #if BX_CRT_NONE diff --git a/graphics/bgfx/files/patch-bx_src_os.cpp b/graphics/bgfx/files/patch-bx_src_os.cpp new file mode 100644 index 0000000000000..abf73bb4c52ef --- /dev/null +++ b/graphics/bgfx/files/patch-bx_src_os.cpp @@ -0,0 +1,13 @@ +--- bx/src/os.cpp.orig 2023-12-04 22:32:30 UTC ++++ bx/src/os.cpp +@@ -7,6 +7,10 @@ + #include + #include + ++#include ++#include ++#include ++ + #if BX_CRT_MSVC + # include + #else diff --git a/graphics/bgfx/files/patch-bx_src_thread.cpp b/graphics/bgfx/files/patch-bx_src_thread.cpp new file mode 100644 index 0000000000000..1688d80e355fc --- /dev/null +++ b/graphics/bgfx/files/patch-bx_src_thread.cpp @@ -0,0 +1,11 @@ +--- bx/src/thread.cpp.orig 2023-12-04 22:36:27 UTC ++++ bx/src/thread.cpp +@@ -6,6 +6,8 @@ + #include + #include + ++#include ++ + #if BX_CONFIG_SUPPORTS_THREADING + + #if BX_PLATFORM_WINDOWS && !BX_CRT_NONE