From 3adc8df18698b8b684a6b893f51adc89c7994fb9 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Fri, 9 Feb 2024 16:10:20 +0100 Subject: [PATCH] devilutionX: update to 1.5.2 --- srcpkgs/devilutionX/patches/cmake.patch | 57 +++++++++++++++++++++++++ srcpkgs/devilutionX/template | 43 ++++++++++++++++--- 2 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/devilutionX/patches/cmake.patch diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch new file mode 100644 index 0000000000000..b774945d8191d --- /dev/null +++ b/srcpkgs/devilutionX/patches/cmake.patch @@ -0,0 +1,57 @@ +diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt +index b5a9c0931..498dc5790 100644 +--- a/3rdParty/SDL_audiolib/CMakeLists.txt ++++ b/3rdParty/SDL_audiolib/CMakeLists.txt +@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON) + + include(FetchContent) + FetchContent_Declare(SDL_audiolib +- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz +- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd) ++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src" ++) + FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib) + + add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib) +diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt +index 7df576b73..bc6ad4e0f 100644 +--- a/3rdParty/libmpq/CMakeLists.txt ++++ b/3rdParty/libmpq/CMakeLists.txt +@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll) + + include(FetchContent) + FetchContent_Declare(libmpq +- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz +- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329 ++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src" + ) + FetchContent_MakeAvailableExcludeFromAll(libmpq) + +diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt +index d5cf319d7..c820a6ace 100644 +--- a/3rdParty/libsmackerdec/CMakeLists.txt ++++ b/3rdParty/libsmackerdec/CMakeLists.txt +@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll) + + include(FetchContent) + FetchContent_Declare(libsmackerdec +- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz +- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3 ++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src" + ) + FetchContent_MakeAvailableExcludeFromAll(libsmackerdec) + +diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt +index e32fcf74d..f5860ad23 100644 +--- a/3rdParty/simpleini/CMakeLists.txt ++++ b/3rdParty/simpleini/CMakeLists.txt +@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll) + + include(FetchContent) + FetchContent_Declare(simpleini +- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz +- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81 ++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src" + ) + FetchContent_MakeAvailableExcludeFromAll(simpleini) + diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index ad911b48f8631..6f0a2749bf149 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -1,7 +1,12 @@ # Template file for 'devilutionX' pkgname=devilutionX -version=1.4.1 -revision=3 +version=1.5.2 +revision=1 +_assets_version=4 +_simpleini_version=4.22 +_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e +_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2 +_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05 build_style=cmake configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON" hostmakedepends="pkg-config" @@ -9,12 +14,38 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel gtest-devel fmt-devel zlib-devel" short_desc="Diablo I engine for modern operating systems" maintainer="MarcoAPC " -license="Unlicense" +license="custom:Sustainable Use License" homepage="https://github.com/diasurgical/devilutionX" changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md" -distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz" -checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f +distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz + https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz + https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz + https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz + https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz + https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq" +checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3 + b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8 + 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5 + e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87 + 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea + 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38" +skip_extraction="v${_simpleini_version}.tar.gz + ${_sdl_audiolib_hash}.tar.gz + ${_libsmackerdec_hash}.tar.gz + ${_libmpq_hash}.tar.gz + spawn.mpq" + +post_extract() { + vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz + vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz + vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz + vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz +} + +pre_check() { + vsrccopy spawn.mpq build/ +} post_install() { - vlicense LICENSE + vlicense LICENSE.md }