diff --git a/games/devilutionX/Makefile b/games/devilutionX/Makefile index 8fa57be36085..1799b98b3db9 100644 --- a/games/devilutionX/Makefile +++ b/games/devilutionX/Makefile @@ -1,101 +1,100 @@ PORTNAME= devilutionX -DISTVERSION= 1.5.2 -PORTREVISION= 1 +DISTVERSION= 1.5.3 CATEGORIES= games MASTER_SITES= https://github.com/diasurgical/devilutionx-assets/releases/download/${DATA_VERSION}/:data DISTFILES= devilutionx.mpq?tag=${DATA_VERSION}:data EXTRACT_ONLY= ${DISTFILES:N*\:data:C/:.*//} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Diablo I engine for modern operating systems WWW= https://github.com/diasurgical/devilutionX LICENSE= CC-BY-NC-SA-4.0 OFL11 SUL LICENSE_COMB= multi LICENSE_NAME_SUL= Sustainable Use License LICENSE_FILE_SUL= ${WRKSRC}/LICENSE.md LICENSE_PERMS_SUL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/include/SimpleIni.h:devel/simpleini LIB_DEPENDS= libfmt.so:devel/libfmt USES= cmake compiler:c++11-lang dos2unix gettext-tools pkgconfig sdl DOS2UNIX_GLOB= *.cpp *.h CMakeLists.txt Dependencies.cmake USE_GITHUB= yes GH_ACCOUNT= diasurgical GH_TUPLE= diasurgical:libsmackerdec:91e732bb6953489077430572f43fc802bf2c75b2:libsmackerdec/_deps/libsmackerdec-src \ diasurgical:libmpq:b78d66c6fee6a501cc9b95d8556a129c68841b05:libmpq/_deps/libmpq-src USE_SDL= sdl2 image2 CMAKE_ARGS= -DCMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \ -DVERSION_NUM="${PORTVERSION}.0" CMAKE_ON= DDEVILUTIONX_SYSTEM_LIBFMT \ FETCHCONTENT_FULLY_DISCONNECTED DATA_VERSION= v4 DATADIR= ${PREFIX}/share/diasurgical/devilutionx OPTIONS_DEFINE= TEST SOUND LTO DEBUG OPTIONS_GROUP= NETWORKING OPTIONS_GROUP_NETWORKING= NETWORK TCP ZEROTIER ENCRYPTION OPTIONS_DEFAULT= LTO NETWORK TCP ENCRYPTION SOUND TEST_CMAKE_BOOL= BUILD_TESTING TEST_BUILD_DEPENDS= googletest>0:devel/googletest NETWORK_DESC= Enable network support NETWORK_CMAKE_BOOL_OFF= NONET TCP_DESC= TCP multiplayer option TCP_CMAKE_BOOL_OFF= DISABLE_TCP TCP_IMPLIES= NETWORK -TCP_GH_TUPLE= diasurgical:asio:cfbe961e2d6e2978d5e081231e4f798df46437c:asio/_deps/asio-src +TCP_GH_TUPLE= diasurgical:asio:4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d:asio/_deps/asio-src ZEROTIER_DESC= ZeroTier multiplayer option (broken) ZEROTIER_BROKEN= does not build: fatal error: 'sys/appleapiopts.h' file not found ZEROTIER_CMAKE_BOOL_OFF=DISABLE_ZERO_TIER ZEROTIER_IMPLIES= NETWORK ZEROTIER_GH_TUPLE= diasurgical:libzt:d6c6a069a5041a3e89594c447ced3f15d77618b8:libzt/_deps/libzt-src \ diasurgical:ZeroTierOne:b1350ac91118d1bd6bb71c0c41be5f4a30196838:ZeroTierOne/_deps/libzt-src/ext/ZeroTierOne \ diasurgical:lwip:1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b:lwip/_deps/libzt-src/ext/lwip \ diasurgical:lwip-contrib:1f9e26e221a41542563834222c4ec8399be1908f:lwipcontrib/_deps/libzt-src/ext/lwip-contrib ENCRYPTION_DESC= Encrypt network packets ENCRYPTION_CMAKE_BOOL= PACKET_ENCRYPTION ENCRYPTION_IMPLIES= NETWORK ENCRYPTION_LIB_DEPENDS= libsodium.so:security/libsodium SOUND_CMAKE_BOOL_OFF= NOSOUND SOUND_LIB_DEPENDS= libSDL_audiolib.so:audio/sdl_audiolib LTO_CMAKE_BOOL_OFF= DISABLE_LTO DEBUG_CMAKE_BOOL= DEBUG post-extract: @${MKDIR} ${BUILD_WRKSRC} @${LN} -s ${WRKSRC}/_deps ${BUILD_WRKSRC}/_deps post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Source/init.cpp do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/devilutionx ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/Packaging/nix/devilutionx.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/Packaging/nix/devilutionx-hellfire.desktop ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/icon.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/devilutionx.png ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/hellfire.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/devilutionx-hellfire.png @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${DISTDIR}/devilutionx.mpq?tag=${DATA_VERSION} ${STAGEDIR}${DATADIR}/devilutionx.mpq do-test-TEST-on: @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/ctest -V .if make(makesum) GH_TUPLE+= ${TCP_GH_TUPLE} \ ${ZEROTIER_GH_TUPLE} \ ${SOUND_GH_TUPLE} .endif .include diff --git a/games/devilutionX/distinfo b/games/devilutionX/distinfo index 420944cad389..25bcddec53ba 100644 --- a/games/devilutionX/distinfo +++ b/games/devilutionX/distinfo @@ -1,19 +1,19 @@ -TIMESTAMP = 1711067017 +TIMESTAMP = 1726845241 SHA256 (devilutionx.mpq?tag=v4) = c563903af73f7037be0a7d3752e3422f2074b75cddce6bca951a138f3597197e SIZE (devilutionx.mpq?tag=v4) = 5293561 -SHA256 (diasurgical-devilutionX-1.5.2_GH0.tar.gz) = c046fd23778729ce77e7f6fd1c66ba7c3e1b32a1472821c3485f0d8bd4f3b4aa -SIZE (diasurgical-devilutionX-1.5.2_GH0.tar.gz) = 9448866 +SHA256 (diasurgical-devilutionX-1.5.3_GH0.tar.gz) = 3d1ad32bde3ed6a11e19770bea92084a3e739dd11885fdbb91b3325e11b388d3 +SIZE (diasurgical-devilutionX-1.5.3_GH0.tar.gz) = 9684744 SHA256 (diasurgical-libsmackerdec-91e732bb6953489077430572f43fc802bf2c75b2_GH0.tar.gz) = e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87 SIZE (diasurgical-libsmackerdec-91e732bb6953489077430572f43fc802bf2c75b2_GH0.tar.gz) = 18576 SHA256 (diasurgical-libmpq-b78d66c6fee6a501cc9b95d8556a129c68841b05_GH0.tar.gz) = 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea SIZE (diasurgical-libmpq-b78d66c6fee6a501cc9b95d8556a129c68841b05_GH0.tar.gz) = 70149 -SHA256 (diasurgical-asio-cfbe961e2d6e2978d5e081231e4f798df46437c_GH0.tar.gz) = 85a36a7cbed568c0a1ea01709405dddec502252c47b54aadc600c584b5d0249d -SIZE (diasurgical-asio-cfbe961e2d6e2978d5e081231e4f798df46437c_GH0.tar.gz) = 1615001 +SHA256 (diasurgical-asio-4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d_GH0.tar.gz) = 005072e4e16c033c59b222380e2ac81e1f958c591d6a512137d386aa10b40af7 +SIZE (diasurgical-asio-4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d_GH0.tar.gz) = 2970545 SHA256 (diasurgical-libzt-d6c6a069a5041a3e89594c447ced3f15d77618b8_GH0.tar.gz) = 2e0388061f57dbae12f36497f5e3f20a07a0bff1140159a9d14efaf2a3d23dc1 SIZE (diasurgical-libzt-d6c6a069a5041a3e89594c447ced3f15d77618b8_GH0.tar.gz) = 386305 SHA256 (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 39c1b7e28f9d4d92edaaa831007715358465a068019fe84a56b5366b386a1363 SIZE (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 13122622 SHA256 (diasurgical-lwip-1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b_GH0.tar.gz) = 1477b5a427672480d0035b5af3e2cfae01c691afa9cace4500b43fcd262fa0bf SIZE (diasurgical-lwip-1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b_GH0.tar.gz) = 1136882 SHA256 (diasurgical-lwip-contrib-1f9e26e221a41542563834222c4ec8399be1908f_GH0.tar.gz) = 0fd240b20ec56da41f5072161b8d1f1ad4367f994e183579bb5de9576394dcda SIZE (diasurgical-lwip-contrib-1f9e26e221a41542563834222c4ec8399be1908f_GH0.tar.gz) = 395250 diff --git a/games/devilutionX/files/patch-test_animationinfo__test.cpp b/games/devilutionX/files/patch-test_animationinfo__test.cpp new file mode 100644 index 000000000000..472bf8a6a02a --- /dev/null +++ b/games/devilutionX/files/patch-test_animationinfo__test.cpp @@ -0,0 +1,11 @@ +--- test/animationinfo_test.cpp.orig 2024-08-30 02:34:25 UTC ++++ test/animationinfo_test.cpp +@@ -3,6 +3,8 @@ + #include "engine/animationinfo.h" + #include "nthread.h" + ++#include ++ + using namespace devilution; + + enum class TestDataType {