diff --git a/games/xray-16/Makefile b/games/xray-16/Makefile index c73fc7006a03..01cb31145002 100644 --- a/games/xray-16/Makefile +++ b/games/xray-16/Makefile @@ -1,44 +1,48 @@ PORTNAME= xray-16 -DISTVERSION= 2921-january-2025-rc1.20250720 +DISTVERSION= 2921-january-2025-rc1.20250821 CATEGORIES= games MAINTAINER= freebsd@sysctl.cz COMMENT= Improved version of the X-Ray Engine (used for run S.T.A.L.K.E.R.) WWW= https://github.com/OpenXRay/xray-16/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt LIB_DEPENDS= libogg.so:audio/libogg \ libtheora.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis \ libvorbisfile.so:audio/libvorbis \ libmimalloc.so:devel/mimalloc \ - liblzo2.so:archivers/lzo2 + liblzo2.so:archivers/lzo2 \ + libimgui.so:x11-toolkits/imgui -USES= cmake jpeg openal sdl +USES= cmake jpeg localbase:ldflags openal sdl USE_GITHUB= yes GH_ACCOUNT= OpenXRay -GH_TAGNAME= 55a888c252cd815a0ea07439fc97cd954f2e34f0 +GH_TAGNAME= b63f68d5ccde2210dc7f7f2b4396a0170eb37962 GH_TUPLE= GPUOpen-LibrariesAndSDKs:AGS_SDK:5d8812d:AGSSDK/Externals/AGS_SDK \ OpenXRay:BugTrap:c619077b40ee6e7ad6ffc5a194a5d3583af8f78e:BugTrap/Externals/BugTrap \ OpenXRay:GameSpy:61d061b4b3f860865f97e659e496e11704f61eb3:GameSpy/Externals/GameSpy \ OpenXRay:LuaJIT:5a5cd82:LuaJIT/Externals/LuaJIT \ g-truc:gli:779b99ac6656e4d30c3b24e96e0136a59649a869:gli/Externals/gli \ OpenXRay:luabind-deboostified:dd3db67:luabind/Externals/luabind \ - ocornut:imgui:efe2b21:ocornut/Externals/imgui \ - DLTcollab:sse2neon:6abd463:sse2neon/Externals/sse2neon \ + DLTcollab:sse2neon:8721e9799e0d01b80ba8e8e34636cb49997560c2:sse2neon/Externals/sse2neon \ pattonkan:sse2rvv:f3a1d7d:sse2rvv/Externals/sse2rvv \ OpenXRay:xrLuaFix:67b77c92f49c766c7c180cc39ffdb12799f395d:xrLuaFix/Externals/xrLuaFix \ OpenXRay:luafilesystem:314c0d0fe8f4676ef35ac8abf3731be8535812fb:luafilesystem/Externals/xrLuaFix/lfs \ OpenXRay:lua-marshal:983a3bfd646486292daa9f2ec9b72409f86dc931:marsal/Externals/xrLuaFix/lua-marshal \ OpenXRay:lua-pack:c1e5a149b571cc31069e7e3146e881c203bdd052:pack/Externals/xrLuaFix/lua-pack - USE_SDL= sdl2 CMAKE_ON= XRAY_USE_LUAJIT post-patch: ${REINPLACE_CMD} -e 's|^ COMMAND make clean$$| COMMAND /bin/echo make clean|' \ ${WRKSRC}/Externals/LuaJIT-proj/CMakeLists.txt + ${REINPLACE_CMD} -e 's|xrImGui|imgui|' \ + ${WRKSRC}/src/Layers/xrRenderPC_GL/CMakeLists.txt \ + ${WRKSRC}/src/xrEngine/CMakeLists.txt \ + ${WRKSRC}/src/xrGame/CMakeLists.txt \ + ${WRKSRC}/src/xrUICore/CMakeLists.txt .include diff --git a/games/xray-16/distinfo b/games/xray-16/distinfo index 8bda1f431f44..19b96c134bb6 100644 --- a/games/xray-16/distinfo +++ b/games/xray-16/distinfo @@ -1,29 +1,27 @@ -TIMESTAMP = 1753217201 -SHA256 (OpenXRay-xray-16-2921-january-2025-rc1.20250720-55a888c252cd815a0ea07439fc97cd954f2e34f0_GH0.tar.gz) = 9c0eeeee784a3bb5286a2d8c174cbed2ffd90d21e0ae6a270d6253b246d66727 -SIZE (OpenXRay-xray-16-2921-january-2025-rc1.20250720-55a888c252cd815a0ea07439fc97cd954f2e34f0_GH0.tar.gz) = 93817918 +TIMESTAMP = 1756000000 +SHA256 (OpenXRay-xray-16-2921-january-2025-rc1.20250821-b63f68d5ccde2210dc7f7f2b4396a0170eb37962_GH0.tar.gz) = 8463796e827d4f57faf942d0f4976dcf2e971c10dcdee61c54cf835732fc3514 +SIZE (OpenXRay-xray-16-2921-january-2025-rc1.20250821-b63f68d5ccde2210dc7f7f2b4396a0170eb37962_GH0.tar.gz) = 93820860 SHA256 (GPUOpen-LibrariesAndSDKs-AGS_SDK-5d8812d_GH0.tar.gz) = b4710d440ebb078b8fcac1b59dbcae97340d5cce4b5ddc424dcec040f392760e SIZE (GPUOpen-LibrariesAndSDKs-AGS_SDK-5d8812d_GH0.tar.gz) = 22151301 SHA256 (OpenXRay-BugTrap-c619077b40ee6e7ad6ffc5a194a5d3583af8f78e_GH0.tar.gz) = 37896bfb2d8cd0941a67b70c5c824f525bea9a649da28f5bd27a5b4112c0e4a2 SIZE (OpenXRay-BugTrap-c619077b40ee6e7ad6ffc5a194a5d3583af8f78e_GH0.tar.gz) = 4408633 SHA256 (OpenXRay-GameSpy-61d061b4b3f860865f97e659e496e11704f61eb3_GH0.tar.gz) = 3b1b2c95d0d54ceceeaa2f376a77e5d045ccb4575aadc604a9d3344730843669 SIZE (OpenXRay-GameSpy-61d061b4b3f860865f97e659e496e11704f61eb3_GH0.tar.gz) = 4082257 SHA256 (OpenXRay-LuaJIT-5a5cd82_GH0.tar.gz) = a54098492c11bd8228e58e58f520fbc131af899354033803b79e27869baf7686 SIZE (OpenXRay-LuaJIT-5a5cd82_GH0.tar.gz) = 1125324 SHA256 (g-truc-gli-779b99ac6656e4d30c3b24e96e0136a59649a869_GH0.tar.gz) = 2f4f67ac4d1673216f03ff37e406bb403689b39a2df3d2efad501448705bbb3f SIZE (g-truc-gli-779b99ac6656e4d30c3b24e96e0136a59649a869_GH0.tar.gz) = 11417080 SHA256 (OpenXRay-luabind-deboostified-dd3db67_GH0.tar.gz) = 367c4edbbc5547d67ff5249616367587596b3ed611d249de87938f865c30018b SIZE (OpenXRay-luabind-deboostified-dd3db67_GH0.tar.gz) = 163442 -SHA256 (ocornut-imgui-efe2b21_GH0.tar.gz) = e108dcae6f5e6004038498c5982c1e3285706240c89f79c77d9c581759ec8db8 -SIZE (ocornut-imgui-efe2b21_GH0.tar.gz) = 2078132 -SHA256 (DLTcollab-sse2neon-6abd463_GH0.tar.gz) = 59f755e8eb8835f51b19ffb34e392dd2c652ab12e0a35961712b0cd43ac12240 -SIZE (DLTcollab-sse2neon-6abd463_GH0.tar.gz) = 137746 +SHA256 (DLTcollab-sse2neon-8721e9799e0d01b80ba8e8e34636cb49997560c2_GH0.tar.gz) = 501636269118ac1d8e32ebdf43f755fe08e008e10abdcd946227e5f2a401f14c +SIZE (DLTcollab-sse2neon-8721e9799e0d01b80ba8e8e34636cb49997560c2_GH0.tar.gz) = 137482 SHA256 (pattonkan-sse2rvv-f3a1d7d_GH0.tar.gz) = 2fcbe73d333827f5e4837121bc81b23d20295224d4b01abfe516c7dc21f389f3 SIZE (pattonkan-sse2rvv-f3a1d7d_GH0.tar.gz) = 64389 SHA256 (OpenXRay-xrLuaFix-67b77c92f49c766c7c180cc39ffdb12799f395d_GH0.tar.gz) = 2d630d8927aeee7cf8c31d6191d266036662009da281c75fdda7b72ff0fab7fc SIZE (OpenXRay-xrLuaFix-67b77c92f49c766c7c180cc39ffdb12799f395d_GH0.tar.gz) = 4938 SHA256 (OpenXRay-luafilesystem-314c0d0fe8f4676ef35ac8abf3731be8535812fb_GH0.tar.gz) = 3e511cf20edceb6c3e9798dc9898f4d35f0c3685caff5c63f28bfc725df59e4b SIZE (OpenXRay-luafilesystem-314c0d0fe8f4676ef35ac8abf3731be8535812fb_GH0.tar.gz) = 28959 SHA256 (OpenXRay-lua-marshal-983a3bfd646486292daa9f2ec9b72409f86dc931_GH0.tar.gz) = 1f0d88c0e13a1f7d1888afc482ef1928183dbb093a41c373be038f13e824cc16 SIZE (OpenXRay-lua-marshal-983a3bfd646486292daa9f2ec9b72409f86dc931_GH0.tar.gz) = 5873 SHA256 (OpenXRay-lua-pack-c1e5a149b571cc31069e7e3146e881c203bdd052_GH0.tar.gz) = 19f804401233549f337cd47cce0cab1348a9d4635d35eae03a4021e19749557e SIZE (OpenXRay-lua-pack-c1e5a149b571cc31069e7e3146e881c203bdd052_GH0.tar.gz) = 4723 diff --git a/games/xray-16/files/patch-Externals_CMakeLists.txt b/games/xray-16/files/patch-Externals_CMakeLists.txt new file mode 100644 index 000000000000..186033eb26b6 --- /dev/null +++ b/games/xray-16/files/patch-Externals_CMakeLists.txt @@ -0,0 +1,11 @@ +--- Externals/CMakeLists.txt.orig 2025-07-20 11:05:19 UTC ++++ Externals/CMakeLists.txt +@@ -13,7 +13,7 @@ add_subdirectory(OPCODE) + add_subdirectory(luabind) + add_subdirectory(GameSpy) + add_subdirectory(OPCODE) +-add_subdirectory(imgui-proj) ++#add_subdirectory(imgui-proj) + + if (NOT TARGET xrLuabind) + message(FATAL_ERROR diff --git a/games/xray-16/files/patch-src_Layers_xrRender_dxImGuiRender.cpp b/games/xray-16/files/patch-src_Layers_xrRender_dxImGuiRender.cpp new file mode 100644 index 000000000000..96fc68a09749 --- /dev/null +++ b/games/xray-16/files/patch-src_Layers_xrRender_dxImGuiRender.cpp @@ -0,0 +1,11 @@ +--- src/Layers/xrRender/dxImGuiRender.cpp.orig 2025-07-20 11:05:19 UTC ++++ src/Layers/xrRender/dxImGuiRender.cpp +@@ -5,7 +5,7 @@ + #if defined(USE_DX11) + #include + #elif defined(USE_OGL) +-#include ++#include + #endif + + namespace xray::render::RENDER_NAMESPACE