Attachment 247668 Details for Bug 273883 – Update to 1.5.1 and restore build

[patch] Update to 1.5.1 and restore build

0001-games-devilutionX-Update-to-1.5.1.patch (text/plain), 8.10 KB, created by Alastair Hogge on 2024-01-15 01:31:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2024-01-15 01:31:10 UTC

Size: 8.10 KB

patch

obsolete

>From 7caf37749e03936f989f23fb2db695afd9f2f83e Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Mon, 15 Jan 2024 09:25:04 +0800
>Subject: [PATCH] games/devilutionX: Update to 1.5.1
>
>Update to 1.5.1 and restore build on FreeBSD.
>
>https://github.com/diasurgical/devilutionX/releases/tag/1.5.1
>---
> games/devilutionX/Makefile                    | 22 +++++++++----------
> games/devilutionX/distinfo                    | 22 +++++++++----------
> .../files/patch-3rdParty_asio_CMakeLists.txt  | 10 +++++++++
> .../files/patch-CMake_Dependencies.cmake      | 13 -----------
> 4 files changed, 32 insertions(+), 35 deletions(-)
> create mode 100644 games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt
> delete mode 100644 games/devilutionX/files/patch-CMake_Dependencies.cmake
>
>diff --git a/games/devilutionX/Makefile b/games/devilutionX/Makefile
>index 11965ae45756..e0b3ab1b735a 100644
>--- a/games/devilutionX/Makefile
>+++ b/games/devilutionX/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	devilutionX
>-DISTVERSION=	1.4.1
>-PORTREVISION=	2
>+DISTVERSION=	1.5.1
> CATEGORIES=	games
> MASTER_SITES=	https://github.com/diasurgical/devilutionx-assets/releases/download/${DATA_VERSION}/:data
> DISTFILES=	devilutionx.mpq?tag=${DATA_VERSION}:data
>@@ -10,21 +9,22 @@ 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
>-
>-BROKEN=		does not build with libfmt 10+. See https://github.com/diasurgical/devilutionX/issues/6098
>+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
> 
>-USES=		cmake compiler:c++11-lang dos2unix gettext-tools pkgconfig sdl
>+USES=		cmake compiler:c++17-lang dos2unix gettext-tools pathfix \
>+		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:7c2924d4553513eba1a70bbdb558198dd8c2726a:libmpq/_deps/libmpq-src
> USE_SDL=	sdl2 image2
> 
> CMAKE_ARGS=	-DCMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \
>@@ -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:cfbe961e2d6e2978d5e081231e4f798df46437c5: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:1aa9cfda3e92f7108fec67bf12691e457c53f7df: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 1d5c6081d1c6..66c6849b20e8 100644
>--- a/games/devilutionX/distinfo
>+++ b/games/devilutionX/distinfo
>@@ -1,16 +1,16 @@
>-TIMESTAMP = 1659554836
>+TIMESTAMP = 1705272539
> 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
>+SHA256 (diasurgical-devilutionX-1.5.1_GH0.tar.gz) = 9d88dec4df58e391940b77edb86f356b34e2c085c5e3191262fa6276d745d1cb
>+SIZE (diasurgical-devilutionX-1.5.1_GH0.tar.gz) = 9445335
>+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-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 39c1b7e28f9d4d92edaaa831007715358465a068019fe84a56b5366b386a1363
> SIZE (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 13122622
> SHA256 (diasurgical-lwip-1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b_GH0.tar.gz) = 1477b5a427672480d0035b5af3e2cfae01c691afa9cace4500b43fcd262fa0bf
>diff --git a/games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt b/games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt
>new file mode 100644
>index 000000000000..441490c096f6
>--- /dev/null
>+++ b/games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt
>@@ -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)
>diff --git a/games/devilutionX/files/patch-CMake_Dependencies.cmake b/games/devilutionX/files/patch-CMake_Dependencies.cmake
>deleted file mode 100644
>index b5916c37a486..000000000000
>--- a/games/devilutionX/files/patch-CMake_Dependencies.cmake
>+++ /dev/null
>@@ -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.
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 273883: 247668 | 249173 | 249397