From ef225902adde246e37723fa1d277fa254db3fb93 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sat, 20 Nov 2021 19:07:20 -0300 Subject: [PATCH 1/5] 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 " 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 e69b92d6380285a7991a0694e1490ef524eedb62 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sat, 20 Nov 2021 19:08:34 -0300 Subject: [PATCH 2/5] Added shared library --- common/shlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/shlibs b/common/shlibs index 3199833de6cd..ca0781937a23 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4070,3 +4070,4 @@ libbrial_groebner.so.3 brial-1.2.10_1 libm4ri-0.0.20200125.so m4ri-20200125_1 libm4rie-0.0.20200125.so m4rie-20200125_1 libptytty.so.0 libptytty-2.0_1 +libstorm.so.9 StormLib-9.23_1 From 119ca3402a3d7daff3aff6b03f4e4b2984496121 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sat, 20 Nov 2021 19:08:51 -0300 Subject: [PATCH 3/5] 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 7ebf11159120eaa0d516badb4ba54857480253d7 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sat, 20 Nov 2021 19:09:25 -0300 Subject: [PATCH 4/5] 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 " +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 1ee98cd539b330a4303cdb78b4e615e12a8b8064 Mon Sep 17 00:00:00 2001 From: bugcrazy Date: Sat, 20 Nov 2021 19:09:56 -0300 Subject: [PATCH 5/5] 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 " +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 +}