Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] devilutionX: update to 1.3.0
@ 2021-11-12  8:31 bugcrazy
  2021-11-12  8:32 ` bugcrazy
                   ` (116 more replies)
  0 siblings, 117 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-12  8:31 UTC (permalink / raw)
  To: ml

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

There is a new 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.3.0
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: 5662 bytes --]

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 <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
+}
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 <marcoaureliopc@gmail.com>"
 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 <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
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
@ 2021-11-12  8:32 ` bugcrazy
  2021-11-12  8:44 ` [PR PATCH] [Updated] " bugcrazy
                   ` (115 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-12  8:32 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-966918108

Comment:
Two new packages are created needed to build devilutionX, they are StormLib and smpq.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
  2021-11-12  8:32 ` bugcrazy
@ 2021-11-12  8:44 ` bugcrazy
  2021-11-14 20:11 ` [PR REVIEW] " abenson
                   ` (114 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-12  8:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 5685 bytes --]

From efdd0d0ba9e9c7c0ac58c616b8be61f123aadb1b 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

Fixing checksum error
---
 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 <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
+}
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..fd24b976fdc3 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 <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
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 <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
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
  2021-11-12  8:32 ` bugcrazy
  2021-11-12  8:44 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-14 20:11 ` abenson
  2021-11-14 20:12 ` abenson
                   ` (113 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-14 20:11 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748902549

Comment:
The new packages should have their own commits.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (2 preceding siblings ...)
  2021-11-14 20:11 ` [PR REVIEW] " abenson
@ 2021-11-14 20:12 ` abenson
  2021-11-14 20:14 ` abenson
                   ` (112 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-14 20:12 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748902618

Comment:
This is the default, its not necessary.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (3 preceding siblings ...)
  2021-11-14 20:12 ` abenson
@ 2021-11-14 20:14 ` abenson
  2021-11-14 20:14 ` abenson
                   ` (111 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-14 20:14 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-968356178

Comment:
`StormLib` shoudl also be split into `StormLib-devel`.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (4 preceding siblings ...)
  2021-11-14 20:14 ` abenson
@ 2021-11-14 20:14 ` abenson
  2021-11-14 20:32 ` [PR REVIEW] " abenson
                   ` (110 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-14 20:14 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-968356178

Comment:
`StormLib` should be split into `StormLib-devel`.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (5 preceding siblings ...)
  2021-11-14 20:14 ` abenson
@ 2021-11-14 20:32 ` abenson
  2021-11-14 20:40 ` abenson
                   ` (109 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-14 20:32 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748904746

Comment:
Why not just remove the lines entirely?

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (6 preceding siblings ...)
  2021-11-14 20:32 ` [PR REVIEW] " abenson
@ 2021-11-14 20:40 ` abenson
  2021-11-17  3:30 ` [PR PATCH] [Updated] " bugcrazy
                   ` (108 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-14 20:40 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748905799

Comment:
Same here, just remove the lines 

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (7 preceding siblings ...)
  2021-11-14 20:40 ` abenson
@ 2021-11-17  3:30 ` bugcrazy
  2021-11-17  3:31 ` [PR REVIEW] " bugcrazy
                   ` (107 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 6293 bytes --]

From 514d3aaebc46395536290e909422179752a8c038 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

Fixing checksum error

Applying suggestions and adjustments
---
 common/shlibs                                 |  1 +
 srcpkgs/StormLib-devel                        |  1 +
 srcpkgs/StormLib/template                     | 25 +++++++++
 srcpkgs/devilutionX/template                  |  9 ++--
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 20 +++++++
 6 files changed, 105 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/StormLib-devel
 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-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..57b55e4539c1
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# 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"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
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
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..d610da90f8af
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,20 @@
+# 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
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (8 preceding siblings ...)
  2021-11-17  3:30 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-17  3:31 ` bugcrazy
  2021-11-17  3:32 ` bugcrazy
                   ` (106 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:31 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750855650

Comment:
I forgot that.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (9 preceding siblings ...)
  2021-11-17  3:31 ` [PR REVIEW] " bugcrazy
@ 2021-11-17  3:32 ` bugcrazy
  2021-11-17  3:33 ` bugcrazy
                   ` (105 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:32 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750856025

Comment:
In which line, what is it not necessary?


^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (10 preceding siblings ...)
  2021-11-17  3:32 ` bugcrazy
@ 2021-11-17  3:33 ` bugcrazy
  2021-11-17  3:44 ` [PR PATCH] [Updated] " bugcrazy
                   ` (104 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:33 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-971143448

Comment:
> `StormLib` should be split into `StormLib-devel`.

Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (11 preceding siblings ...)
  2021-11-17  3:33 ` bugcrazy
@ 2021-11-17  3:44 ` bugcrazy
  2021-11-17  3:45 ` [PR REVIEW] " bugcrazy
                   ` (103 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 6308 bytes --]

From f3b5a00768d88412eb832012a46c99f3df101119 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

Fixing checksum error

Applying suggestions and adjustments

Fix whitespace
---
 common/shlibs                                 |  1 +
 srcpkgs/StormLib-devel                        |  1 +
 srcpkgs/StormLib/template                     | 25 +++++++++
 srcpkgs/devilutionX/template                  |  9 ++--
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 20 +++++++
 6 files changed, 105 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/StormLib-devel
 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-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..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# 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"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
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
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..d610da90f8af
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,20 @@
+# 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
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (12 preceding siblings ...)
  2021-11-17  3:44 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-17  3:45 ` bugcrazy
  2021-11-17  3:46 ` bugcrazy
                   ` (102 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:45 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750860029

Comment:
Using (FALSE), obtain the same result as you remove the rows. I refizes the patch by removing the lines.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (13 preceding siblings ...)
  2021-11-17  3:45 ` [PR REVIEW] " bugcrazy
@ 2021-11-17  3:46 ` bugcrazy
  2021-11-17  5:25 ` bugcrazy
                   ` (101 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  3:46 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750860211

Comment:
I removed the lines

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (14 preceding siblings ...)
  2021-11-17  3:46 ` bugcrazy
@ 2021-11-17  5:25 ` bugcrazy
  2021-11-17 18:16 ` abenson
                   ` (100 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17  5:25 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750890904

Comment:
I opened PR for [Stormlib](34108) 

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (15 preceding siblings ...)
  2021-11-17  5:25 ` bugcrazy
@ 2021-11-17 18:16 ` abenson
  2021-11-17 23:22 ` bugcrazy
                   ` (99 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-17 18:16 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751517030

Comment:
No, the commit should still be in this PR, just needs to be a separate commit.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (16 preceding siblings ...)
  2021-11-17 18:16 ` abenson
@ 2021-11-17 23:22 ` bugcrazy
  2021-11-18  0:02 ` abenson
                   ` (98 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-17 23:22 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751721509

Comment:
It would not be better for separate PR, I say StormLib, smpq and devilutionX, each having your PR, devilutionX PR would only update, other PR would be new packages. Because it is easier to find failures, to compile everything at once and have strange results. 

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (17 preceding siblings ...)
  2021-11-17 23:22 ` bugcrazy
@ 2021-11-18  0:02 ` abenson
  2021-11-18  0:02 ` abenson
                   ` (97 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-18  0:02 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751778790

Comment:
The `patch_args`

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (18 preceding siblings ...)
  2021-11-18  0:02 ` abenson
@ 2021-11-18  0:02 ` abenson
  2021-11-20  7:01 ` [PR PATCH] [Updated] " bugcrazy
                   ` (96 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2021-11-18  0:02 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751779036

Comment:
If those packages are required for the update, this should be in this PR.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (19 preceding siblings ...)
  2021-11-18  0:02 ` abenson
@ 2021-11-20  7:01 ` bugcrazy
  2021-11-20  7:02 ` [PR REVIEW] " bugcrazy
                   ` (95 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-20  7:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 7023 bytes --]

From 95e2c778e3070f4850389ec3756d9f6b126496bb Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:49:08 -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 <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 c7c0e3373658d8c1732eb4f97848efad8a2a2321 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:50:56 -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 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

From 8a8feb331cb6080ec49629826f4abce9cb6759b7 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:53:54 -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 2d1770c72b4ec95371549fe7f630258745f741ec Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:57:14 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

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

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# 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"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From e189e04cc4332ea91637a354429d4e9d3b50f27d Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:59:28 -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 <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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (20 preceding siblings ...)
  2021-11-20  7:01 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-20  7:02 ` bugcrazy
  2021-11-20  7:14 ` [PR PATCH] [Updated] " bugcrazy
                   ` (94 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-20  7:02 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r753644146

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (21 preceding siblings ...)
  2021-11-20  7:02 ` [PR REVIEW] " bugcrazy
@ 2021-11-20  7:14 ` bugcrazy
  2021-11-20  7:27 ` [PR REVIEW] " bugcrazy
                   ` (93 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-20  7:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 7023 bytes --]

From f17bcc676e7e95def5399a9c4ea362e73e493dca Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:49:08 -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 <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 0848fb18c2e5d5f42a022ec6c1bfb886a7a42d77 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:50:56 -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 a7908585fbbd..c32da1ced636 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

From e4ab5054a02f5bf9c80bd720b69401199a8f5b40 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:53:54 -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 e2897bfc49bf04393cea0b8745863c0a82bc49e4 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:57:14 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

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

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# 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"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1d170ee96def22f568c52e2153c54d2d1c66d8ea Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:59:28 -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 <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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (22 preceding siblings ...)
  2021-11-20  7:14 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-20  7:27 ` bugcrazy
  2021-11-20 14:59 ` Chocimier
                   ` (92 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-20  7:27 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r753646226

Comment:
The creator of devilutionX software, says that the smpq package is optional, but it is not, needs this package to compile. 

https://github.com/diasurgical/devilutionX/blob/master/docs/building.md#if-you-want-to-build-the-devilutionxmpq-file-optional 

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (23 preceding siblings ...)
  2021-11-20  7:27 ` [PR REVIEW] " bugcrazy
@ 2021-11-20 14:59 ` Chocimier
  2021-11-20 22:10 ` [PR PATCH] [Updated] " bugcrazy
                   ` (91 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: Chocimier @ 2021-11-20 14:59 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-974661695

Comment:
StormLib-devel need to depend on StormLib, this should fix cross builds.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (24 preceding siblings ...)
  2021-11-20 14:59 ` Chocimier
@ 2021-11-20 22:10 ` bugcrazy
  2021-11-20 22:12 ` bugcrazy
                   ` (90 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-20 22:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 7023 bytes --]

From f17bcc676e7e95def5399a9c4ea362e73e493dca Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:49:08 -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 <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 0848fb18c2e5d5f42a022ec6c1bfb886a7a42d77 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:50:56 -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 a7908585fbbd..c32da1ced636 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

From e4ab5054a02f5bf9c80bd720b69401199a8f5b40 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:53:54 -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 e2897bfc49bf04393cea0b8745863c0a82bc49e4 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:57:14 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

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

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# 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"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1d170ee96def22f568c52e2153c54d2d1c66d8ea Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:59:28 -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 <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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (25 preceding siblings ...)
  2021-11-20 22:10 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-20 22:12 ` bugcrazy
  2021-11-24 22:02 ` [PR PATCH] [Updated] " bugcrazy
                   ` (89 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-20 22:12 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-974718774

Comment:
> StormLib-devel need to depend on StormLib, this should fix cross builds.

Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (26 preceding siblings ...)
  2021-11-20 22:12 ` bugcrazy
@ 2021-11-24 22:02 ` bugcrazy
  2022-01-03 17:35 ` bugcrazy
                   ` (88 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2021-11-24 22:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 7041 bytes --]

From ef225902adde246e37723fa1d277fa254db3fb93 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <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 e69b92d6380285a7991a0694e1490ef524eedb62 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <marcoaureliopc@gmail.com>
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 <marcoaureliopc@gmail.com>
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 <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 1ee98cd539b330a4303cdb78b4e615e12a8b8064 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (27 preceding siblings ...)
  2021-11-24 22:02 ` [PR PATCH] [Updated] " bugcrazy
@ 2022-01-03 17:35 ` bugcrazy
  2022-04-17  0:32 ` bugcrazy
                   ` (87 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-01-03 17:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 7063 bytes --]

From f94c42446b4ec3b6fd351a9bd14a0e40be662590 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <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 8e1591b3716defae07d6c604ae186fb5c061ecf8 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 999d3ad714b8..f2bcc7558abd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4097,3 +4097,4 @@ libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1
 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
 libcodec2.so.1.0 codec2-1.0.1_1
 libx86emu.so.3 libx86emu-3.4_1
+libstorm.so.9 StormLib-9.23_1

From 8af365cb122d0dcea4fb40a81428a8af41ba1107 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 a6c97766c796ba61e715be9f0a1868dd12f997e6 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <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 0991c2ebc7a31e578745665d8f9e0efdba4b5c9c Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (28 preceding siblings ...)
  2022-01-03 17:35 ` bugcrazy
@ 2022-04-17  0:32 ` bugcrazy
  2022-07-16  2:13 ` devilutionX: update to 1.4.0 github-actions
                   ` (86 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-04-17  0:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.3.0
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: 8433 bytes --]

From 1528755095bdba9f0ff6be4dd9120e594e1ddf7b 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 b58076102b7eb2a769e452d182b1ebafe00a1aa6 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 ae4bb44c57a3..af9f6240e97e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libstorm.so.9 StormLib-9.23_1

From 75e19083638176d779b71f137db0e5254d185896 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 77f30da563773bac0baf487e3116fe10a75ee6aa 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 559d24aa2345669d0e19f71750f824305bbec422 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 1c466e105d420c8909753e5bc343a199868b26e3 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

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (29 preceding siblings ...)
  2022-04-17  0:32 ` bugcrazy
@ 2022-07-16  2:13 ` github-actions
  2022-07-21  9:43 ` [PR PATCH] [Updated] " bugcrazy
                   ` (85 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: github-actions @ 2022-07-16  2:13 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1186062382

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (30 preceding siblings ...)
  2022-07-16  2:13 ` devilutionX: update to 1.4.0 github-actions
@ 2022-07-21  9:43 ` bugcrazy
  2022-07-31  1:37 ` bugcrazy
                   ` (84 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-07-21  9:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.0
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: 8464 bytes --]

From 51d3eeb9725b9936b3cca10af5806b89755ab5f2 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 e00c12b465907a77ec8ada815d38653dcdad4caf 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 c0b708dd7a3d..531955c1b8d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4175,3 +4175,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libqtspell-qt5.so.1 qtspell-1.0.1_1
+libstorm.so.9 StormLib-9.23_1

From 3d8b6f077a7b922edf919d1dbd260c242f372a29 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 4b5a7a4f08d01d684a0262b97c8d97f550600f02 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 f6b030475bf9c6a766f173e8a55c104a83e0eb7f 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 3f0e09d34520698202ed56afff23eba203b0a1fb 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

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (31 preceding siblings ...)
  2022-07-21  9:43 ` [PR PATCH] [Updated] " bugcrazy
@ 2022-07-31  1:37 ` bugcrazy
  2022-07-31  2:39 ` [PR PATCH] [Updated] " bugcrazy
                   ` (83 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-07-31  1:37 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1200327946

Comment:
I'm researching how to solve the problem of compiling on arm architectures.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (32 preceding siblings ...)
  2022-07-31  1:37 ` bugcrazy
@ 2022-07-31  2:39 ` bugcrazy
  2022-10-09  3:59 ` bugcrazy
                   ` (82 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-07-31  2:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.0
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: 8438 bytes --]

From 25641185be6b8c972eae521e41f3f1f7132cbe46 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 3d32eb21987619b178984b84d988519b663fbc12 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 e1f7db32dc2e..f1dcad18f9f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libqtspell-qt5.so.1 qtspell-1.0.1_1
 libopensmtpd.so.0 libopensmtpd-0.7_1
 libiio.so.0 libiio-0.23_1
+libstorm.so.9 StormLib-9.23_1

From 59d65ecfcb86fe54550cfd941f591e0109d9ab04 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 db3eeff664e7f60d5e3eaf519d916d6ffb67153e 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 c275f79bf62e18bc98c0565acbebe7bd8a9bed1c 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 809e38a81ab1f9b3f85cf7d96f57a9b06addc7e2 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

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (33 preceding siblings ...)
  2022-07-31  2:39 ` [PR PATCH] [Updated] " bugcrazy
@ 2022-10-09  3:59 ` bugcrazy
  2022-10-09  4:23 ` devilutionX: update to 1.4.1 (maintainer version) bugcrazy
                   ` (81 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-10-09  3:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 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.0
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: 18821 bytes --]

From 332f2ba8ce8b9e1c9bc9d9c90b411490a8510070 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:07:20 -0300
Subject: [PATCH 1/7] 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 4535d823b4b0b984132f41290fc41a6405e1ef61 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:34 -0300
Subject: [PATCH 2/7] Added shared library

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

diff --git a/common/shlibs b/common/shlibs
index 4ff73dace83f..111cb73aea05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4184,3 +4184,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libstorm.so.9 StormLib-9.23_1

From d568dc916266ba1f493d57af9f48ef5bf3ddcacb Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:51 -0300
Subject: [PATCH 3/7] 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 794fa6b3edad658f0c7ea9d6c83f2a6eb782a139 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:25 -0300
Subject: [PATCH 4/7] 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 8235e8e6a7a2bbe373bbc804c554467bb214c1a6 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:56 -0300
Subject: [PATCH 5/7] 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 085d6cc6655f9223930c59e2630fe49537464e78 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 16 Apr 2022 22:29:51 -0300
Subject: [PATCH 6/7] update to 1.4.0

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

From 72f2af7ce43ba5251fe4267dbd04c2ca57b26b4c Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 9 Oct 2022 01:54:03 -0300
Subject: [PATCH 7/7] update to 1.4.1

---
 srcpkgs/devilutionX/files/FindSDL2.cmake | 255 +++++++++++++++++++++++
 srcpkgs/devilutionX/template             |  19 +-
 2 files changed, 270 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 5320acd47513..5b231d2640a3 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,28 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=OFF"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel bzip2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+	# Zerotier is disabled by AES compile errors
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch64*) configure_args+=" -DDISABLE_ZERO_TIER=ON"
+	;;
+esac
+
+	# arm* and aarch64* architectures do not find SDL2
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (34 preceding siblings ...)
  2022-10-09  3:59 ` bugcrazy
@ 2022-10-09  4:23 ` bugcrazy
  2022-12-05  1:55 ` [PR PATCH] [Updated] " bugcrazy
                   ` (80 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-10-09  4:23 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1272451893

Comment:
I used the xlint tool, no problems in templates.
I await PR approval.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (35 preceding siblings ...)
  2022-10-09  4:23 ` devilutionX: update to 1.4.1 (maintainer version) bugcrazy
@ 2022-12-05  1:55 ` bugcrazy
  2022-12-22 14:12 ` bugcrazy
                   ` (79 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-12-05  1:55 UTC (permalink / raw)
  To: ml

[-- 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: 18561 bytes --]

From 5dbb6f916c082e927cc87cbf212089089de281f1 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:07:20 -0300
Subject: [PATCH 1/7] 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 6e853c0a7e7056f12372c967df1c0a90a4c4f023 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:34 -0300
Subject: [PATCH 2/7] Added shared library

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

diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..e082e1f56e9f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4220,3 +4220,4 @@ libkshark.so.2 libkshark-2.1.1_1
 libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
 libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
+libstorm.so.9 StormLib-9.23_1

From a191024314be77be7d1004b09a336ef3a68e66ac Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:51 -0300
Subject: [PATCH 3/7] 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 26134f811c0055f1ee5df3b20533314a434ea1e1 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:25 -0300
Subject: [PATCH 4/7] 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 976e6a13d851a810924b519f01830de83b9a9e3e Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:56 -0300
Subject: [PATCH 5/7] 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 fdd81b9095d45caaedd7336595504b35ade93332 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 16 Apr 2022 22:29:51 -0300
Subject: [PATCH 6/7] update to 1.4.0

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

From 0548100f36e7d53d6099082087192d611f090ed6 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 9 Oct 2022 01:54:03 -0300
Subject: [PATCH 7/7] 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 5320acd47513..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,21 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
+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 bzip2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (36 preceding siblings ...)
  2022-12-05  1:55 ` [PR PATCH] [Updated] " bugcrazy
@ 2022-12-22 14:12 ` bugcrazy
  2023-01-08 17:03 ` bugcrazy
                   ` (78 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2022-12-22 14:12 UTC (permalink / raw)
  To: ml

[-- 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: 18550 bytes --]

From 1436e527170f995fbf2d02710ca701cc6c989b3d Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:07:20 -0300
Subject: [PATCH 1/7] 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 1f22cd6b8fcdad2f0d63b10fd2b142915f445d6a Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:34 -0300
Subject: [PATCH 2/7] Added shared library

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

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..5ac45053df82 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4220,3 +4220,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libstorm.so.9 StormLib-9.23_1

From 988a3c91187b14beb45934c2a3f08cde7a5dcebc Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:51 -0300
Subject: [PATCH 3/7] 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 8513fd8a956e3a3389c33126790d7f1b5c806cc7 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:25 -0300
Subject: [PATCH 4/7] 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 8f96a8bd0fd002e9897902bc84c98bba602045df Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:56 -0300
Subject: [PATCH 5/7] 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 54a60aa14f85d0e824e23db71da31694e4fc8122 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 16 Apr 2022 22:29:51 -0300
Subject: [PATCH 6/7] update to 1.4.0

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

From e5178d51c1f8479bd434f24083a9e50e3bc97ecb Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 9 Oct 2022 01:54:03 -0300
Subject: [PATCH 7/7] 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 5320acd47513..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,21 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
+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 bzip2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (37 preceding siblings ...)
  2022-12-22 14:12 ` bugcrazy
@ 2023-01-08 17:03 ` bugcrazy
  2023-01-10  0:18 ` bugcrazy
                   ` (77 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-08 17:03 UTC (permalink / raw)
  To: ml

[-- 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: 18546 bytes --]

From 76a15dc7845b1a2712bbe2073e35425ed42eb8bc Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:07:20 -0300
Subject: [PATCH 1/7] 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 fede93a1181fc8e84890625dac117e7cfed81ea7 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:34 -0300
Subject: [PATCH 2/7] Added shared library

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

diff --git a/common/shlibs b/common/shlibs
index 349c183cdb38..19742c95e43d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4220,3 +4220,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
+libstorm.so.9 StormLib-9.23_1

From 24d8e050cd361536a30fb2f64dd48a3f11a7f6e6 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:51 -0300
Subject: [PATCH 3/7] 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 13cf513372ce253072f923dc38878b6e7e48b591 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:25 -0300
Subject: [PATCH 4/7] 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 ad6b45903e7fb45f8b27221df38f3fcafd3b2833 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:56 -0300
Subject: [PATCH 5/7] 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 0d5634b1241295c266b6b77b15a05a8e548437c4 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 16 Apr 2022 22:29:51 -0300
Subject: [PATCH 6/7] update to 1.4.0

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

From 4e7262cddfe4c519d775826bfe3c624f06749c38 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 9 Oct 2022 01:54:03 -0300
Subject: [PATCH 7/7] 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 5320acd47513..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,21 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
+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 bzip2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (38 preceding siblings ...)
  2023-01-08 17:03 ` bugcrazy
@ 2023-01-10  0:18 ` bugcrazy
  2023-01-10  0:31 ` bugcrazy
                   ` (76 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-10  0:18 UTC (permalink / raw)
  To: ml

[-- 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: 18600 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/7] 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/7] 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/7] 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/7] 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/7] 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 71f240831ceb156004b40a27f8aba83882034db0 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 16 Apr 2022 22:29:51 -0300
Subject: [PATCH 6/7] update to 1.4.0

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index e146d594bdd9..5320acd47513 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
 hostmakedepends="git gettext pkg-config smpq"
-makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
+makedepends="SDL2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
 
 post_install() {
 	vlicense LICENSE

From 7c2a8bf3c6b7f3ffb8077c7a7dbd6edc91b3a72c Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 9 Oct 2022 01:54:03 -0300
Subject: [PATCH 7/7] 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 5320acd47513..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,21 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DBUILD_TESTING=off"
+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 bzip2-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=0cbb3df85c92838d3ecb08110535dc37cd926b15ec9576e2c6c33f67ddce27da
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (39 preceding siblings ...)
  2023-01-10  0:18 ` bugcrazy
@ 2023-01-10  0:31 ` bugcrazy
  2023-01-10  0:51 ` abenson
                   ` (75 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-10  0:31 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1376545387

Comment:
@abenson , do you have a suggestion for improving the templates or a recommendation for merging?

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (40 preceding siblings ...)
  2023-01-10  0:31 ` bugcrazy
@ 2023-01-10  0:51 ` abenson
  2023-01-10  0:51 ` abenson
                   ` (74 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-10  0:51 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1376563597

Comment:
Squash the commits into one per template.  Make sure they follow the used convention.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (41 preceding siblings ...)
  2023-01-10  0:51 ` abenson
@ 2023-01-10  0:51 ` abenson
  2023-01-10 15:41 ` [PR PATCH] [Updated] " bugcrazy
                   ` (73 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-10  0:51 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1376563597

Comment:
Squash the commits into one per template.  Make sure they follow conventions in CONTRIBUTING.md.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (42 preceding siblings ...)
  2023-01-10  0:51 ` abenson
@ 2023-01-10 15:41 ` bugcrazy
  2023-01-10 15:44 ` bugcrazy
                   ` (72 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-10 15:41 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (43 preceding siblings ...)
  2023-01-10 15:41 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-10 15:44 ` bugcrazy
  2023-01-10 16:03 ` bugcrazy
                   ` (71 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-10 15:44 UTC (permalink / raw)
  To: ml

[-- 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: 15044 bytes --]

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

Added shared library

Added Symbolic link

New package: StormLib-9.23.

New package: smpq-1.6.

update to 1.4.0

update to 1.4.1

Code cleanup
---
 common/shlibs                                 |   1 +
 srcpkgs/StormLib-devel                        |   1 +
 srcpkgs/StormLib/template                     |  26 ++
 srcpkgs/devilutionX/files/FindSDL2.cmake      | 255 ++++++++++++++++++
 srcpkgs/devilutionX/template                  |  13 +-
 .../smpq/patches/fix-smpq-compilation.patch   |  53 ++++
 srcpkgs/smpq/template                         |  19 ++
 7 files changed, 364 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template
 create mode 100644 srcpkgs/devilutionX/files/FindSDL2.cmake
 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 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
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..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"
+	}
+}
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 829ff248926b..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,21 @@
 # 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 <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 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..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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (44 preceding siblings ...)
  2023-01-10 15:44 ` bugcrazy
@ 2023-01-10 16:03 ` bugcrazy
  2023-01-11  0:11 ` abenson
                   ` (70 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-10 16:03 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1377493370

Comment:
@abenson, done: commit squashed.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (45 preceding siblings ...)
  2023-01-10 16:03 ` bugcrazy
@ 2023-01-11  0:11 ` abenson
  2023-01-11  0:11 ` [PR REVIEW] " abenson
                   ` (69 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11  0:11 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1378062548

Comment:
> Squash the commits into one per template.

You squashed them all into a single commit.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (46 preceding siblings ...)
  2023-01-11  0:11 ` abenson
@ 2023-01-11  0:11 ` abenson
  2023-01-11  0:14 ` abenson
                   ` (68 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11  0:11 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066461351

Comment:
depends="StormLib>=${version}_${revision}"

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (47 preceding siblings ...)
  2023-01-11  0:11 ` [PR REVIEW] " abenson
@ 2023-01-11  0:14 ` abenson
  2023-01-11  0:15 ` abenson
                   ` (67 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11  0:14 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066462512

Comment:
Why is this needed?  There's nothing I see in StormLib that would be needed on the host.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (48 preceding siblings ...)
  2023-01-11  0:14 ` abenson
@ 2023-01-11  0:15 ` abenson
  2023-01-11  4:54 ` ahesford
                   ` (66 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11  0:15 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066462896

Comment:
This does nothing, why is it here?

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (49 preceding siblings ...)
  2023-01-11  0:15 ` abenson
@ 2023-01-11  4:54 ` ahesford
  2023-01-11  4:59 ` ahesford
                   ` (65 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-11  4:54 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066571732

Comment:
This matter isn't resolved. Separate these new packages into individual commits in this PR.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (50 preceding siblings ...)
  2023-01-11  4:54 ` ahesford
@ 2023-01-11  4:59 ` ahesford
  2023-01-11  5:47 ` [PR PATCH] [Updated] " bugcrazy
                   ` (64 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-11  4:59 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066573779

Comment:
Where is this file coming from, why is it needed, and why is it not provided by upstream if it is actually needed?

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (51 preceding siblings ...)
  2023-01-11  4:59 ` ahesford
@ 2023-01-11  5:47 ` bugcrazy
  2023-01-11  5:47 ` [PR REVIEW] " bugcrazy
                   ` (63 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  5:47 UTC (permalink / raw)
  To: ml

[-- 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: 15086 bytes --]

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

Added shared library

Added Symbolic link

New package: StormLib-9.23.

New package: smpq-1.6.

update to 1.4.0

update to 1.4.1

Code cleanup

Added suggestion to template
---
 common/shlibs                                 |   1 +
 srcpkgs/StormLib-devel                        |   1 +
 srcpkgs/StormLib/template                     |  26 ++
 srcpkgs/devilutionX/files/FindSDL2.cmake      | 255 ++++++++++++++++++
 srcpkgs/devilutionX/template                  |  13 +-
 .../smpq/patches/fix-smpq-compilation.patch   |  53 ++++
 srcpkgs/smpq/template                         |  19 ++
 7 files changed, 364 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template
 create mode 100644 srcpkgs/devilutionX/files/FindSDL2.cmake
 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 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
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..ad48bbc2ef47
--- /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}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
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 829ff248926b..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,21 @@
 # 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 <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 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..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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (52 preceding siblings ...)
  2023-01-11  5:47 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-11  5:47 ` bugcrazy
  2023-01-11  5:54 ` bugcrazy
                   ` (62 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  5:47 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066593688

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (53 preceding siblings ...)
  2023-01-11  5:47 ` [PR REVIEW] " bugcrazy
@ 2023-01-11  5:54 ` bugcrazy
  2023-01-11  5:59 ` bugcrazy
                   ` (61 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  5:54 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066596848

Comment:
smpq depends on StormLib to create the MPQ file, version devillutionX 1.2.1 everything was built-in, now it's not.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (54 preceding siblings ...)
  2023-01-11  5:54 ` bugcrazy
@ 2023-01-11  5:59 ` bugcrazy
  2023-01-11  6:01 ` bugcrazy
                   ` (60 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  5:59 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066599077

Comment:
The software is old, you have to go into the folder to build some files and then another folder to build the software, cmake doesn't do that.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (55 preceding siblings ...)
  2023-01-11  5:59 ` bugcrazy
@ 2023-01-11  6:01 ` bugcrazy
  2023-01-11  6:09 ` bugcrazy
                   ` (59 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  6:01 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066596848

Comment:
smpq depends on StormLib to create the MPQ file, version devilutionX 1.2.1 everything was built-in, now it's not.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (56 preceding siblings ...)
  2023-01-11  6:01 ` bugcrazy
@ 2023-01-11  6:09 ` bugcrazy
  2023-01-11  6:24 ` bugcrazy
                   ` (58 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  6:09 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066604735

Comment:
The file was present in devilutionX 1.2.1, in later versions removed, with the file, other cpu architectures (example: arm and ppc), can find SDL, without the file, SDL found by i686 and x86_64.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (57 preceding siblings ...)
  2023-01-11  6:09 ` bugcrazy
@ 2023-01-11  6:24 ` bugcrazy
  2023-01-11  6:45 ` kruceter
                   ` (57 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-11  6:24 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1066612468

Comment:
Found with "hostmakedepends", which "depends", by cmake.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (58 preceding siblings ...)
  2023-01-11  6:24 ` bugcrazy
@ 2023-01-11  6:45 ` kruceter
  2023-01-11 18:03 ` [PR REVIEW] " abenson
                   ` (56 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-11  6:45 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1378306123

Comment:
Marco, would you mind to take a look at my work on this package at kruceter#2?

My proposal includes the work made in #39184.

In addition to that all dependencies are fetched with xbps-src, just like they should be.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (59 preceding siblings ...)
  2023-01-11  6:45 ` kruceter
@ 2023-01-11 18:03 ` abenson
  2023-01-11 18:04 ` abenson
                   ` (55 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11 18:03 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1067303345

Comment:
But this literally does not build it, this CDs into the directory and then exits.  It gets built in the do_install phase, which is unaffected by this.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (60 preceding siblings ...)
  2023-01-11 18:03 ` [PR REVIEW] " abenson
@ 2023-01-11 18:04 ` abenson
  2023-01-11 18:05 ` abenson
                   ` (54 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11 18:04 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1067304677

Comment:
If it depends on StormLib, StormLib-devel should go in makedepends; if its doing anything with the .so in hostmakedepends, then its wrong.  StormLib should be detected in depends as long as the entry in common/shlibs is correct and it links correctly.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (61 preceding siblings ...)
  2023-01-11 18:04 ` abenson
@ 2023-01-11 18:05 ` abenson
  2023-01-13  2:21 ` [PR PATCH] [Updated] " bugcrazy
                   ` (53 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-11 18:05 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1067303345

Comment:
But this literally does not build it, this changes into the directory and then exits.  It gets built in the do_install phase, which is unaffected by this.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (62 preceding siblings ...)
  2023-01-11 18:05 ` abenson
@ 2023-01-13  2:21 ` bugcrazy
  2023-01-13  2:33 ` bugcrazy
                   ` (52 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  2:21 UTC (permalink / raw)
  To: ml

[-- 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: 15357 bytes --]

From 59503820ffca607a889931b06bb3bf0e37568be1 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:15:19 -0300
Subject: [PATCH 1/3] update to 1.4.1

---
 srcpkgs/devilutionX/files/FindSDL2.cmake | 255 +++++++++++++++++++++++
 srcpkgs/devilutionX/template             |  13 +-
 2 files changed, 264 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 829ff248926b..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,21 @@
 # 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 <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

From 236a13a1f07147ca05aa5510f038390a04557cf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:18:44 -0300
Subject: [PATCH 2/3] New package: StormLib-9.23.

---
 common/shlibs             |  1 +
 srcpkgs/StormLib-devel    |  1 +
 srcpkgs/StormLib/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template

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
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..ad48bbc2ef47
--- /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}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From e6ef8e3a48ed55e29ac0afcd6f4fee92f3c7511c Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:20:31 -0300
Subject: [PATCH 3/3] 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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (63 preceding siblings ...)
  2023-01-13  2:21 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-13  2:33 ` bugcrazy
  2023-01-13  2:40 ` [PR REVIEW] " bugcrazy
                   ` (51 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  2:33 UTC (permalink / raw)
  To: ml

[-- 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: 15355 bytes --]

From 55fa3104b4aa31aa61fef68d1a7ab56f81e6fceb Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:30:13 -0300
Subject: [PATCH 1/3] update to 1.4.1

---
 srcpkgs/devilutionX/files/FindSDL2.cmake | 255 +++++++++++++++++++++++
 srcpkgs/devilutionX/template             |  13 +-
 2 files changed, 264 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 829ff248926b..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,21 @@
 # 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 <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

From fd096839a56592b4d73335f717c8a056a1555886 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:31:29 -0300
Subject: [PATCH 2/3] New package: StormLib-9.23

---
 common/shlibs             |  1 +
 srcpkgs/StormLib-devel    |  1 +
 srcpkgs/StormLib/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template

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
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..ad48bbc2ef47
--- /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}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 96e4f7995198ff44dac04446fd008feed4858212 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:32:12 -0300
Subject: [PATCH 3/3] 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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (64 preceding siblings ...)
  2023-01-13  2:33 ` bugcrazy
@ 2023-01-13  2:40 ` bugcrazy
  2023-01-13  2:52 ` [PR PATCH] [Updated] " bugcrazy
                   ` (50 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  2:40 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1068864556

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (65 preceding siblings ...)
  2023-01-13  2:40 ` [PR REVIEW] " bugcrazy
@ 2023-01-13  2:52 ` bugcrazy
  2023-01-13  3:06 ` [PR REVIEW] " bugcrazy
                   ` (49 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  2:52 UTC (permalink / raw)
  To: ml

[-- 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: 15368 bytes --]

From d851fdb9964318c534b52333bcbedb4c3921eb89 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:48:08 -0300
Subject: [PATCH 1/3] devilutionX: update to 1.4.1

---
 srcpkgs/devilutionX/files/FindSDL2.cmake | 255 +++++++++++++++++++++++
 srcpkgs/devilutionX/template             |  13 +-
 2 files changed, 264 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 829ff248926b..b9a83a78bfc1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,21 @@
 # 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 <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+
+pre_configure() {
+	cp ${FILESDIR}/FindSDL2.cmake ${XBPS_BUILDDIR}/devilutionX-${version}/CMake/finders
+}
 
 post_install() {
 	vlicense LICENSE

From b07ba9b8ce1f4186b150fce23ffaf1419ccee875 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:49:04 -0300
Subject: [PATCH 2/3] New package: StormLib-9.23

---
 common/shlibs             |  1 +
 srcpkgs/StormLib-devel    |  1 +
 srcpkgs/StormLib/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template

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
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..ad48bbc2ef47
--- /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}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 026abd93efe707f4baad3b2a8b8c498b4a73e6d5 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Thu, 12 Jan 2023 23:49:36 -0300
Subject: [PATCH 3/3] 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
+}

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (66 preceding siblings ...)
  2023-01-13  2:52 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-13  3:06 ` bugcrazy
  2023-01-13  3:16 ` bugcrazy
                   ` (48 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  3:06 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1068876153

Comment:
I changed "hostmakedepends" to "depends", this error message appears on compilation:

CMake Error at CMakeLists.txt:43 (message):
  StormLib or storm library not found


-- Configuring incomplete, errors occurred!
See also "/builddir/smpq-1.6/build/CMakeFiles/CMakeOutput.log".
=> ERROR: smpq-1.6_1: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1                                           
=> ERROR:   in do_configure() at common/build-style/cmake.sh:75 

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (67 preceding siblings ...)
  2023-01-13  3:06 ` [PR REVIEW] " bugcrazy
@ 2023-01-13  3:16 ` bugcrazy
  2023-01-13  3:34 ` bugcrazy
                   ` (47 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  3:16 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1068880087

Comment:
This method of entering the folder and leaving the folder, avoids this error message and completes the package creation process:

=> ERROR: smpq-1.6_1: PKGDESTDIR is empty and build_style != meta
=> ERROR: smpq-1.6_1: cannot continue with installation! 


^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (68 preceding siblings ...)
  2023-01-13  3:16 ` bugcrazy
@ 2023-01-13  3:34 ` bugcrazy
  2023-01-13 14:10 ` [PR REVIEW] " abenson
                   ` (46 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-13  3:34 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1381274435

Comment:
> Marco, would you mind to take a look at my work on this package at [kruceter#2](https://github.com/kruceter/void-packages/pull/2)?
> 
> My proposal includes the work made in #39184.
> 
> In addition to that all dependencies are fetched with xbps-src, just like they should be.

I will see!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (69 preceding siblings ...)
  2023-01-13  3:34 ` bugcrazy
@ 2023-01-13 14:10 ` abenson
  2023-01-13 14:17 ` abenson
                   ` (45 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-13 14:10 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069505830

Comment:
It shouldn't go in `depends`, either, that'll be automatically detected.  I removed the `hostmakedepends` line and the `do_build()` function (since it doesn't do anything).  `smpq` built fine.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (70 preceding siblings ...)
  2023-01-13 14:10 ` [PR REVIEW] " abenson
@ 2023-01-13 14:17 ` abenson
  2023-01-13 14:22 ` abenson
                   ` (44 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-13 14:17 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069505830

Comment:
It shouldn't go in `depends`, either, that'll be automatically detected.  I removed the `hostmakedepends` line and the `do_build()` function (since it doesn't do anything).  `smpq` built fine.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (71 preceding siblings ...)
  2023-01-13 14:17 ` abenson
@ 2023-01-13 14:22 ` abenson
  2023-01-13 14:25 ` ahesford
                   ` (43 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-13 14:22 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069519126

Comment:
I can't recreate the issue to which you're referring; I removed the `hostmakedepends` line and the pointless `do_build()` and it builds just fine.

```
% cat srcpkgs/smpq/template 
# 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 <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
```

```
=> Registering new packages to /host/binpkgs/patch-9
index: added `smpq-1.6_1' (aarch64).
```

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (72 preceding siblings ...)
  2023-01-13 14:22 ` abenson
@ 2023-01-13 14:25 ` ahesford
  2023-01-13 14:38 ` ahesford
                   ` (42 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-13 14:25 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1068876153

Comment:
I changed "hostmakedepends" to "depends", this error message appears on compilation:

```bash
CMake Error at CMakeLists.txt:43 (message):
  StormLib or storm library not found


-- Configuring incomplete, errors occurred!
See also "/builddir/smpq-1.6/build/CMakeFiles/CMakeOutput.log".
=> ERROR: smpq-1.6_1: do_configure: 'CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${LIBS:+-DCMAKE_C_STANDARD_LIBRARIES="$LIBS"} ${LIBS:+-DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS"} ${wrksrc}/${build_wrksrc}' exited with 1                                           
=> ERROR:   in do_configure() at common/build-style/cmake.sh:75 
```

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (74 preceding siblings ...)
  2023-01-13 14:38 ` ahesford
@ 2023-01-13 14:38 ` ahesford
  2023-01-13 14:38 ` ahesford
                   ` (40 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-13 14:38 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069532575

Comment:
In that case, let's not carry the file but fetch it from upstream. See the suggestions below.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (73 preceding siblings ...)
  2023-01-13 14:25 ` ahesford
@ 2023-01-13 14:38 ` ahesford
  2023-01-13 14:38 ` ahesford
                   ` (41 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-13 14:38 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069531458

Comment:
```suggestion
distfiles="
 https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz
 https://raw.githubusercontent.com/diasurgical/devilutionX/1.2.1/CMake/FindSDL2.cmake
"
```

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (75 preceding siblings ...)
  2023-01-13 14:38 ` ahesford
@ 2023-01-13 14:38 ` ahesford
  2023-01-13 14:43 ` abenson
                   ` (39 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-13 14:38 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069536181

Comment:
In addition to using the file fetched from upstream (which requires `skip_extraction` to avoid confusing `xbps-src`), these kinds of file manipulations belong in `post_extract` so that it is possible to inspect the complete version of the source tree after `xbps-src -I extract <pkg>`. Also, avoid using absolute paths like `$XBPS_BUILDDIR` and instead rely on the fact that all of these functions will run in `${wkrsrc}`.

```suggestion
skip_extraction="FindSDL2.cmake"

post_extract() {
	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/FindSDL2.cmake CMake/finders
}
```

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (76 preceding siblings ...)
  2023-01-13 14:38 ` ahesford
@ 2023-01-13 14:43 ` abenson
  2023-01-14 23:59 ` [PR PATCH] [Updated] " bugcrazy
                   ` (38 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: abenson @ 2023-01-13 14:43 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1069542429

Comment:
I agree; the less vendoring of files the better.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (77 preceding siblings ...)
  2023-01-13 14:43 ` abenson
@ 2023-01-14 23:59 ` bugcrazy
  2023-01-15  0:02 ` [PR REVIEW] " bugcrazy
                   ` (37 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-14 23:59 UTC (permalink / raw)
  To: ml

[-- 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: 7042 bytes --]

From 202553ec1bb72d67a88d430b48355c25b5f4a91f Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 14 Jan 2023 20:57:04 -0300
Subject: [PATCH 1/3] devilutionX: update to 1.4.1

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

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..1b70bb2cca89 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,27 @@
 # 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 <marcoaureliopc@gmail.com>"
 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 7b84ce43dd0c019d0ed37cdf8df2de04ffe6ea97 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 14 Jan 2023 20:57:59 -0300
Subject: [PATCH 2/3] 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..2a0dd33ad98c
--- /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="-DCMAKE_BUILD_TYPE=Release -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 <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=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 04213e4f27e29994b27def1cf8b36647cb3888fc Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 14 Jan 2023 20:58:27 -0300
Subject: [PATCH 3/3] New package: smpq-1.6

---
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 13 +++++
 2 files changed, 66 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..fe1907fb7443
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,13 @@
+# 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 <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

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (78 preceding siblings ...)
  2023-01-14 23:59 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-15  0:02 ` bugcrazy
  2023-01-15  0:02 ` bugcrazy
                   ` (36 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  0:02 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070457851

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (79 preceding siblings ...)
  2023-01-15  0:02 ` [PR REVIEW] " bugcrazy
@ 2023-01-15  0:02 ` bugcrazy
  2023-01-15  0:04 ` bugcrazy
                   ` (35 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  0:02 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070457912

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (80 preceding siblings ...)
  2023-01-15  0:02 ` bugcrazy
@ 2023-01-15  0:04 ` bugcrazy
  2023-01-15  0:05 ` bugcrazy
                   ` (34 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  0:04 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070458275

Comment:
The problem was related to StormLib version 9.23, I updated to 9.24 and removed the lines from the smpq template.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (81 preceding siblings ...)
  2023-01-15  0:04 ` bugcrazy
@ 2023-01-15  0:05 ` bugcrazy
  2023-01-15  0:06 ` bugcrazy
                   ` (33 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  0:05 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070458286

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (82 preceding siblings ...)
  2023-01-15  0:05 ` bugcrazy
@ 2023-01-15  0:06 ` bugcrazy
  2023-01-15  0:07 ` bugcrazy
                   ` (32 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  0:06 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070460199

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (83 preceding siblings ...)
  2023-01-15  0:06 ` bugcrazy
@ 2023-01-15  0:07 ` bugcrazy
  2023-01-15  0:11 ` kruceter
                   ` (31 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  0:07 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070461488

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (84 preceding siblings ...)
  2023-01-15  0:07 ` bugcrazy
@ 2023-01-15  0:11 ` kruceter
  2023-01-15  0:12 ` kruceter
                   ` (30 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  0:11 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070463215

Comment:
> other cpu architectures (example: arm and ppc), can find SDL, without the file, SDL found by i686 and x86_64.

I find this statement misleading and possibly false, since I was able to compile this package without the supplied `FindSDL2.cmake`.

Since I see this pull request is going nowhere, may I invite you over to #voidlinux on libera.chat to discuss your work on this package in more detail?

Thank you.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (85 preceding siblings ...)
  2023-01-15  0:11 ` kruceter
@ 2023-01-15  0:12 ` kruceter
  2023-01-15  0:26 ` classabbyamp
                   ` (29 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  0:12 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070463215

Comment:
> other cpu architectures (example: arm and ppc), can find SDL, without the file, SDL found by i686 and x86_64.

I find this statement misleading and possibly false, since I was able to compile this package without the supplied `FindSDL2.cmake`.

Since I see this pull request's progress is going nowhere, may I invite you over to #voidlinux on libera.chat to discuss your work on this package in more detail?

Thank you.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (87 preceding siblings ...)
  2023-01-15  0:26 ` classabbyamp
@ 2023-01-15  0:26 ` classabbyamp
  2023-01-15  0:26 ` classabbyamp
                   ` (27 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: classabbyamp @ 2023-01-15  0:26 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070464899

Comment:
```suggestion
distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz
 https://raw.githubusercontent.com/diasurgical/devilutionX/1.2.1/CMake/FindSDL2.cmake"
```
indentation

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (88 preceding siblings ...)
  2023-01-15  0:26 ` classabbyamp
@ 2023-01-15  0:26 ` classabbyamp
  2023-01-15  0:26 ` classabbyamp
                   ` (26 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: classabbyamp @ 2023-01-15  0:26 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070464878

Comment:
```suggestion
	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/FindSDL2.cmake CMake/finders
```
indentation

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (89 preceding siblings ...)
  2023-01-15  0:26 ` classabbyamp
@ 2023-01-15  0:26 ` classabbyamp
  2023-01-15  1:09 ` [PR PATCH] [Updated] " bugcrazy
                   ` (25 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: classabbyamp @ 2023-01-15  0:26 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070465033

Comment:
```suggestion
configure_args="-DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
```
don't set cmake build type unless absolutely necessary, it is defined in the build style

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (86 preceding siblings ...)
  2023-01-15  0:12 ` kruceter
@ 2023-01-15  0:26 ` classabbyamp
  2023-01-15  0:26 ` classabbyamp
                   ` (28 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: classabbyamp @ 2023-01-15  0:26 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070465714

Comment:
```suggestion
homepage="https://launchpad.net/smpq"
changelog="https://bazaar.launchpad.net/~pali/smpq/trunk/view/head:/CHANGELOG"
```

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (90 preceding siblings ...)
  2023-01-15  0:26 ` classabbyamp
@ 2023-01-15  1:09 ` bugcrazy
  2023-01-15  1:12 ` [PR REVIEW] " bugcrazy
                   ` (24 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  1:09 UTC (permalink / raw)
  To: ml

[-- 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: 7088 bytes --]

From 5b9cceae0f26452ce65c9d5666353d8a98907c72 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 14 Jan 2023 22:07:48 -0300
Subject: [PATCH 1/3] 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 <marcoaureliopc@gmail.com>"
 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 3588644f3ca1afb9a30fe9d1302a0cf35108200b Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 14 Jan 2023 22:08:24 -0300
Subject: [PATCH 2/3] 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 <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=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 b091a7a6ba7f210c978862b7c59a6299df451926 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 14 Jan 2023 22:08:42 -0300
Subject: [PATCH 3/3] 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 <marcoaureliopc@gmail.com>"
+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

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (91 preceding siblings ...)
  2023-01-15  1:09 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-15  1:12 ` bugcrazy
  2023-01-15  1:13 ` bugcrazy
                   ` (23 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  1:12 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070471128

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (92 preceding siblings ...)
  2023-01-15  1:12 ` [PR REVIEW] " bugcrazy
@ 2023-01-15  1:13 ` bugcrazy
  2023-01-15  1:13 ` bugcrazy
                   ` (22 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  1:13 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070471152

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (93 preceding siblings ...)
  2023-01-15  1:13 ` bugcrazy
@ 2023-01-15  1:13 ` bugcrazy
  2023-01-15  1:14 ` bugcrazy
                   ` (21 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  1:13 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070471179

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (94 preceding siblings ...)
  2023-01-15  1:13 ` bugcrazy
@ 2023-01-15  1:14 ` bugcrazy
  2023-01-15  1:29 ` kruceter
                   ` (20 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  1:14 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070471198

Comment:
Done!

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (95 preceding siblings ...)
  2023-01-15  1:14 ` bugcrazy
@ 2023-01-15  1:29 ` kruceter
  2023-01-15  1:29 ` kruceter
                   ` (19 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  1:29 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070472094

Comment:
```suggestion
makedepends="SDL2-devel SDL2_image-devel libpng-devel bzip2-devel
 libsodium-devel fmt-devel zlib-devel asio"
```

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (97 preceding siblings ...)
  2023-01-15  1:29 ` kruceter
@ 2023-01-15  1:29 ` kruceter
  2023-01-15  3:41 ` [PR PATCH] [Updated] " bugcrazy
                   ` (17 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  1:29 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070472209

Comment:
It builds perfectly without `FindSDL2.cmake`. Remove.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (96 preceding siblings ...)
  2023-01-15  1:29 ` kruceter
@ 2023-01-15  1:29 ` kruceter
  2023-01-15  1:29 ` kruceter
                   ` (18 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  1:29 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070471316

Comment:
```suggestion
configure_args="-DVERSION_NUM=$version -DBUILD_TESTING=OFF -DDISABLE_ZERO_TIER=ON"
```

`BINARY_RELEASE` is removed upstream.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (98 preceding siblings ...)
  2023-01-15  1:29 ` kruceter
@ 2023-01-15  3:41 ` bugcrazy
  2023-01-15  3:47 ` [PR REVIEW] " bugcrazy
                   ` (16 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  3:41 UTC (permalink / raw)
  To: ml

[-- 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: 8033 bytes --]

From 5b9cceae0f26452ce65c9d5666353d8a98907c72 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
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 <marcoaureliopc@gmail.com>"
 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 <marcoaureliopc@gmail.com>
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 <marcoaureliopc@gmail.com>
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 <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=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 <marcoaureliopc@gmail.com>
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 <marcoaureliopc@gmail.com>"
+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

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (99 preceding siblings ...)
  2023-01-15  3:41 ` [PR PATCH] [Updated] " bugcrazy
@ 2023-01-15  3:47 ` bugcrazy
  2023-01-15  4:03 ` bugcrazy
                   ` (15 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  3:47 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070495076

Comment:
This option is no longer needed. There is a lot of inconstancy in the source code of devilutionX, a lot of code is removed and added, it makes compiling difficult.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (100 preceding siblings ...)
  2023-01-15  3:47 ` [PR REVIEW] " bugcrazy
@ 2023-01-15  4:03 ` bugcrazy
  2023-01-15  4:05 ` bugcrazy
                   ` (14 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  4:03 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070496190

Comment:
You did it, making a complex template, downloading a lot of software "manually", which makes maintenance more complicated, it is not easy to compile versions after 1.2.1, several distros would not yet have version 1.2.1 in their repositories, due to the problem with find SDL2 on various cpus architectures.

https://pkgs.org/download/devilutionx-32bit
https://pkgs.org/download/devilutionx

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (101 preceding siblings ...)
  2023-01-15  4:03 ` bugcrazy
@ 2023-01-15  4:05 ` bugcrazy
  2023-01-15  4:14 ` bugcrazy
                   ` (13 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  4:05 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070496370

Comment:
Some software is downloaded by cmake and statically compiled, there is no need to add it to the template.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (102 preceding siblings ...)
  2023-01-15  4:05 ` bugcrazy
@ 2023-01-15  4:14 ` bugcrazy
  2023-01-15  5:22 ` kruceter
                   ` (12 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15  4:14 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070497082

Comment:
If it were false, several distros would not have version 1.2.1 in their repositories yet, and NetBSD uses version 1.2.1, due to problems compiling on various cpu architectures.

PR is making progress yes, Void devs are suggesting improvements and standardizing template.


^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (103 preceding siblings ...)
  2023-01-15  4:14 ` bugcrazy
@ 2023-01-15  5:22 ` kruceter
  2023-01-15  5:22 ` kruceter
                   ` (11 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  5:22 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070504898

Comment:
> You did it, making a complex template, downloading a lot of software "manually", which makes maintenance more complicated

No, it does not make maintenance complicated. In fact, this is practiced here.

In fact, if you really want to download git revisions by abusing bandwidth every single time on every clean rebuild - be my guest. I am not sure whether committers will let this go off the hook easily.

> it is not easy to compile versions after 1.2.1, several distros would not yet have version 1.2.1 in their repositories

How come if it is not easy to compile after 1.2.1 when I could, Marco?

> due to the problem with find SDL2 on various cpus architectures.

Do you have any proof that SDL2 is not found "on various cpu architectures"?

How can you explain SDL2 being found here on void (be it native or cross) successfully without this cursed file in my case?

The urls provided by you are not convincing, i.e. not telling anything at all.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (104 preceding siblings ...)
  2023-01-15  5:22 ` kruceter
@ 2023-01-15  5:22 ` kruceter
  2023-01-15  5:23 ` kruceter
                   ` (10 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  5:22 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070504898

Comment:
> You did it, making a complex template, downloading a lot of software "manually", which makes maintenance more complicated

No, it does not make maintenance complicated. In fact, this is practiced here.

If you really want to download git revisions by abusing bandwidth every single time on every clean rebuild - be my guest. I am not sure whether committers will let this go off the hook easily.

> it is not easy to compile versions after 1.2.1, several distros would not yet have version 1.2.1 in their repositories

How come if it is not easy to compile after 1.2.1 when I could, Marco?

> due to the problem with find SDL2 on various cpus architectures.

Do you have any proof that SDL2 is not found "on various cpu architectures"?

How can you explain SDL2 being found here on void (be it native or cross) successfully without this cursed file in my case?

The urls provided by you are not convincing, i.e. not telling anything at all.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (105 preceding siblings ...)
  2023-01-15  5:22 ` kruceter
@ 2023-01-15  5:23 ` kruceter
  2023-01-15  5:30 ` kruceter
                   ` (9 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  5:23 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070504898

Comment:
> You did it, making a complex template, downloading a lot of software "manually", which makes maintenance more complicated

No, it does not make maintenance complicated. In fact, this is practiced here.

If you really want to download git revisions by abusing bandwidth every single time on every clean rebuild - be my guest. I am not sure whether committers will let this go off the hook easily.

> it is not easy to compile versions after 1.2.1, several distros would not yet have version 1.2.1 in their repositories

How come it is not easy to compile after 1.2.1 when I could, Marco?

> due to the problem with find SDL2 on various cpus architectures.

Do you have any proof that SDL2 is not found "on various cpu architectures"?

How can you explain SDL2 being found here on void (be it native or cross) successfully without this cursed file in my case?

The urls provided by you are not convincing, i.e. not telling anything at all.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (106 preceding siblings ...)
  2023-01-15  5:23 ` kruceter
@ 2023-01-15  5:30 ` kruceter
  2023-01-15 13:06 ` ahesford
                   ` (8 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: kruceter @ 2023-01-15  5:30 UTC (permalink / raw)
  To: ml

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070505487

Comment:
Bundled source code is used provided the repository does not have them packaged. Your explanation is horribly wrong here.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (107 preceding siblings ...)
  2023-01-15  5:30 ` kruceter
@ 2023-01-15 13:06 ` ahesford
  2023-01-15 15:58 ` bugcrazy
                   ` (7 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-15 13:06 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070590183

Comment:
> You did it, making a complex template, downloading a lot of software "manually", which makes maintenance more complicated, it is not easy to compile versions after 1.2.1, several distros would not yet have version 1.2.1 in their repositories, due to the problem with find SDL2 on various cpus architectures.

If CMake is fetching submodules at build time, that is unacceptable. Void templates should explicitly fetch all components of a build so that we can verify that the contents are as expected and the process is as reproducible as possible.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (108 preceding siblings ...)
  2023-01-15 13:06 ` ahesford
@ 2023-01-15 15:58 ` bugcrazy
  2023-01-15 16:38 ` bugcrazy
                   ` (6 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15 15:58 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070628440

Comment:
I use the most performative packages and methods, if the author of devilutionX uses X package and indicates it for use, I will use it, even if it is static.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (109 preceding siblings ...)
  2023-01-15 15:58 ` bugcrazy
@ 2023-01-15 16:38 ` bugcrazy
  2023-01-15 16:40 ` bugcrazy
                   ` (5 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15 16:38 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070636823

Comment:
> > You did it, making a complex template, downloading a lot of software "manually", which makes maintenance more complicated
> 
> No, it does not make maintenance complicated. In fact, this is practiced here.
> 
Yes, it's complicated, it's a simple game, not a gcc template version.
> If you really want to download git revisions by abusing bandwidth every single time on every clean rebuild - be my guest. I am not sure whether committers will let this go off the hook easily.
> 
I applied the suggestions from the Void devs, each suggestion came from a different dev, so I had to apply and resubmit the PR. Besides, version 1.2.1 always had static packages, this is nothing new.
> > it is not easy to compile versions after 1.2.1, several distros would not yet have version 1.2.1 in their repositories
> 
> How come it is not easy to compile after 1.2.1 when I could, Marco?
> 
From the 1.3.x series, the FindSDL2.cmake file is removed, so it only compiles for i686 and x86_64, the 1.2.x series had arm binary package for Linux in the github of devilutionX, in the 1.3.x series it was removed.

Then try compiling the 1.3.x series for non-x86 architectures, using the 1.2.1 template as a reference!
> > due to the problem with find SDL2 on various cpus architectures.
> 
> Do you have any proof that SDL2 is not found "on various cpu architectures"?
> 
Try compiling the 1.3.x series for non-x86, using the default cmake configuration from deviltutionx.
> How can you explain SDL2 being found here on void (be it native or cross) successfully without this cursed file in my case?
> 
You have disabled the option to download static software and download them manually, so there is no SDL2 check.
> The urls provided by you are not convincing, i.e. not telling anything at all.

You didn't look at the links, there are only three versions of devilutionX 1.2.1; 1.4.0 and 1.4.1.

  Why does version 1.2.1 exist in distro repositories?

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (110 preceding siblings ...)
  2023-01-15 16:38 ` bugcrazy
@ 2023-01-15 16:40 ` bugcrazy
  2023-01-15 16:43 ` ahesford
                   ` (4 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15 16:40 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070637794

Comment:
> If CMake is fetching submodules at build time, that is unacceptable. Void templates should explicitly fetch all components of a build so that we can verify that the contents are as expected and the process is as reproducible as possible.

It's not a submodule! The same process exists since version 1.2.1.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (111 preceding siblings ...)
  2023-01-15 16:40 ` bugcrazy
@ 2023-01-15 16:43 ` ahesford
  2023-01-15 17:07 ` bugcrazy
                   ` (3 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-15 16:43 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070638192

Comment:
That means we've been doing it wrong and it needs to be fixed.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (112 preceding siblings ...)
  2023-01-15 16:43 ` ahesford
@ 2023-01-15 17:07 ` bugcrazy
  2023-01-15 17:12 ` ahesford
                   ` (2 subsequent siblings)
  116 siblings, 0 replies; 118+ messages in thread
From: bugcrazy @ 2023-01-15 17:07 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070643285

Comment:
> That means we've been doing it wrong and it needs to be fixed.

So in software made in GO and rust, is it necessary to create a template that downloads all the libraries manually, creating unnecessary lines in the template, just because the libraries don't come with source code?

What can be done is to add software that is in the Void repositories in "hostmakedepends" and "makedepends" or maybe create new packages that are not in the repositories, this is the only way to prevent cmake from downloading static software libraries, they are not submodules , I consider this approach unnecessary, as the template is ready.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (113 preceding siblings ...)
  2023-01-15 17:07 ` bugcrazy
@ 2023-01-15 17:12 ` ahesford
  2023-01-15 19:32 ` classabbyamp
  2023-01-15 19:32 ` [PR PATCH] [Closed]: " classabbyamp
  116 siblings, 0 replies; 118+ messages in thread
From: ahesford @ 2023-01-15 17:12 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r1070645457

Comment:
Consider it unnecessary if you want, but that's what we expect.

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (114 preceding siblings ...)
  2023-01-15 17:12 ` ahesford
@ 2023-01-15 19:32 ` classabbyamp
  2023-01-15 19:32 ` [PR PATCH] [Closed]: " classabbyamp
  116 siblings, 0 replies; 118+ messages in thread
From: classabbyamp @ 2023-01-15 19:32 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-1383232393

Comment:
done in #41658 

^ permalink raw reply	[flat|nested] 118+ messages in thread

* Re: [PR PATCH] [Closed]: devilutionX: update to 1.4.1 (maintainer version)
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (115 preceding siblings ...)
  2023-01-15 19:32 ` classabbyamp
@ 2023-01-15 19:32 ` classabbyamp
  116 siblings, 0 replies; 118+ messages in thread
From: classabbyamp @ 2023-01-15 19:32 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

devilutionX: update to 1.4.1 (maintainer version)
https://github.com/void-linux/void-packages/pull/34039

Description:
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
-->


^ permalink raw reply	[flat|nested] 118+ messages in thread

end of thread, other threads:[~2023-01-15 19:32 UTC | newest]

Thread overview: 118+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
2021-11-12  8:32 ` bugcrazy
2021-11-12  8:44 ` [PR PATCH] [Updated] " bugcrazy
2021-11-14 20:11 ` [PR REVIEW] " abenson
2021-11-14 20:12 ` abenson
2021-11-14 20:14 ` abenson
2021-11-14 20:14 ` abenson
2021-11-14 20:32 ` [PR REVIEW] " abenson
2021-11-14 20:40 ` abenson
2021-11-17  3:30 ` [PR PATCH] [Updated] " bugcrazy
2021-11-17  3:31 ` [PR REVIEW] " bugcrazy
2021-11-17  3:32 ` bugcrazy
2021-11-17  3:33 ` bugcrazy
2021-11-17  3:44 ` [PR PATCH] [Updated] " bugcrazy
2021-11-17  3:45 ` [PR REVIEW] " bugcrazy
2021-11-17  3:46 ` bugcrazy
2021-11-17  5:25 ` bugcrazy
2021-11-17 18:16 ` abenson
2021-11-17 23:22 ` bugcrazy
2021-11-18  0:02 ` abenson
2021-11-18  0:02 ` abenson
2021-11-20  7:01 ` [PR PATCH] [Updated] " bugcrazy
2021-11-20  7:02 ` [PR REVIEW] " bugcrazy
2021-11-20  7:14 ` [PR PATCH] [Updated] " bugcrazy
2021-11-20  7:27 ` [PR REVIEW] " bugcrazy
2021-11-20 14:59 ` Chocimier
2021-11-20 22:10 ` [PR PATCH] [Updated] " bugcrazy
2021-11-20 22:12 ` bugcrazy
2021-11-24 22:02 ` [PR PATCH] [Updated] " bugcrazy
2022-01-03 17:35 ` bugcrazy
2022-04-17  0:32 ` bugcrazy
2022-07-16  2:13 ` devilutionX: update to 1.4.0 github-actions
2022-07-21  9:43 ` [PR PATCH] [Updated] " bugcrazy
2022-07-31  1:37 ` bugcrazy
2022-07-31  2:39 ` [PR PATCH] [Updated] " bugcrazy
2022-10-09  3:59 ` bugcrazy
2022-10-09  4:23 ` devilutionX: update to 1.4.1 (maintainer version) bugcrazy
2022-12-05  1:55 ` [PR PATCH] [Updated] " bugcrazy
2022-12-22 14:12 ` bugcrazy
2023-01-08 17:03 ` bugcrazy
2023-01-10  0:18 ` bugcrazy
2023-01-10  0:31 ` bugcrazy
2023-01-10  0:51 ` abenson
2023-01-10  0:51 ` abenson
2023-01-10 15:41 ` [PR PATCH] [Updated] " bugcrazy
2023-01-10 15:44 ` bugcrazy
2023-01-10 16:03 ` bugcrazy
2023-01-11  0:11 ` abenson
2023-01-11  0:11 ` [PR REVIEW] " abenson
2023-01-11  0:14 ` abenson
2023-01-11  0:15 ` abenson
2023-01-11  4:54 ` ahesford
2023-01-11  4:59 ` ahesford
2023-01-11  5:47 ` [PR PATCH] [Updated] " bugcrazy
2023-01-11  5:47 ` [PR REVIEW] " bugcrazy
2023-01-11  5:54 ` bugcrazy
2023-01-11  5:59 ` bugcrazy
2023-01-11  6:01 ` bugcrazy
2023-01-11  6:09 ` bugcrazy
2023-01-11  6:24 ` bugcrazy
2023-01-11  6:45 ` kruceter
2023-01-11 18:03 ` [PR REVIEW] " abenson
2023-01-11 18:04 ` abenson
2023-01-11 18:05 ` abenson
2023-01-13  2:21 ` [PR PATCH] [Updated] " bugcrazy
2023-01-13  2:33 ` bugcrazy
2023-01-13  2:40 ` [PR REVIEW] " bugcrazy
2023-01-13  2:52 ` [PR PATCH] [Updated] " bugcrazy
2023-01-13  3:06 ` [PR REVIEW] " bugcrazy
2023-01-13  3:16 ` bugcrazy
2023-01-13  3:34 ` bugcrazy
2023-01-13 14:10 ` [PR REVIEW] " abenson
2023-01-13 14:17 ` abenson
2023-01-13 14:22 ` abenson
2023-01-13 14:25 ` ahesford
2023-01-13 14:38 ` ahesford
2023-01-13 14:38 ` ahesford
2023-01-13 14:38 ` ahesford
2023-01-13 14:43 ` abenson
2023-01-14 23:59 ` [PR PATCH] [Updated] " bugcrazy
2023-01-15  0:02 ` [PR REVIEW] " bugcrazy
2023-01-15  0:02 ` bugcrazy
2023-01-15  0:04 ` bugcrazy
2023-01-15  0:05 ` bugcrazy
2023-01-15  0:06 ` bugcrazy
2023-01-15  0:07 ` bugcrazy
2023-01-15  0:11 ` kruceter
2023-01-15  0:12 ` kruceter
2023-01-15  0:26 ` classabbyamp
2023-01-15  0:26 ` classabbyamp
2023-01-15  0:26 ` classabbyamp
2023-01-15  0:26 ` classabbyamp
2023-01-15  1:09 ` [PR PATCH] [Updated] " bugcrazy
2023-01-15  1:12 ` [PR REVIEW] " bugcrazy
2023-01-15  1:13 ` bugcrazy
2023-01-15  1:13 ` bugcrazy
2023-01-15  1:14 ` bugcrazy
2023-01-15  1:29 ` kruceter
2023-01-15  1:29 ` kruceter
2023-01-15  1:29 ` kruceter
2023-01-15  3:41 ` [PR PATCH] [Updated] " bugcrazy
2023-01-15  3:47 ` [PR REVIEW] " bugcrazy
2023-01-15  4:03 ` bugcrazy
2023-01-15  4:05 ` bugcrazy
2023-01-15  4:14 ` bugcrazy
2023-01-15  5:22 ` kruceter
2023-01-15  5:22 ` kruceter
2023-01-15  5:23 ` kruceter
2023-01-15  5:30 ` kruceter
2023-01-15 13:06 ` ahesford
2023-01-15 15:58 ` bugcrazy
2023-01-15 16:38 ` bugcrazy
2023-01-15 16:40 ` bugcrazy
2023-01-15 16:43 ` ahesford
2023-01-15 17:07 ` bugcrazy
2023-01-15 17:12 ` ahesford
2023-01-15 19:32 ` classabbyamp
2023-01-15 19:32 ` [PR PATCH] [Closed]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).