mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-03 01:23:49 +00:00
games/devilutionX: update 1.4.0 → 1.4.1
This commit is contained in:
parent
c29ec8917b
commit
853aecae3a
@ -1,5 +1,5 @@
|
||||
PORTNAME= devilutionX
|
||||
DISTVERSION= 1.4.0
|
||||
DISTVERSION= 1.4.1
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= https://github.com/diasurgical/devilutionx-assets/releases/download/${DATA_VERSION}/:data
|
||||
DISTFILES= devilutionx.mpq?tag=${DATA_VERSION}:data
|
||||
@ -13,14 +13,13 @@ LICENSE_COMB= multi
|
||||
LICENSE_FILE_UNLICENSE= ${WRKSRC}/LICENSE
|
||||
|
||||
LIB_DEPENDS= libfmt.so:devel/libfmt
|
||||
BUILD_DEPENDS= ${LOCALBASE}/include/SimpleIni.h:devel/simpleini
|
||||
|
||||
USES= cmake compiler:c++11-lang dos2unix gettext-tools pkgconfig sdl
|
||||
DOS2UNIX_GLOB= *.cpp *.h CMakeLists.txt
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= diasurgical
|
||||
GH_TAGNAME= 3779a811f176173a4e6450449355449cc3b5d484
|
||||
GH_TUPLE= diasurgical:libsmackerdec:2997ee0e41e91bb723003bc09234be553b190e38:libsmackerdec/_deps/libsmackerdec-src \
|
||||
brofield:simpleini:9b3ed7ec815997bc8c5b9edf140d6bde653e1458:simpleini/_deps/simpleini-src \
|
||||
diasurgical:libmpq:0f10bd1600f406b13932bf5351ba713361262184:libmpq/_deps/libmpq-src
|
||||
USE_SDL= sdl2 image2
|
||||
|
||||
@ -51,7 +50,7 @@ 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:a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02:libzt/_deps/libzt-src \
|
||||
ZEROTIER_GH_TUPLE= diasurgical:libzt:37a2efb0b925df632299ef07dc78c0af5f6b4756: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
|
||||
@ -62,7 +61,7 @@ ENCRYPTION_IMPLIES= NETWORK
|
||||
ENCRYPTION_LIB_DEPENDS= libsodium.so:security/libsodium
|
||||
|
||||
SOUND_CMAKE_BOOL_OFF= NOSOUND
|
||||
SOUND_GH_TUPLE= realnc:SDL_audiolib:1a69135313c79817b38a3a99826d4ac28d627fdf:SDL_audiolib/_deps/sdl_audiolib-src
|
||||
SOUND_LIB_DEPENDS= libSDL_audiolib.so:audio/sdl_audiolib
|
||||
|
||||
LTO_CMAKE_BOOL_OFF= DISABLE_LTO
|
||||
|
||||
|
@ -1,23 +1,19 @@
|
||||
TIMESTAMP = 1652828881
|
||||
TIMESTAMP = 1659554836
|
||||
SHA256 (devilutionx.mpq?tag=v2) = 90467c15f5e0ac902b2b8ac916f63a1fe2dd4b554ca36ab218bcd27f5121e988
|
||||
SIZE (devilutionx.mpq?tag=v2) = 4959860
|
||||
SHA256 (diasurgical-devilutionX-1.4.0-3779a811f176173a4e6450449355449cc3b5d484_GH0.tar.gz) = 8b999631223230e2c1a176990d89c1adb826e5c07735fe048b1a16aea7d622ea
|
||||
SIZE (diasurgical-devilutionX-1.4.0-3779a811f176173a4e6450449355449cc3b5d484_GH0.tar.gz) = 7564593
|
||||
SHA256 (diasurgical-devilutionX-1.4.1_GH0.tar.gz) = 54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
|
||||
SIZE (diasurgical-devilutionX-1.4.1_GH0.tar.gz) = 7578111
|
||||
SHA256 (diasurgical-libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38_GH0.tar.gz) = 40c0dc21943de22e153d56a7992c621a42a0c56c7cd833f8b84f90e48da753ea
|
||||
SIZE (diasurgical-libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38_GH0.tar.gz) = 18556
|
||||
SHA256 (brofield-simpleini-9b3ed7ec815997bc8c5b9edf140d6bde653e1458_GH0.tar.gz) = f7792eca9f3f7b0ee8916ffa4e124cb4b319b11d5849e15c5eef58eb910b0451
|
||||
SIZE (brofield-simpleini-9b3ed7ec815997bc8c5b9edf140d6bde653e1458_GH0.tar.gz) = 62870
|
||||
SHA256 (diasurgical-libmpq-0f10bd1600f406b13932bf5351ba713361262184_GH0.tar.gz) = ee173f5edb20f162482658cbc9d4bb84b640f651041d686c0ad7b2af12baf2a1
|
||||
SIZE (diasurgical-libmpq-0f10bd1600f406b13932bf5351ba713361262184_GH0.tar.gz) = 69570
|
||||
SHA256 (diasurgical-asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644_GH0.tar.gz) = 88bb72f7bbdde7dbd050789bd73ff2abb2e9eacd8f9c889202b502f222230b6e
|
||||
SIZE (diasurgical-asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644_GH0.tar.gz) = 1614738
|
||||
SHA256 (diasurgical-libzt-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02_GH0.tar.gz) = 40fd669e429b477bf2463e94c730b1db26752aafe06e4337dd76a112933ae1bf
|
||||
SIZE (diasurgical-libzt-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02_GH0.tar.gz) = 390951
|
||||
SHA256 (diasurgical-libzt-37a2efb0b925df632299ef07dc78c0af5f6b4756_GH0.tar.gz) = 7fdbc4a73e3e1d0b98521c0b6520f89852a0896158a815070052e37a2a08b585
|
||||
SIZE (diasurgical-libzt-37a2efb0b925df632299ef07dc78c0af5f6b4756_GH0.tar.gz) = 390934
|
||||
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
|
||||
SHA256 (realnc-SDL_audiolib-1a69135313c79817b38a3a99826d4ac28d627fdf_GH0.tar.gz) = 8e013245bf8e676d4e2c61661d7cee6cb9de74f97a475c9e6b35a25d5e7a7715
|
||||
SIZE (realnc-SDL_audiolib-1a69135313c79817b38a3a99826d4ac28d627fdf_GH0.tar.gz) = 304183
|
||||
|
@ -1,14 +0,0 @@
|
||||
https://github.com/diasurgical/devilutionX/pull/4588
|
||||
|
||||
--- Source/engine/random.cpp.orig 2022-04-25 02:21:41 UTC
|
||||
+++ Source/engine/random.cpp
|
||||
@@ -29,7 +29,8 @@ uint32_t GetLCGEngineState()
|
||||
|
||||
int32_t GetRndSeed()
|
||||
{
|
||||
- return abs(static_cast<int32_t>(sglGameSeed));
|
||||
+ const int32_t seed = static_cast<int32_t>(sglGameSeed);
|
||||
+ return seed == -2147483648 ? -2147483648 : abs(seed);
|
||||
}
|
||||
|
||||
int32_t AdvanceRndSeed()
|
@ -1,11 +0,0 @@
|
||||
--- Source/init.cpp.orig 2022-04-25 02:21:41 UTC
|
||||
+++ Source/init.cpp
|
||||
@@ -90,7 +90,7 @@ std::vector<std::string> GetMPQSearchPaths()
|
||||
if (paths[0] == paths[1])
|
||||
paths.pop_back();
|
||||
|
||||
-#if defined(__linux__) && !defined(__ANDROID__)
|
||||
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__)
|
||||
paths.emplace_back("/usr/share/diasurgical/devilutionx/");
|
||||
paths.emplace_back("/usr/local/share/diasurgical/devilutionx/");
|
||||
#elif defined(__3DS__) || defined(__SWITCH__)
|
@ -1,14 +0,0 @@
|
||||
--- Source/sound.h.orig 2022-05-17 15:57:06 UTC
|
||||
+++ Source/sound.h
|
||||
@@ -60,7 +60,11 @@ struct TSnd {
|
||||
};
|
||||
|
||||
extern bool gbSndInited;
|
||||
+#ifndef NOSOUND
|
||||
extern _music_id sgnMusicTrack;
|
||||
+#else
|
||||
+inline const _music_id sgnMusicTrack = NUM_MUSIC;
|
||||
+#endif
|
||||
|
||||
void ClearDuplicateSounds();
|
||||
void snd_stop_snd(TSnd *pSnd);
|
Loading…
Reference in New Issue
Block a user