Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)

[bugcrazy <bugcrazy@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]

There is an updated pull request by bugcrazy against master on the void-packages repository

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.4.1 (maintainer version)
Required packages to build devilutionX

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34039.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-9-34039.patch --]
[-- Type: text/x-diff, Size: 17194 bytes --]

From 7346c89ac5793bad3f4d1cbae6af713472061463 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:07:20 -0300
Subject: [PATCH 1/6] devilutionX: update to 1.3.0

---
 srcpkgs/devilutionX/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE

From 484f1335141ffb09b2a7dcfbae10c655a044d692 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:34 -0300
Subject: [PATCH 2/6] Added shared library

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index d80771f9f719..5ba3fbdc3736 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4222,3 +4222,4 @@ libIlmThread-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libstorm.so.9 StormLib-9.23_1

From e7d915f72f2043edaf1060d6af5ba30da29863f7 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:51 -0300
Subject: [PATCH 3/6] Added Symbolic link

---
 srcpkgs/StormLib-devel | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/StormLib-devel

diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file

From 431e7ea56a0e8cb7f6c71e0aacd4ae0593bf5690 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:25 -0300
Subject: [PATCH 4/6] New package: StormLib-9.23.

---
 srcpkgs/StormLib/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/StormLib/template

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..b3c43437af49
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,26 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {
+	short_desc+=" - development files"
+	depends="StormLib>=${version}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From ad5499902ca208b3aa5502cfe37603c4afb62806 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:56 -0300
Subject: [PATCH 5/6] New package: smpq-1.6.

---
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..9642c4d98ca0
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

From fd431c86e7c1481504fa16002d814fbc09bf9bf6 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 16 Apr 2022 22:29:51 -0300
Subject: [PATCH 6/6] update to 1.4.0

update to 1.4.1

Code cleanup
---
 srcpkgs/devilutionX/files/FindSDL2.cmake | 255 +++++++++++++++++++++++
 srcpkgs/devilutionX/template             |  12 +-
 2 files changed, 263 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/devilutionX/files/FindSDL2.cmake

diff --git a/srcpkgs/devilutionX/files/FindSDL2.cmake b/srcpkgs/devilutionX/files/FindSDL2.cmake
new file mode 100644
index 000000000000..acde1a993e8e
--- /dev/null
+++ b/srcpkgs/devilutionX/files/FindSDL2.cmake
@@ -0,0 +1,255 @@
+# - Find SDL2
+# Find the SDL2 headers and libraries
+#
+#  SDL2::SDL2 - Imported target to use for building a library
+#  SDL2::SDL2main - Imported interface target to use if you want SDL and SDLmain.
+#  SDL2_FOUND - True if SDL2 was found.
+#  SDL2_DYNAMIC - If we found a DLL version of SDL (meaning you might want to copy a DLL from SDL2::SDL2)
+#
+# Original Author:
+# 2015 Ryan Pavlik <ryan.pavlik@gmail.com> <abiryan@ryand.net>
+#
+# Copyright Sensics, Inc. 2015.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+# Set up architectures (for windows) and prefixes (for mingw builds)
+if(WIN32)
+	if(MINGW)
+		include(MinGWSearchPathExtras OPTIONAL)
+		if(MINGWSEARCH_TARGET_TRIPLE)
+			set(SDL2_PREFIX ${MINGWSEARCH_TARGET_TRIPLE})
+		endif()
+	endif()
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		set(SDL2_LIB_PATH_SUFFIX lib/x64)
+		if(NOT MSVC AND NOT SDL2_PREFIX)
+			set(SDL2_PREFIX x86_64-w64-mingw32)
+		endif()
+	else()
+		set(SDL2_LIB_PATH_SUFFIX lib/x86)
+		if(NOT MSVC AND NOT SDL2_PREFIX)
+			set(SDL2_PREFIX i686-w64-mingw32)
+		endif()
+	endif()
+endif()
+
+if(SDL2_PREFIX)
+	set(SDL2_ORIGPREFIXPATH ${CMAKE_PREFIX_PATH})
+	if(SDL2_ROOT_DIR)
+		list(APPEND CMAKE_PREFIX_PATH "${SDL2_ROOT_DIR}")
+	endif()
+	if(CMAKE_PREFIX_PATH)
+		foreach(_prefix ${CMAKE_PREFIX_PATH})
+			list(APPEND CMAKE_PREFIX_PATH "${_prefix}/${SDL2_PREFIX}")
+		endforeach()
+	endif()
+	if(MINGWSEARCH_PREFIXES)
+		list(APPEND CMAKE_PREFIX_PATH ${MINGWSEARCH_PREFIXES})
+	endif()
+endif()
+
+# Invoke pkgconfig for hints
+find_package(PkgConfig QUIET)
+set(SDL2_INCLUDE_HINTS)
+set(SDL2_LIB_HINTS)
+if(PKG_CONFIG_FOUND)
+	pkg_search_module(SDL2PC QUIET sdl2)
+	if(SDL2PC_INCLUDE_DIRS)
+		set(SDL2_INCLUDE_HINTS ${SDL2PC_INCLUDE_DIRS})
+	endif()
+	if(SDL2PC_LIBRARY_DIRS)
+		set(SDL2_LIB_HINTS ${SDL2PC_LIBRARY_DIRS})
+	endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+find_library(SDL2_LIBRARY
+	NAMES
+	SDL2
+	HINTS
+	${SDL2_LIB_HINTS}
+	PATHS
+	${SDL2_ROOT_DIR}
+	ENV SDL2DIR
+	PATH_SUFFIXES lib SDL2 ${SDL2_LIB_PATH_SUFFIX})
+
+set(_sdl2_framework FALSE)
+# Some special-casing if we've found/been given a framework.
+# Handles whether we're given the library inside the framework or the framework itself.
+if(APPLE AND "${SDL2_LIBRARY}" MATCHES "(/[^/]+)*.framework(/.*)?$")
+	set(_sdl2_framework TRUE)
+	set(SDL2_FRAMEWORK "${SDL2_LIBRARY}")
+	# Move up in the directory tree as required to get the framework directory.
+	while("${SDL2_FRAMEWORK}" MATCHES "(/[^/]+)*.framework(/.*)$" AND NOT "${SDL2_FRAMEWORK}" MATCHES "(/[^/]+)*.framework$")
+		get_filename_component(SDL2_FRAMEWORK "${SDL2_FRAMEWORK}" DIRECTORY)
+	endwhile()
+	if("${SDL2_FRAMEWORK}" MATCHES "(/[^/]+)*.framework$")
+		set(SDL2_FRAMEWORK_NAME ${CMAKE_MATCH_1})
+		# If we found a framework, do a search for the header ahead of time that will be more likely to get the framework header.
+		find_path(SDL2_INCLUDE_DIR
+			NAMES
+			SDL_haptic.h # this file was introduced with SDL2
+			HINTS
+			"${SDL2_FRAMEWORK}/Headers/")
+	else()
+		# For some reason we couldn't get the framework directory itself.
+		# Shouldn't happen, but might if something is weird.
+		unset(SDL2_FRAMEWORK)
+	endif()
+endif()
+
+find_path(SDL2_INCLUDE_DIR
+	NAMES
+	SDL_haptic.h # this file was introduced with SDL2
+	HINTS
+	${SDL2_INCLUDE_HINTS}
+	PATHS
+	${SDL2_ROOT_DIR}
+	ENV SDL2DIR
+	PATH_SUFFIXES include include/sdl2 include/SDL2 SDL2)
+
+if(WIN32 AND SDL2_LIBRARY)
+	find_file(SDL2_RUNTIME_LIBRARY
+		NAMES
+		SDL2.dll
+		libSDL2.dll
+		HINTS
+		${SDL2_LIB_HINTS}
+		PATHS
+		${SDL2_ROOT_DIR}
+		ENV SDL2DIR
+		PATH_SUFFIXES bin lib ${SDL2_LIB_PATH_SUFFIX})
+endif()
+
+
+if(WIN32 OR ANDROID OR IOS OR (APPLE AND NOT _sdl2_framework))
+	set(SDL2_EXTRA_REQUIRED SDL2_SDLMAIN_LIBRARY)
+	find_library(SDL2_SDLMAIN_LIBRARY
+		NAMES
+		SDL2main
+		PATHS
+		${SDL2_ROOT_DIR}
+		ENV SDL2DIR
+		PATH_SUFFIXES lib ${SDL2_LIB_PATH_SUFFIX})
+endif()
+
+if(MINGW AND NOT SDL2PC_FOUND)
+	find_library(SDL2_MINGW_LIBRARY mingw32)
+	find_library(SDL2_MWINDOWS_LIBRARY mwindows)
+endif()
+
+if(SDL2_PREFIX)
+	# Restore things the way they used to be.
+	set(CMAKE_PREFIX_PATH ${SDL2_ORIGPREFIXPATH})
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set QUATLIB_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2
+	DEFAULT_MSG
+	SDL2_LIBRARY
+	SDL2_INCLUDE_DIR
+	${SDL2_EXTRA_REQUIRED})
+
+if(SDL2_FOUND)
+	if(NOT TARGET SDL2::SDL2)
+		# Create SDL2::SDL2
+		if(WIN32 AND SDL2_RUNTIME_LIBRARY)
+			set(SDL2_DYNAMIC TRUE)
+			add_library(SDL2::SDL2 SHARED IMPORTED)
+			set_target_properties(SDL2::SDL2
+				PROPERTIES
+				IMPORTED_IMPLIB "${SDL2_LIBRARY}"
+				IMPORTED_LOCATION "${SDL2_RUNTIME_LIBRARY}"
+				INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+			)
+		else()
+			add_library(SDL2::SDL2 UNKNOWN IMPORTED)
+			if(SDL2_FRAMEWORK AND SDL2_FRAMEWORK_NAME)
+				# Handle the case that SDL2 is a framework and we were able to decompose it above.
+				set_target_properties(SDL2::SDL2 PROPERTIES
+					IMPORTED_LOCATION "${SDL2_FRAMEWORK}/${SDL2_FRAMEWORK_NAME}")
+			elseif(_sdl2_framework AND SDL2_LIBRARY MATCHES "(/[^/]+)*.framework$")
+				# Handle the case that SDL2 is a framework and SDL_LIBRARY is just the framework itself.
+
+				# This takes the basename of the framework, without the extension,
+				# and sets it (as a child of the framework) as the imported location for the target.
+				# This is the library symlink inside of the framework.
+				set_target_properties(SDL2::SDL2 PROPERTIES
+					IMPORTED_LOCATION "${SDL2_LIBRARY}/${CMAKE_MATCH_1}")
+			else()
+				# Handle non-frameworks (including non-Mac), as well as the case that we're given the library inside of the framework
+				set_target_properties(SDL2::SDL2 PROPERTIES
+					IMPORTED_LOCATION "${SDL2_LIBRARY}")
+			endif()
+			set_target_properties(SDL2::SDL2
+				PROPERTIES
+				INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+			)
+		endif()
+
+		if(APPLE)
+			# Need Cocoa here, is always a framework
+			find_library(SDL2_COCOA_LIBRARY Cocoa)
+			list(APPEND SDL2_EXTRA_REQUIRED SDL2_COCOA_LIBRARY)
+			if(SDL2_COCOA_LIBRARY)
+				set_target_properties(SDL2::SDL2 PROPERTIES
+						IMPORTED_LINK_INTERFACE_LIBRARIES ${SDL2_COCOA_LIBRARY})
+			endif()
+		endif()
+
+
+		# Compute what to do with SDL2main
+		set(SDL2MAIN_LIBRARIES SDL2::SDL2)
+		add_library(SDL2::SDL2main INTERFACE IMPORTED)
+		if(SDL2_SDLMAIN_LIBRARY)
+			add_library(SDL2::SDL2main_real STATIC IMPORTED)
+			set_target_properties(SDL2::SDL2main_real
+				PROPERTIES
+				IMPORTED_LOCATION "${SDL2_SDLMAIN_LIBRARY}")
+			set(SDL2MAIN_LIBRARIES SDL2::SDL2main_real ${SDL2MAIN_LIBRARIES})
+		endif()
+		if(MINGW)
+			# Bugfix
+			set(SDL2MAIN_LIBRARIES -Wl,--whole-archive ${SDL2MAIN_LIBRARIES} -Wl,--no-whole-archive)
+			# MinGW requires some additional libraries to appear earlier in the link line.
+			if(SDL2PC_LIBRARIES)
+				# Use pkgconfig-suggested extra libraries if available.
+				list(REMOVE_ITEM SDL2PC_LIBRARIES SDL2main SDL2)
+				set(SDL2MAIN_LIBRARIES ${SDL2PC_LIBRARIES} ${SDL2MAIN_LIBRARIES})
+			else()
+				# fall back to extra libraries specified in pkg-config in
+				# an official binary distro of SDL2 for MinGW I downloaded
+				if(SDL2_MINGW_LIBRARY)
+					set(SDL2MAIN_LIBRARIES ${SDL2_MINGW_LIBRARY} ${SDL2MAIN_LIBRARIES})
+				endif()
+				if(SDL2_MWINDOWS_LIBRARY)
+					set(SDL2MAIN_LIBRARIES ${SDL2_MWINDOWS_LIBRARY} ${SDL2MAIN_LIBRARIES})
+				endif()
+			endif()
+			set_target_properties(SDL2::SDL2main
+				PROPERTIES
+				INTERFACE_COMPILE_DEFINITIONS "main=SDL_main")
+		endif()
+		set_target_properties(SDL2::SDL2main
+			PROPERTIES
+			INTERFACE_LINK_LIBRARIES "${SDL2MAIN_LIBRARIES}")
+	endif()
+	mark_as_advanced(SDL2_ROOT_DIR)
+endif()
+
+mark_as_advanced(SDL2_LIBRARY
+	SDL2_RUNTIME_LIBRARY
+	SDL2_INCLUDE_DIR
+	SDL2_SDLMAIN_LIBRARY
+	SDL2_COCOA_LIBRARY
+	SDL2_MINGW_LIBRARY
+	SDL2_MWINDOWS_LIBRARY)
+
+find_package(Threads REQUIRED)
+set_property(TARGET SDL2::SDL2 APPEND PROPERTY
+	INTERFACE_LINK_LIBRARIES Threads::Threads)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,21 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=OFF -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-devel SDL2_image-devel fmt-devel libpng-devel libsodium-devel bzip2-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE