From 06351a836a678e4222db7495fc5e3a1c5c6fa15d Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Fri, 12 Nov 2021 04:50:29 -0300 Subject: [PATCH] devilutionX: update to 1.3.0 Required packages to build devilutionX --- common/shlibs | 1 + srcpkgs/StormLib/template | 17 ++++++ srcpkgs/devilutionX/template | 9 ++-- .../smpq/patches/fix-smpq-compilation.patch | 52 +++++++++++++++++++ srcpkgs/smpq/template | 19 +++++++ 5 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/StormLib/template create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch create mode 100644 srcpkgs/smpq/template diff --git a/common/shlibs b/common/shlibs index fd78e1e33c3f..0f1f407dad48 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1 libsingular_resources-4.2.1.so singular-4.2.1_1 libm4ri-0.0.20200125.so m4ri-20200125_1 libm4rie-0.0.20200125.so m4rie-20200125_1 +libstorm.so.9 StormLib-9.23_1 diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template new file mode 100644 index 000000000000..16e089059f5d --- /dev/null +++ b/srcpkgs/StormLib/template @@ -0,0 +1,17 @@ +# 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 " +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 +} diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index 829ff248926b..743bd0b5c809 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 SDL2_mixer-devel fmt-devel libpng-devel libsodium-devel" short_desc="Diablo I engine for modern operating systems" maintainer="MarcoAPC " license="Unlicense" homepage="https://github.com/diasurgical/devilutionX" distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz" -checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521 +checksum=b01bfcdba7144566f1658eb50748b00d85f252f6bf8daf14a4fcccd5dc5bd9cc post_install() { vlicense LICENSE diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch new file mode 100644 index 000000000000..985fe3d3fa13 --- /dev/null +++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt 2016-12-12 23:31:14.000000000 +0100 ++++ b/CMakeLists.txt 2021-10-01 13:06:43.062603459 +0200 +@@ -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) + +@@ -43,9 +45,9 @@ + + try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR}) + +- if(NOT CHECK) ++ if(FALSE) + message(FATAL_ERROR "Found old StormLib version") +- endif(NOT CHECK) ++ endif(FALSE) + + message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h") + message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}") +@@ -93,7 +95,9 @@ + 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) +@@ -102,7 +106,7 @@ + + install(TARGETS smpq DESTINATION bin) + +- if(NOT CMAKE_CROSSCOMPILING) ++ if(FALSE) + + add_executable(mangen ${MANGEN_SRCS}) + add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen) +@@ -110,7 +114,7 @@ + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1) + +- endif(NOT CMAKE_CROSSCOMPILING) ++ endif(FALSE) + + if(WIN32 AND WITH_NSIS) + diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template new file mode 100644 index 000000000000..4ec5559456b2 --- /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" +makedepends="bzip2-devel zlib-devel StormLib" +short_desc="StormLib MPQ archiving utility" +maintainer="MarcoAPC " +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 +patch_args="-Np1" + +do_build() { + cd ${wrksrc} + cd build +}