Attachment 249173 Details for Bug 273883 – Update to 1.5.2 and restore build on FreeBSD.

[patch] Update to 1.5.2 and restore build on FreeBSD.

0001-games-devilutionX-Update-to-1.5.2-restore-build.patch (text/plain), 5.92 KB, created by Alastair Hogge on 2024-03-14 23:25:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2024-03-14 23:25:13 UTC

Size: 5.92 KB

patch

obsolete

>From 9b957d3c0d58aeb96a5d8e308431483716c82ad9 Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Fri, 15 Mar 2024 07:18:45 +0800
>Subject: [PATCH] games/devilutionX: Update to 1.5.2; restore build
>
>Update to 1.5.2; restore build:
>https://github.com/diasurgical/devilutionX/releases/tag/1.5.2
>---
> games/devilutionX/Makefile | 15 +++++++--------
> games/devilutionX/distinfo | 22 +++++++++++-----------
> 2 files changed, 18 insertions(+), 19 deletions(-)
>
>diff --git a/games/devilutionX/Makefile b/games/devilutionX/Makefile
>index e0b3ab1b735a..7e53b08ef527 100644
>--- a/games/devilutionX/Makefile
>+++ b/games/devilutionX/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	devilutionX
>-DISTVERSION=	1.5.1
>+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
>@@ -15,23 +15,22 @@ 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
> 
>-LIB_DEPENDS=	libfmt.so:devel/libfmt
> BUILD_DEPENDS=	${LOCALBASE}/include/SimpleIni.h:devel/simpleini
>+LIB_DEPENDS=	libfmt.so:devel/libfmt
> 
>-USES=		cmake compiler:c++17-lang dos2unix gettext-tools pathfix \
>-		pkgconfig sdl
>+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:7c2924d4553513eba1a70bbdb558198dd8c2726a:libmpq/_deps/libmpq-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
> 
>-DATA_VERSION=	v2
>+DATA_VERSION=	v4
> DATADIR=	${PREFIX}/share/diasurgical/devilutionx
> 
> OPTIONS_DEFINE=		TEST SOUND LTO DEBUG
>@@ -48,13 +47,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:cfbe961e2d6e2978d5e081231e4f798df46437c5: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:1aa9cfda3e92f7108fec67bf12691e457c53f7df: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
>diff --git a/games/devilutionX/distinfo b/games/devilutionX/distinfo
>index 66c6849b20e8..f241a8996633 100644
>--- a/games/devilutionX/distinfo
>+++ b/games/devilutionX/distinfo
>@@ -1,16 +1,16 @@
>-TIMESTAMP = 1705272539
>-SHA256 (devilutionx.mpq?tag=v2) = 90467c15f5e0ac902b2b8ac916f63a1fe2dd4b554ca36ab218bcd27f5121e988
>-SIZE (devilutionx.mpq?tag=v2) = 4959860
>-SHA256 (diasurgical-devilutionX-1.5.1_GH0.tar.gz) = 9d88dec4df58e391940b77edb86f356b34e2c085c5e3191262fa6276d745d1cb
>-SIZE (diasurgical-devilutionX-1.5.1_GH0.tar.gz) = 9445335
>+TIMESTAMP = 1710375372
>+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-7c2924d4553513eba1a70bbdb558198dd8c2726a_GH0.tar.gz) = ab8c004cc62d6e01b06a6f8d1ec67704728ed6163886b40d1f7fa5421a2b387d
>-SIZE (diasurgical-libmpq-7c2924d4553513eba1a70bbdb558198dd8c2726a_GH0.tar.gz) = 70645
>-SHA256 (diasurgical-asio-cfbe961e2d6e2978d5e081231e4f798df46437c5_GH0.tar.gz) = df6c9ae6cc8d6614bb44ae49a3aabca64d73572ec4a930d35481b8081c00ea11
>-SIZE (diasurgical-asio-cfbe961e2d6e2978d5e081231e4f798df46437c5_GH0.tar.gz) = 1615438
>-SHA256 (diasurgical-libzt-1aa9cfda3e92f7108fec67bf12691e457c53f7df_GH0.tar.gz) = a18060784ea4c81462dbf31ec0b96b39ee1771acad7a45c728c6bcb19ae3cf01
>-SIZE (diasurgical-libzt-1aa9cfda3e92f7108fec67bf12691e457c53f7df_GH0.tar.gz) = 327920
>+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
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 273883: 247668 | 249173 | 249397