From 5b9cceae0f26452ce65c9d5666353d8a98907c72 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sat, 14 Jan 2023 22:07:48 -0300 Subject: [PATCH 1/4] devilutionX: update to 1.4.1 --- srcpkgs/devilutionX/template | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index 829ff248926b..cbcfd3c96341 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -1,16 +1,25 @@ # Template file for 'devilutionX' pkgname=devilutionX -version=1.2.1 +version=1.4.1 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 -DBUILD_TESTING=OFF -DDISABLE_ZERO_TIER=ON" +hostmakedepends="git gettext pkg-config smpq" +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 " license="Unlicense" homepage="https://github.com/diasurgical/devilutionX" -distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz" -checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521 +distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz +https://raw.githubusercontent.com/diasurgical/devilutionX/1.2.1/CMake/FindSDL2.cmake" +checksum="54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8 +5df4976281066baf46bcc1d27f4855f1eec0831da43323184b7353aa5eb269a9" + +skip_extraction="FindSDL2.cmake" + +post_extract() { + cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/FindSDL2.cmake CMake/finders +} post_install() { vlicense LICENSE From 42d73b2d516d267447b252848e629456d5564abb Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sun, 15 Jan 2023 00:39:07 -0300 Subject: [PATCH 2/4] devilutionX: update to 1.4.1 --- srcpkgs/devilutionX/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index cbcfd3c96341..a9f4e986e314 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -3,7 +3,7 @@ pkgname=devilutionX version=1.4.1 revision=1 build_style=cmake -configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=OFF -DDISABLE_ZERO_TIER=ON" +configure_args="-DVERSION_NUM=$version -DBUILD_TESTING=OFF -DDISABLE_ZERO_TIER=ON" hostmakedepends="git gettext pkg-config smpq" makedepends="SDL2-devel SDL2_image-devel fmt-devel libpng-devel libsodium-devel bzip2-devel" short_desc="Diablo I engine for modern operating systems" From 07626c63d90997b29273437eeaebd7d5d158c4fd Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sun, 15 Jan 2023 00:40:41 -0300 Subject: [PATCH 3/4] New package: StormLib-9.24 --- common/shlibs | 1 + srcpkgs/StormLib-devel | 1 + srcpkgs/StormLib/template | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/StormLib-devel create mode 100644 srcpkgs/StormLib/template diff --git a/common/shlibs b/common/shlibs index d80771f9f719..c20e1ed94e82 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.24_1 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 diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template new file mode 100644 index 000000000000..251a9bb06427 --- /dev/null +++ b/srcpkgs/StormLib/template @@ -0,0 +1,27 @@ +# Template file for 'StormLib' +pkgname=StormLib +version=9.24 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON" +hostmakedepends="pkg-config" +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=33e43788f53a9f36ff107a501caaa744fd239f38bb5c6d6af2c845b87c8a2ee1 + +post_install() { + vlicense LICENSE +} + +StormLib-devel_package() { + short_desc+=" - development files" + depends="StormLib>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From d2cfa84d182d1574c751462691ec9f7c35a4e0f6 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sun, 15 Jan 2023 00:40:59 -0300 Subject: [PATCH 4/4] New package: smpq-1.6 --- .../smpq/patches/fix-smpq-compilation.patch | 53 +++++++++++++++++++ srcpkgs/smpq/template | 14 +++++ 2 files changed, 67 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..bce78da0fe4f --- /dev/null +++ b/srcpkgs/smpq/template @@ -0,0 +1,14 @@ +# 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-devel" +short_desc="StormLib MPQ archiving utility" +maintainer="MarcoAPC " +license="GPL-3.0-or-later" +homepage="https://launchpad.net/smpq" +changelog="https://bazaar.launchpad.net/~pali/smpq/trunk/view/head:/CHANGELOG" +distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz" +checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb