kpriv
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/devilutionX: restore build with update to 1.5.2 (+) 

Approved by:	amdmi3 (maintainer, timeout > 2 weeks)
PR:		273883
This commit is contained in:
Sergey A. Osokin 2024-03-22 08:48:36 -04:00
parent d2a01d263d
commit e77537638d
4 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
games/devilutionX/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= devilutionX
DISTVERSION= 1.4.1
PORTREVISION= 2
DISTVERSION= 1.5.2
CATEGORIES= games
MASTER_SITES= https://github.com/diasurgical/devilutionx-assets/releases/download/${DATA_VERSION}/:data
DISTFILES= devilutionx.mpq?tag=${DATA_VERSION}:data
@ -10,28 +9,29 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Diablo I engine for modern operating systems
WWW= https://github.com/diasurgical/devilutionX
LICENSE= UNLICENSE CC-BY-NC-SA-4.0 OFL11
LICENSE= CC-BY-NC-SA-4.0 OFL11 SUL
LICENSE_COMB= multi
LICENSE_FILE_UNLICENSE= ${WRKSRC}/LICENSE
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
BROKEN= does not build with libfmt 10+. See https://github.com/diasurgical/devilutionX/issues/6098
LIB_DEPENDS= libfmt.so:devel/libfmt
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:2997ee0e41e91bb723003bc09234be553b190e38:libsmackerdec/_deps/libsmackerdec-src \
diasurgical:libmpq:0f10bd1600f406b13932bf5351ba713361262184:libmpq/_deps/libmpq-src
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= FETCHCONTENT_FULLY_DISCONNECTED
CMAKE_ON= DDEVILUTIONX_SYSTEM_LIBFMT \
FETCHCONTENT_FULLY_DISCONNECTED
DATA_VERSION= v2
DATA_VERSION= v4
DATADIR= ${PREFIX}/share/diasurgical/devilutionx
OPTIONS_DEFINE= TEST SOUND LTO DEBUG
@ -48,13 +48,13 @@ NETWORK_CMAKE_BOOL_OFF= NONET
TCP_DESC= TCP multiplayer option
TCP_CMAKE_BOOL_OFF= DISABLE_TCP
TCP_IMPLIES= NETWORK
TCP_GH_TUPLE= diasurgical:asio:ebeff99f539da23d27c2e8d4bdbc1ee011968644:asio/_deps/asio-src
TCP_GH_TUPLE= diasurgical:asio:cfbe961e2d6e2978d5e081231e4f798df46437c: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:37a2efb0b925df632299ef07dc78c0af5f6b4756:libzt/_deps/libzt-src \
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

26
games/devilutionX/distinfo
View File

@ -1,16 +1,16 @@
TIMESTAMP = 1659554836
SHA256 (devilutionx.mpq?tag=v2) = 90467c15f5e0ac902b2b8ac916f63a1fe2dd4b554ca36ab218bcd27f5121e988
SIZE (devilutionx.mpq?tag=v2) = 4959860
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 (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-37a2efb0b925df632299ef07dc78c0af5f6b4756_GH0.tar.gz) = 7fdbc4a73e3e1d0b98521c0b6520f89852a0896158a815070052e37a2a08b585
SIZE (diasurgical-libzt-37a2efb0b925df632299ef07dc78c0af5f6b4756_GH0.tar.gz) = 390934
TIMESTAMP = 1711067017
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-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-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

10
games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt Normal file
View File

@ -0,0 +1,10 @@
--- 3rdParty/asio/CMakeLists.txt.orig 2024-01-15 01:03:52 UTC
+++ 3rdParty/asio/CMakeLists.txt
@@ -8,6 +8,7 @@ add_library(asio INTERFACE)
FetchContent_MakeAvailableExcludeFromAll(asio)
add_library(asio INTERFACE)
+target_compile_definitions(asio INTERFACE ASIO_HAS_STD_INVOKE_RESULT=ON)
target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/asio/include)
if(NINTENDO_3DS OR NINTENDO_SWITCH)

13
games/devilutionX/files/patch-CMake_Dependencies.cmake
View File

@ -1,13 +0,0 @@
--- CMake/Dependencies.cmake.orig 2022-07-25 04:41:06 UTC
+++ CMake/Dependencies.cmake
@@ -31,7 +31,9 @@ else()
if(DEVILUTIONX_SYSTEM_SDL2)
find_package(SDL2 REQUIRED)
if(TARGET SDL2::SDL2)
- set(SDL2_MAIN SDL2::SDL2main)
+ if(TARGET SDL2::SDL2main)
+ set(SDL2_MAIN SDL2::SDL2main)
+ endif()
elseif(TARGET SDL2::SDL2-static)
# On some distros, such as vitasdk, only the SDL2::SDL2-static target is available.
# Alias to SDL2::SDL2 because some finder scripts may refer to SDL2::SDL2.