* [PR PATCH] devilutionX: update to 1.5.2
@ 2024-02-09 15:12 MIvanchev
2024-02-09 15:13 ` [PR PATCH] [Updated] " MIvanchev
` (56 more replies)
0 siblings, 57 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-09 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
There is a new pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 1464 bytes --]
From 1cd0337e9edaa3943be1dbda4ea5d8753ad4d2e5 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..8aacf2e5a5838 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,11 +9,11 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
@ 2024-02-09 15:13 ` MIvanchev
2024-02-09 19:09 ` [PR PATCH] [Updated] [WIP] " MIvanchev
` (55 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-09 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 1492 bytes --]
From cabbd4d0ff127eb2ba2180286275ab4cb3c050c0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..1d36fd7169ef4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,12 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
2024-02-09 15:13 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-02-09 19:09 ` MIvanchev
2024-02-09 19:13 ` MIvanchev
` (54 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-09 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 1893 bytes --]
From b9002b40cefe46a8bd1f13535f0d3730c4395541 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..5459338ff8aab 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+_assets_version=4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
2024-02-09 15:13 ` [PR PATCH] [Updated] " MIvanchev
2024-02-09 19:09 ` [PR PATCH] [Updated] [WIP] " MIvanchev
@ 2024-02-09 19:13 ` MIvanchev
2024-02-09 19:52 ` MIvanchev
` (53 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-09 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 1892 bytes --]
From 28c92736a1829f893adca45fceb0a77735520f45 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..72d00e1620570 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (2 preceding siblings ...)
2024-02-09 19:13 ` MIvanchev
@ 2024-02-09 19:52 ` MIvanchev
2024-02-10 10:33 ` MIvanchev
` (52 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-09 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 1914 bytes --]
From 6f43dcd3da716751d065e2fa0c5421a4c174155e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..7319275c4459a 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (3 preceding siblings ...)
2024-02-09 19:52 ` MIvanchev
@ 2024-02-10 10:33 ` MIvanchev
2024-02-10 10:36 ` MIvanchev
` (51 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 10:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3308 bytes --]
From 2e6c157b2a7f04e63110bdbf23305cb3361aeb19 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
srcpkgs/simpleini-devel | 1 +
srcpkgs/simpleini/template | 26 ++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/simpleini-devel
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..7319275c4459a 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini-devel b/srcpkgs/simpleini-devel
new file mode 120000
index 0000000000000..5d732171fc4b4
--- /dev/null
+++ b/srcpkgs/simpleini-devel
@@ -0,0 +1 @@
+simpleini/
\ No newline at end of file
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..ee9e0ce19d2e5
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,26 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
+
+simpleini-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/share
+ }
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (4 preceding siblings ...)
2024-02-10 10:33 ` MIvanchev
@ 2024-02-10 10:36 ` MIvanchev
2024-02-10 10:41 ` MIvanchev
` (50 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3280 bytes --]
From 57d6c8972b2c5973f9d0afbaaf9cb3b072090b5d Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
srcpkgs/simpleini-devel | 1 +
srcpkgs/simpleini/template | 26 ++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/simpleini-devel
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..7319275c4459a 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini-devel b/srcpkgs/simpleini-devel
new file mode 120000
index 0000000000000..5d732171fc4b4
--- /dev/null
+++ b/srcpkgs/simpleini-devel
@@ -0,0 +1 @@
+simpleini/
\ No newline at end of file
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..f42f6b51f8b2f
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,26 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
+
+simpleini-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/share
+ }
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (5 preceding siblings ...)
2024-02-10 10:36 ` MIvanchev
@ 2024-02-10 10:41 ` MIvanchev
2024-02-10 10:48 ` MIvanchev
` (49 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 10:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3280 bytes --]
From a8e944c477a1d80cf60413c8286b38e715a9b2ca Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
srcpkgs/simpleini-devel | 1 +
srcpkgs/simpleini/template | 26 ++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/simpleini-devel
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..7319275c4459a 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini-devel b/srcpkgs/simpleini-devel
new file mode 120000
index 0000000000000..5d732171fc4b4
--- /dev/null
+++ b/srcpkgs/simpleini-devel
@@ -0,0 +1 @@
+simpleini/
\ No newline at end of file
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..f42f6b51f8b2f
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,26 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
+
+simpleini-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/share
+ }
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (6 preceding siblings ...)
2024-02-10 10:41 ` MIvanchev
@ 2024-02-10 10:48 ` MIvanchev
2024-02-10 10:57 ` MIvanchev
` (48 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 10:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3074 bytes --]
From f46f2fd010f572d5b2fa33c92e250d298f628bb6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 20 ++++++++++++++------
srcpkgs/simpleini-devel | 1 +
srcpkgs/simpleini/template | 17 +++++++++++++++++
3 files changed, 32 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/simpleini-devel
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..7319275c4459a 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,8 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +10,19 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini-devel b/srcpkgs/simpleini-devel
new file mode 120000
index 0000000000000..5d732171fc4b4
--- /dev/null
+++ b/srcpkgs/simpleini-devel
@@ -0,0 +1 @@
+simpleini/
\ No newline at end of file
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..de7483a46e23a
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,17 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (7 preceding siblings ...)
2024-02-10 10:48 ` MIvanchev
@ 2024-02-10 10:57 ` MIvanchev
2024-02-10 16:48 ` MIvanchev
` (47 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3140 bytes --]
From 3aa44372fd922f205797cdd10c9af8d94e65e822 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 22 +++++++++++++++-------
srcpkgs/simpleini-devel | 1 +
srcpkgs/simpleini/template | 17 +++++++++++++++++
3 files changed, 33 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/simpleini-devel
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..2ab5c6231035c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,28 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
+makedepends="simpleini SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="spawn.mpq"
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini-devel b/srcpkgs/simpleini-devel
new file mode 120000
index 0000000000000..5d732171fc4b4
--- /dev/null
+++ b/srcpkgs/simpleini-devel
@@ -0,0 +1 @@
+simpleini/
\ No newline at end of file
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..de7483a46e23a
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,17 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (8 preceding siblings ...)
2024-02-10 10:57 ` MIvanchev
@ 2024-02-10 16:48 ` MIvanchev
2024-02-10 17:05 ` MIvanchev
` (46 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 16:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3693 bytes --]
From 200e21acb721205c9e49df2867fc400f4039e988 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 37 ++++++++++++++++++++++++++++--------
srcpkgs/simpleini-devel | 1 +
srcpkgs/simpleini/template | 17 +++++++++++++++++
3 files changed, 47 insertions(+), 8 deletions(-)
create mode 120000 srcpkgs/simpleini-devel
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..bff1a0e099d8f 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,41 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS="${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
+makedepends="simpleini SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${simpleini_wrksrc}" ${_simpleini_version}.tar.gz
+}
+
+pre_build() {
+ cd "${simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini-devel b/srcpkgs/simpleini-devel
new file mode 120000
index 0000000000000..5d732171fc4b4
--- /dev/null
+++ b/srcpkgs/simpleini-devel
@@ -0,0 +1 @@
+simpleini/
\ No newline at end of file
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..de7483a46e23a
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,17 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (9 preceding siblings ...)
2024-02-10 16:48 ` MIvanchev
@ 2024-02-10 17:05 ` MIvanchev
2024-02-10 17:12 ` MIvanchev
` (45 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3459 bytes --]
From e4aebb1de991e103884cb3b73b0c75c1829edcea Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 38 ++++++++++++++++++++++++++++--------
srcpkgs/simpleini/template | 17 ++++++++++++++++
2 files changed, 47 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/simpleini/template
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..2ebfe3fc3fc44 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,42 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
+makedepends="simpleini SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${simpleini_wrksrc}" ${_simpleini_version}.tar.gz
+}
+
+pre_build() {
+ cd "${simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/simpleini/template b/srcpkgs/simpleini/template
new file mode 100644
index 0000000000000..de7483a46e23a
--- /dev/null
+++ b/srcpkgs/simpleini/template
@@ -0,0 +1,17 @@
+# Template file for 'simpleini'
+pkgname=simpleini
+version=4.22
+revision=1
+build_style=cmake
+configure_args="-DSIMPLEINI_USE_SYSTEM_GTEST=ON"
+makedepends="gtest-devel"
+short_desc="Simple C++ API to read and write INI-style configuration files"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/brofield/simpleini"
+distfiles="https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz"
+checksum=b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+
+post_install() {
+ vlicense LICENCE.txt
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (10 preceding siblings ...)
2024-02-10 17:05 ` MIvanchev
@ 2024-02-10 17:12 ` MIvanchev
2024-02-10 17:16 ` MIvanchev
` (44 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 2600 bytes --]
From 4098802cd6d3bf311faacbb4c321c9bebc1e7cad Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 38 ++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..ac66f44c4ca61 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,42 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
+makedepends="simpleini SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" ${_simpleini_version}.tar.gz
+}
+
+pre_build() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (11 preceding siblings ...)
2024-02-10 17:12 ` MIvanchev
@ 2024-02-10 17:16 ` MIvanchev
2024-02-10 17:22 ` MIvanchev
` (43 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 2520 bytes --]
From 6e8f609224002de38659205b6839c0fa779757aa Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..214ec39df07e4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,42 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" ${_simpleini_version}.tar.gz
+}
+
+pre_build() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (12 preceding siblings ...)
2024-02-10 17:16 ` MIvanchev
@ 2024-02-10 17:22 ` MIvanchev
2024-02-10 17:30 ` MIvanchev
` (42 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 2521 bytes --]
From 5462208c130470be7ba0d7154ff1e828d0684ff5 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..3b5cbc967d17c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,42 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+}
+
+pre_build() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (13 preceding siblings ...)
2024-02-10 17:22 ` MIvanchev
@ 2024-02-10 17:30 ` MIvanchev
2024-02-11 10:46 ` MIvanchev
` (41 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-10 17:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 2525 bytes --]
From 16307e40e9970391c6e01050488625c727bb2155 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..6620406d29308 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,42 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (14 preceding siblings ...)
2024-02-10 17:30 ` MIvanchev
@ 2024-02-11 10:46 ` MIvanchev
2024-02-11 10:51 ` MIvanchev
` (40 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 10:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3680 bytes --]
From 130b5c9a972080014927ee8403f2c528b138688b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 68 ++++++++++++++++++++++++++++++++----
1 file changed, 61 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..de5473ce4d785 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,74 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_hash="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" v${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${sdl_audiolib_wrksrc}-install" \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${sdl_audiolib_wrksrc}-install:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (15 preceding siblings ...)
2024-02-11 10:46 ` MIvanchev
@ 2024-02-11 10:51 ` MIvanchev
2024-02-11 11:00 ` MIvanchev
` (39 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3686 bytes --]
From 9a451febdfde68a26bd9630d65e5d898ec48f35b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 68 ++++++++++++++++++++++++++++++++----
1 file changed, 61 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..ad2f04a3a18ba9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,74 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_hash="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" v${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (16 preceding siblings ...)
2024-02-11 10:51 ` MIvanchev
@ 2024-02-11 11:00 ` MIvanchev
2024-02-11 11:03 ` MIvanchev
` (38 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3686 bytes --]
From 1c7713eb757e1905deaf8b35000efa70fd66d16e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 68 ++++++++++++++++++++++++++++++++----
1 file changed, 61 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..d8dfabd180a10 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,74 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" v${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (17 preceding siblings ...)
2024-02-11 11:00 ` MIvanchev
@ 2024-02-11 11:03 ` MIvanchev
2024-02-11 11:10 ` MIvanchev
` (37 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3755 bytes --]
From 2b23a480dcfa3842ba99d81980ac4549fcfa710c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 69 ++++++++++++++++++++++++++++++++----
1 file changed, 62 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..443988262a369c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,75 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" v${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (18 preceding siblings ...)
2024-02-11 11:03 ` MIvanchev
@ 2024-02-11 11:10 ` MIvanchev
2024-02-11 11:40 ` MIvanchev
` (36 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3754 bytes --]
From 5b1a524f9e6c813c6f9c4b3d75bc642f68093b54 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 69 ++++++++++++++++++++++++++++++++----
1 file changed, 62 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..f18d48ac919b61 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,75 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (19 preceding siblings ...)
2024-02-11 11:10 ` MIvanchev
@ 2024-02-11 11:40 ` MIvanchev
2024-02-11 11:54 ` MIvanchev
` (35 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3789 bytes --]
From 8ac7aa10261a73582f928a15a7ae7a75eae65d6c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 72 ++++++++++++++++++++++++++++++++----
1 file changed, 65 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9bb93593b8a540 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,78 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (20 preceding siblings ...)
2024-02-11 11:40 ` MIvanchev
@ 2024-02-11 11:54 ` MIvanchev
2024-02-11 11:55 ` MIvanchev
` (34 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3833 bytes --]
From 1c9996caeeb53507d6f32cdabccfb203b88bde3a Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 73 ++++++++++++++++++++++++++++++++----
1 file changed, 66 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..54a9c17a41f61 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,79 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install/lib64/pkgconfig:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (21 preceding siblings ...)
2024-02-11 11:54 ` MIvanchev
@ 2024-02-11 11:55 ` MIvanchev
2024-02-11 11:55 ` MIvanchev
` (33 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3835 bytes --]
From c49bba7e2bdadbbf5b977e43885c8417e2021851 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 73 ++++++++++++++++++++++++++++++++----
1 file changed, 66 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..54a9c17a41f610 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,79 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install/lib64/pkgconfig:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (22 preceding siblings ...)
2024-02-11 11:55 ` MIvanchev
@ 2024-02-11 11:55 ` MIvanchev
2024-02-11 12:06 ` MIvanchev
` (32 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 11:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3881 bytes --]
From 6f0c6a3d359db1d54aab283281178eff0779ddea Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 73 ++++++++++++++++++++++++++++++++----
1 file changed, 66 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..1d87c80b2afa01 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,79 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install/lib64/pkgconfig:${_sdl_audiolib_wrksrc}-install/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (23 preceding siblings ...)
2024-02-11 11:55 ` MIvanchev
@ 2024-02-11 12:06 ` MIvanchev
2024-02-11 18:12 ` MIvanchev
` (31 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 12:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 3907 bytes --]
From 5237af34538b290b0677b3184e67b319a1097c28 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/template | 73 ++++++++++++++++++++++++++++++++----
1 file changed, 66 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..76d18925014f4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,79 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_SRCDISTDIR}/simpleini-${_simpleini_version}"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_SRCDISTDIR}/sdl_audiolib-${_sdl_audiolib_hash}"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+ cd "${_simpleini_wrksrc}"
+ cmake . -B build -DSIMPLEINI_USE_SYSTEM_GTEST=ON
+ cmake --build build
+
+ cd "${_sdl_audiolib_wrksrc}"
+ CFLAGS=-fPIC CXXFLAGS=-fPIC cmake . -B build -DCMAKE_INSTALL_PREFIX="${_sdl_audiolib_wrksrc}-install" \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_SYSTEM_FMTLIB=ON \
+ -DUSE_RESAMP_SRC=OFF \
+ -DUSE_RESAMP_SOXR=OFF \
+ -DDISABLE_EXCEPTIONS=ON \
+ -DUSE_DEC_DRWAV=ON \
+ -DUSE_DEC_DRFLAC=OFF \
+ -DUSE_DEC_OPENMPT=OFF \
+ -DUSE_DEC_XMP=OFF \
+ -DUSE_DEC_MODPLUG=OFF \
+ -DUSE_DEC_MPG123=OFF \
+ -DUSE_DEC_SNDFILE=OFF \
+ -DUSE_DEC_LIBVORBIS=OFF \
+ -DUSE_DEC_LIBOPUSFILE=OFF \
+ -DUSE_DEC_FLAC=OFF \
+ -DUSE_DEC_MUSEPACK=OFF \
+ -DUSE_DEC_FLUIDSYNTH=OFF \
+ -DUSE_DEC_BASSMIDI=OFF \
+ -DUSE_DEC_WILDMIDI=OFF \
+ -DUSE_DEC_ADLMIDI=OFF \
+ -DUSE_DEC_DRMP3=ON
+ cmake --build build
+ cmake --install build
+
+ PKG_CONFIG_PATH="${_sdl_audiolib_wrksrc}-install/lib64/pkgconfig:${_sdl_audiolib_wrksrc}-install/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig"
+ export PKG_CONFIG_PATH
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (24 preceding siblings ...)
2024-02-11 12:06 ` MIvanchev
@ 2024-02-11 18:12 ` MIvanchev
2024-02-11 18:15 ` MIvanchev
` (30 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4395 bytes --]
From bedfa7a2fcad9bdc217b0fe8315e585362b545ef Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++++++
srcpkgs/devilutionX/template | 40 ++++++++++++++++++++-----
2 files changed, 62 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..9d1e5e4885af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,46 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_BUILDDIR}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_BUILDDIR}/sdl_audiolib"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (25 preceding siblings ...)
2024-02-11 18:12 ` MIvanchev
@ 2024-02-11 18:15 ` MIvanchev
2024-02-11 18:17 ` MIvanchev
` (29 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4395 bytes --]
From 2195ec1d1e8e8d0744a696a236224eca28c3f69a Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++++++
srcpkgs/devilutionX/template | 40 ++++++++++++++++++++-----
2 files changed, 62 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..9d1e5e4885af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,46 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_BUILDDIR}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_BUILDDIR}/sdl_audiolib"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_configure() {
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (26 preceding siblings ...)
2024-02-11 18:15 ` MIvanchev
@ 2024-02-11 18:17 ` MIvanchev
2024-02-11 18:23 ` MIvanchev
` (28 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4372 bytes --]
From 52231af2cefbbe41931ddb511a22255322e96b40 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 +++++++++++++++++++
srcpkgs/devilutionX/template | 37 ++++++++++++++++++++-----
2 files changed, 59 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..2f9de9a956a2e 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,20 +1,43 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_BUILDDIR}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_BUILDDIR}/sdl_audiolib"
build_style=cmake
-configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
+configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON -DSIMPLEINI_INCLUDE_DIRS=${_simpleini_wrksrc}"
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (27 preceding siblings ...)
2024-02-11 18:17 ` MIvanchev
@ 2024-02-11 18:23 ` MIvanchev
2024-02-11 18:42 ` MIvanchev
` (27 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4280 bytes --]
From 78c62e1e4f3a75b0cb9b4e0a77b500072f249c96 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++++++++
srcpkgs/devilutionX/template | 35 ++++++++++++++++++++-----
2 files changed, 58 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..50edd9c5bb2e5 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${XBPS_BUILDDIR}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${XBPS_BUILDDIR}/sdl_audiolib"
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,30 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (28 preceding siblings ...)
2024-02-11 18:23 ` MIvanchev
@ 2024-02-11 18:42 ` MIvanchev
2024-02-11 18:44 ` MIvanchev
` (26 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4285 bytes --]
From 991e45a7f3e872f8c65743615e0a4ca55ac1f90a Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++++++++
srcpkgs/devilutionX/template | 36 ++++++++++++++++++++-----
2 files changed, 59 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..656205d1f09e9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${wrksrc}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${wrksrc}/sdl_audiolib"
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,31 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+source_wrksrc=yes
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (29 preceding siblings ...)
2024-02-11 18:42 ` MIvanchev
@ 2024-02-11 18:44 ` MIvanchev
2024-02-11 18:56 ` MIvanchev
` (25 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4285 bytes --]
From c4a04b5a6f4667855efbf2e61d482dcfff8221ec Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++++++++
srcpkgs/devilutionX/template | 36 ++++++++++++++++++++-----
2 files changed, 59 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..266fc4cf9b7fb 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${wrksrc}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${wrksrc}/sdl_audiolib"
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,31 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+create_wrksrc=yes
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (30 preceding siblings ...)
2024-02-11 18:44 ` MIvanchev
@ 2024-02-11 18:56 ` MIvanchev
2024-02-11 19:03 ` MIvanchev
` (24 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 18:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 12086 bytes --]
From bcd444938148204ce06933228e1c5ba736e6d5dc Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/abaddon/files/abaddon.desktop | 8 ++++
srcpkgs/abaddon/patches/cmake.patch | 14 +++++++
srcpkgs/abaddon/template | 53 +++++++++++++++++++++++++
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++
srcpkgs/devilutionX/template | 38 +++++++++++++++---
srcpkgs/neko/template | 14 +++++++
srcpkgs/ocaml-ppxlib/template | 24 +++++++++++
srcpkgs/ocaml-sedlex/template | 23 +++++++++++
srcpkgs/ocaml-stdlib-shims/template | 22 ++++++++++
9 files changed, 219 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/abaddon/files/abaddon.desktop
create mode 100644 srcpkgs/abaddon/patches/cmake.patch
create mode 100644 srcpkgs/abaddon/template
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
create mode 100644 srcpkgs/neko/template
create mode 100644 srcpkgs/ocaml-ppxlib/template
create mode 100644 srcpkgs/ocaml-sedlex/template
create mode 100644 srcpkgs/ocaml-stdlib-shims/template
diff --git a/srcpkgs/abaddon/files/abaddon.desktop b/srcpkgs/abaddon/files/abaddon.desktop
new file mode 100644
index 0000000000000..7515311284c34
--- /dev/null
+++ b/srcpkgs/abaddon/files/abaddon.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=abaddon
+Type=Application
+Comment=Alternative Discord client using GTK
+Exec=/usr/bin/abaddon
+TryExec=/usr/bin/abaddon
+Icon=abaddon
+Categories=Network;InstantMessaging;
diff --git a/srcpkgs/abaddon/patches/cmake.patch b/srcpkgs/abaddon/patches/cmake.patch
new file mode 100644
index 0000000000000..c42868a25ae5c
--- /dev/null
+++ b/srcpkgs/abaddon/patches/cmake.patch
@@ -0,0 +1,14 @@
+fix cross-build
+
+--- a/CMakeLists.txt 2023-08-29 00:30:45.000000000 -0400
++++ b/CMakeLists.txt 2023-10-17 12:40:08.372798709 -0400
+@@ -212,7 +212,8 @@
+ NAMES miniaudio.h
+ HINTS subprojects
+ PATH_SUFFIXES miniaudio
+- REQUIRED)
++ REQUIRED
++ NO_CMAKE_FIND_ROOT_PATH)
+
+ if (APPLE)
+ target_link_libraries(abaddon "-framework CoreFoundation")
diff --git a/srcpkgs/abaddon/template b/srcpkgs/abaddon/template
new file mode 100644
index 0000000000000..3181aeac920bb
--- /dev/null
+++ b/srcpkgs/abaddon/template
@@ -0,0 +1,53 @@
+# Template file for 'abaddon'
+pkgname=abaddon
+version=0.1.14
+revision=1
+_ixwebsocket_commit="bc765e73a31ea5372e36d1b1add036af3218cb17"
+_keychain_commit="502312f59fdc44fa1103e67f8f17cec3affb82d9"
+_miniaudio_commit="7384bde3725412523871f0fcf60efe5c47fbbfc6"
+_qrcodegen_commit="22fac31bdf81da68730c177c0e931c93234d2a30"
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="gtkmm-devel libcurl-devel sqlite-devel openssl-devel
+ json-c++ libsecret-devel libhandy1-devel opus-devel spdlog
+ libsodium-devel rnnoise-devel"
+short_desc="Alternative Discord client with voice support made with C++ and GTK3"
+maintainer="Mazin Fadl <mazen@illumed.net>"
+license="GPL-3.0-only"
+homepage="https://github.com/uowuo/abaddon"
+distfiles="https://github.com/uowuo/abaddon/archive/refs/tags/v${version}.tar.gz
+ https://github.com/machinezone/IXWebSocket/archive/${_ixwebsocket_commit}.tar.gz
+ https://github.com/hrantzsch/keychain/archive/${_keychain_commit}.tar.gz
+ https://github.com/mackron/miniaudio/archive/${_miniaudio_commit}.tar.gz
+ https://github.com/nayuki/QR-Code-generator/archive/${_qrcodegen_commit}.tar.gz"
+checksum="afb64186532aecf83929f30fa31a4ba8d0e76279db6319ed0d9912fba06d311c
+ 9dea909d05e882a540526b15fbdc9764a39deb53810eb86ad797fd8135a02275
+ 3c57d272a06419ed58068d9fe14c16807041bf9b9b372b80950b9b09d08cf441
+ 4b3648bf227f2373af773c6769f9c147e38d99edd74cd0736f4df1eff224e6c6
+ 218e3e96ded7880d05f47c668aad6541a08e63303ac4d783720389087da6f4ed"
+skip_extraction="
+ ${_ixwebsocket_commit}.tar.gz
+ ${_keychain_commit}.tar.gz
+ ${_miniaudio_commit}.tar.gz
+ ${_qrcodegen_commit}.tar.gz
+ "
+
+post_extract() {
+ vsrcextract -C subprojects/ixwebsocket ${_ixwebsocket_commit}.tar.gz
+ vsrcextract -C subprojects/keychain ${_keychain_commit}.tar.gz
+ vsrcextract -C subprojects/miniaudio ${_miniaudio_commit}.tar.gz
+ vsrcextract -C subprojects/qrcodegen ${_qrcodegen_commit}.tar.gz
+}
+
+do_install() {
+ vmkdir usr/bin
+ vmkdir usr/share/abaddon
+ vmkdir usr/share/applications
+ vcopy build/abaddon usr/bin
+ vcopy res/css usr/share/abaddon
+ vcopy res/res usr/share/abaddon
+
+ vdoc README.md
+
+ vinstall "${FILESDIR}/abaddon.desktop" 644 usr/share/applications
+}
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..82e8230263c49 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${wrksrc}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${wrksrc}/sdl_audiolib"
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,33 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
diff --git a/srcpkgs/neko/template b/srcpkgs/neko/template
new file mode 100644
index 0000000000000..f9602a94a1119
--- /dev/null
+++ b/srcpkgs/neko/template
@@ -0,0 +1,14 @@
+# Template file for 'neko'
+pkgname=neko
+version=2.3.0
+revision=1
+build_style=cmake
+configure_args="-DSTATIC_DEPS="
+hostmakedepends="pkg-config git"
+makedepends="gc-devel openssl-devel pcre-devel zlib-devel libmariadbclient-devel apache-devel sqlite-devel mbedtls-devel gtk+-devel"
+short_desc="TODO"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://nekovm.org/"
+distfiles="https://github.com/HaxeFoundation/neko/archive/v${version//./-}.tar.gz"
+checksum=850e7e317bdaf24ed652efeff89c1cb21380ca19f20e68a296c84f6bad4ee995
diff --git a/srcpkgs/ocaml-ppxlib/template b/srcpkgs/ocaml-ppxlib/template
new file mode 100644
index 0000000000000..fbbb8ec586e78
--- /dev/null
+++ b/srcpkgs/ocaml-ppxlib/template
@@ -0,0 +1,24 @@
+# Template file for 'ocaml-ppxlib'
+pkgname=ocaml-ppxlib
+version=0.31.0
+revision=1
+build_style=gnu-makefile
+#make_install_target="findlib-install"
+hostmakedepends="dune"
+makedepends="ocaml-stdlib-shims"
+short_desc="OCaml legacy Num library for arbitrary-precision integers"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/ocaml-ppx/ppxlib"
+distfiles="https://github.com/ocaml-ppx/ppxlib/archive/refs/tags/${version}.tar.gz"
+checksum=0723f1385e7baaecb89ab43cd11f03fe36663d6e2bd54bf889d518c8b5cc5f29
+nocross=yes
+
+#pre_install() {
+# export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
+# vmkdir /usr/lib/ocaml/stublibs
+#}
+
+post_install() {
+ vlicense LICENSE.md
+}
diff --git a/srcpkgs/ocaml-sedlex/template b/srcpkgs/ocaml-sedlex/template
new file mode 100644
index 0000000000000..fbfc0c11e370d
--- /dev/null
+++ b/srcpkgs/ocaml-sedlex/template
@@ -0,0 +1,23 @@
+# Template file for 'ocaml-sedlex'
+pkgname=ocaml-sedlex
+version=3.2
+revision=1
+build_style=gnu-makefile
+#make_install_target="findlib-install"
+makedepends="ocaml dune curl"
+short_desc="OCaml legacy Num library for arbitrary-precision integers"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/ocaml-community/sedlex"
+distfiles="https://github.com/ocaml-community/sedlex/archive/refs/tags/v${version}.tar.gz"
+checksum=c8c8c89283d7c62cde1d9d70483664395636400d34e01f1982887c68c6623e9d
+#nocross=yes
+
+pre_install() {
+ export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
+ vmkdir /usr/lib/ocaml/stublibs
+}
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/ocaml-stdlib-shims/template b/srcpkgs/ocaml-stdlib-shims/template
new file mode 100644
index 0000000000000..f20b626038dcb
--- /dev/null
+++ b/srcpkgs/ocaml-stdlib-shims/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-stdlib-shims'
+pkgname=ocaml-stdlib-shims
+version=0.3.0
+revision=1
+hostmakedepends="dune"
+makedepends="ocaml"
+short_desc='Shim to substitute `Pervasives` with `Stdlib` before 4.08'
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="custom: LGPL-2.1-only with OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/stdlib-shims/"
+distfiles="https://github.com/ocaml/stdlib-shims/archive/refs/tags/${version}.tar.gz"
+checksum=6d0386313a021146300011549180fcd4e94f7ac3c3bf021ff165f6558608f0c2
+nocross=yes
+
+do_build() {
+ dune build --display=short
+}
+
+do_install() {
+ dune install --prefix=/usr --destdir="$DESTDIR" \
+ --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (31 preceding siblings ...)
2024-02-11 18:56 ` MIvanchev
@ 2024-02-11 19:03 ` MIvanchev
2024-02-11 19:11 ` MIvanchev
` (23 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4369 bytes --]
From 04322fb0187c96836ba44de6f5e0ccb33831a4b6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 +++++++++++++++++++
srcpkgs/devilutionX/template | 38 +++++++++++++++++++++----
2 files changed, 61 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..178b7067f7686
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..628d053fa 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../SDL_audiolib/"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..c343ea890 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/../simpleini/"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..82e8230263c49 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_simpleini_wrksrc="${wrksrc}/simpleini"
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_sdl_audiolib_wrksrc="${wrksrc}/sdl_audiolib"
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,33 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+post_extract() {
+ vsrcextract -C "${_simpleini_wrksrc}" v${_simpleini_version}.tar.gz
+ vsrcextract -C "${_sdl_audiolib_wrksrc}" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (32 preceding siblings ...)
2024-02-11 19:03 ` MIvanchev
@ 2024-02-11 19:11 ` MIvanchev
2024-02-11 19:29 ` MIvanchev
` (22 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 19:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4193 bytes --]
From 4c470d2754c89c680bc8d2b2a12a508c239a289d Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 ++++++++++++++++++++++
srcpkgs/devilutionX/template | 33 ++++++++++++++++++++-----
2 files changed, 56 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..d4cba763ddd03
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..3fc94aad0c6ae 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,10 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +12,30 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ mv "${XBPS_SRCDISTDIR}/${pkgname}-${version}/spawn.mpq" build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (33 preceding siblings ...)
2024-02-11 19:11 ` MIvanchev
@ 2024-02-11 19:29 ` MIvanchev
2024-02-11 19:30 ` MIvanchev
` (21 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 19:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 4760 bytes --]
From b66dce1c1be4236a1c19beb60af85792ed77cb7e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 29 +++++++++++++++++
srcpkgs/devilutionX/template | 43 +++++++++++++++++++++----
2 files changed, 66 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..d4cba763ddd03
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,29 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..6f0a2749bf149 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,38 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (34 preceding siblings ...)
2024-02-11 19:29 ` MIvanchev
@ 2024-02-11 19:30 ` MIvanchev
2024-02-15 14:57 ` [PR PATCH] [Updated] " MIvanchev
` (20 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-11 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
[WIP] devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 6012 bytes --]
From 3adc8df18698b8b684a6b893f51adc89c7994fb9 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
srcpkgs/devilutionX/patches/cmake.patch | 57 +++++++++++++++++++++++++
srcpkgs/devilutionX/template | 43 ++++++++++++++++---
2 files changed, 94 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake.patch
diff --git a/srcpkgs/devilutionX/patches/cmake.patch b/srcpkgs/devilutionX/patches/cmake.patch
new file mode 100644
index 0000000000000..b774945d8191d
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake.patch
@@ -0,0 +1,57 @@
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..6f0a2749bf149 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,38 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (35 preceding siblings ...)
2024-02-11 19:30 ` MIvanchev
@ 2024-02-15 14:57 ` MIvanchev
2024-02-15 15:02 ` MIvanchev
` (19 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14032 bytes --]
From 32a96ef9e734bae80bab638eeae7254c770a47c4 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 51 +++-
2 files changed, 277 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 0000000000000..b28847f3a0d7e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index 97d057a9a..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/archive/8b39eb9b1ff885978816dd9663277608187e8676.tar.gz
+- URL_HASH MD5=3cf9bf5f20375aa5dcc529193c809967
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631..af0ba44592ce1 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,46 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (36 preceding siblings ...)
2024-02-15 14:57 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-02-15 15:02 ` MIvanchev
2024-02-15 15:07 ` MIvanchev
` (18 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14036 bytes --]
From 927f5ba5ac3252e9f1c8c78efff5c89c33e336f6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 51 +++-
2 files changed, 277 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b28847f3a0d7ea
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index 97d057a9a..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/archive/8b39eb9b1ff885978816dd9663277608187e8676.tar.gz
+- URL_HASH MD5=3cf9bf5f20375aa5dcc529193c809967
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..af0ba44592ce1b 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,46 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (37 preceding siblings ...)
2024-02-15 15:02 ` MIvanchev
@ 2024-02-15 15:07 ` MIvanchev
2024-02-15 15:10 ` MIvanchev
` (17 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14067 bytes --]
From 67f6604ef81cb7eda1ebf0a29a77b4a1a5021aa1 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 51 +++-
2 files changed, 277 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..af0ba44592ce1b 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,46 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (38 preceding siblings ...)
2024-02-15 15:07 ` MIvanchev
@ 2024-02-15 15:10 ` MIvanchev
2024-02-15 15:13 ` MIvanchev
` (16 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14043 bytes --]
From 80e023268535b076e8f0b28d6566c84eac0fdf8e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 51 +++-
2 files changed, 277 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..698d5849ff5365 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=0e8174264ac9c6b314c6b2d9a5f72efd
+_libsmackerdec_hash=c3b1ecbe702266e149b158178a03e2b3
+_libmpq_hash=da531a1a6f719e89798a26e679ffc329
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,46 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (39 preceding siblings ...)
2024-02-15 15:10 ` MIvanchev
@ 2024-02-15 15:13 ` MIvanchev
2024-02-15 15:15 ` [PR PATCH] [Updated] " MIvanchev
` (15 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#issuecomment-1946296504
Comment:
DevilutionX appears to have changed to a non-free license as stated in #44425. Additionally, the build dowloads dependencies which has been patched away.
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (40 preceding siblings ...)
2024-02-15 15:13 ` MIvanchev
@ 2024-02-15 15:15 ` MIvanchev
2024-02-15 15:16 ` MIvanchev
` (14 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14067 bytes --]
From 753584854e5f13f06b25f402e26a57dcf42e74a8 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 51 +++-
2 files changed, 277 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..af0ba44592ce1b 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,46 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (41 preceding siblings ...)
2024-02-15 15:15 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-02-15 15:16 ` MIvanchev
2024-02-15 15:20 ` [PR PATCH] [Updated] " MIvanchev
` (13 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#issuecomment-1946296504
Comment:
DevilutionX appears to have changed to a non-free license as stated in #44425.
Additionally, the build dowloads dependencies which has been patched away.
Additionally, the shareware version is required for running the tests, this is provided so the test doesn't have to be disabled.
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (42 preceding siblings ...)
2024-02-15 15:16 ` MIvanchev
@ 2024-02-15 15:20 ` MIvanchev
2024-04-08 17:32 ` MIvanchev
` (12 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-02-15 15:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14103 bytes --]
From 41597c0b0faf578cce77ae9daf8248d6900dac26 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 53 +++-
2 files changed, 279 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..972affe101717d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,48 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+restricted=yes
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (43 preceding siblings ...)
2024-02-15 15:20 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-04-08 17:32 ` MIvanchev
2024-07-08 1:51 ` github-actions
` (11 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-04-08 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14103 bytes --]
From 54189d2d9fa09549409516cfe25ecff83840952a Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 53 +++-
2 files changed, 279 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..972affe101717d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,48 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+restricted=yes
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (44 preceding siblings ...)
2024-04-08 17:32 ` MIvanchev
@ 2024-07-08 1:51 ` github-actions
2024-07-08 9:16 ` MIvanchev
` (10 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: github-actions @ 2024-07-08 1:51 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/48628#issuecomment-2212781486
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] 58+ messages in thread
* Re: devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (45 preceding siblings ...)
2024-07-08 1:51 ` github-actions
@ 2024-07-08 9:16 ` MIvanchev
2024-08-07 3:59 ` [PR REVIEW] " classabbyamp
` (9 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-07-08 9:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#issuecomment-2213483090
Comment:
Bump.
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR REVIEW] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (46 preceding siblings ...)
2024-07-08 9:16 ` MIvanchev
@ 2024-08-07 3:59 ` classabbyamp
2024-08-07 3:59 ` classabbyamp
` (8 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: classabbyamp @ 2024-08-07 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#discussion_r1706347865
Comment:
i see nothing in the license that would make this restricted
```suggestion
```
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR REVIEW] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (47 preceding siblings ...)
2024-08-07 3:59 ` [PR REVIEW] " classabbyamp
@ 2024-08-07 3:59 ` classabbyamp
2024-08-07 3:59 ` classabbyamp
` (7 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: classabbyamp @ 2024-08-07 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#discussion_r1706348154
Comment:
does xbps-src's cmake not just fail if it encounters this?
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR REVIEW] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (48 preceding siblings ...)
2024-08-07 3:59 ` classabbyamp
@ 2024-08-07 3:59 ` classabbyamp
2024-08-07 7:26 ` MIvanchev
` (6 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: classabbyamp @ 2024-08-07 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#discussion_r1706348279
Comment:
maybe we shouldn't run tests then
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR REVIEW] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (49 preceding siblings ...)
2024-08-07 3:59 ` classabbyamp
@ 2024-08-07 7:26 ` MIvanchev
2024-08-07 7:27 ` MIvanchev
` (5 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-08-07 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New review comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#discussion_r1706516698
Comment:
No and we have discussed this in IRC a while back. You said there were plans to implement offline-only builds some time ago.
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR REVIEW] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (50 preceding siblings ...)
2024-08-07 7:26 ` MIvanchev
@ 2024-08-07 7:27 ` MIvanchev
2024-09-26 13:34 ` [PR PATCH] [Updated] " MIvanchev
` (4 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-08-07 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48628#discussion_r1706518247
Comment:
But they run good now?
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (51 preceding siblings ...)
2024-08-07 7:27 ` MIvanchev
@ 2024-09-26 13:34 ` MIvanchev
2024-09-26 14:20 ` MIvanchev
` (3 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-09-26 13:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14087 bytes --]
From 03fcf39ae69ef39dcbb20763ca8a5bc9b8ea9089 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 52 +++-
2 files changed, 278 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..0af3598d465248 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.2
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,47 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (52 preceding siblings ...)
2024-09-26 13:34 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-09-26 14:20 ` MIvanchev
2024-09-26 14:30 ` MIvanchev
` (2 subsequent siblings)
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-09-26 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14087 bytes --]
From 0ec20abc1bff02bfc857fecc6ef47ff357b82cb9 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 52 +++-
2 files changed, 278 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..58a36250b88778 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,47 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (53 preceding siblings ...)
2024-09-26 14:20 ` MIvanchev
@ 2024-09-26 14:30 ` MIvanchev
2024-09-26 16:20 ` MIvanchev
2024-09-26 16:47 ` [PR PATCH] [Updated] devilutionX: update to 1.5.3 MIvanchev
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-09-26 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14087 bytes --]
From 90b3192130dc7dbe702ca75ad2bdfde2099e24fc Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 52 +++-
2 files changed, 278 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..b0d14d4cabdbe5
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index f8b6602fe..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+- URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 3c1e4bc81..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz
+- URL_HASH MD5=e3b470abdfe4d95e9472239902cf7a65
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..91b7970604f3c4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,47 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.2
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (54 preceding siblings ...)
2024-09-26 14:30 ` MIvanchev
@ 2024-09-26 16:20 ` MIvanchev
2024-09-26 16:47 ` [PR PATCH] [Updated] devilutionX: update to 1.5.3 MIvanchev
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-09-26 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14087 bytes --]
From ec347eee13a0b81b5167b6227d0a46824ed514a2 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.2
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 52 +++-
2 files changed, 278 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..6987e53f3cdc3f
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index 5e65e9106..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-2.30.5.tar.gz
+- URL_HASH SHA256=f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 8f0c0cff0..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d.tar.gz
+- URL_HASH MD5=7ffee993fc21b1115abf485958d03ac8
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..91b7970604f3c4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,47 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
* Re: [PR PATCH] [Updated] devilutionX: update to 1.5.3
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
` (55 preceding siblings ...)
2024-09-26 16:20 ` MIvanchev
@ 2024-09-26 16:47 ` MIvanchev
56 siblings, 0 replies; 58+ messages in thread
From: MIvanchev @ 2024-09-26 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages devilutionX
https://github.com/void-linux/void-packages/pull/48628
devilutionX: update to 1.5.3
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48628.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devilutionX-48628.patch --]
[-- Type: text/x-diff, Size: 14087 bytes --]
From 6505e1ffccaac64402f6188af2cc79ce2c7ec93c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 9 Feb 2024 16:10:20 +0100
Subject: [PATCH] devilutionX: update to 1.5.3
---
.../patches/cmake_dependency_downloads.patch | 232 ++++++++++++++++++
srcpkgs/devilutionX/template | 52 +++-
2 files changed, 278 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
diff --git a/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
new file mode 100644
index 00000000000000..6987e53f3cdc3f
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/cmake_dependency_downloads.patch
@@ -0,0 +1,232 @@
+diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt
+index 5e65e9106..8cbadd026 100644
+--- a/3rdParty/SDL2/CMakeLists.txt
++++ b/3rdParty/SDL2/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+ FetchContent_Declare(SDL2
+- URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-2.30.5.tar.gz
+- URL_HASH SHA256=f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL2)
+diff --git a/3rdParty/SDL_audiolib/CMakeLists.txt b/3rdParty/SDL_audiolib/CMakeLists.txt
+index b5a9c0931..498dc5790 100644
+--- a/3rdParty/SDL_audiolib/CMakeLists.txt
++++ b/3rdParty/SDL_audiolib/CMakeLists.txt
+@@ -38,8 +38,8 @@ set(USE_DEC_DRMP3 ON)
+
+ include(FetchContent)
+ FetchContent_Declare(SDL_audiolib
+- URL https://github.com/realnc/SDL_audiolib/archive/cc1bb6af8d4cf5e200259072bde1edd1c8c5137e.tar.gz
+- URL_HASH MD5=0e8174264ac9c6b314c6b2d9a5f72efd)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_audiolib/src"
++)
+ FetchContent_MakeAvailableExcludeFromAll(SDL_audiolib)
+
+ add_library(SDL_audiolib::SDL_audiolib ALIAS SDL_audiolib)
+diff --git a/3rdParty/SDL_image/CMakeLists.txt b/3rdParty/SDL_image/CMakeLists.txt
+index 957029adc..c8df781f3 100644
+--- a/3rdParty/SDL_image/CMakeLists.txt
++++ b/3rdParty/SDL_image/CMakeLists.txt
+@@ -20,8 +20,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ include(FetchContent)
+
+ FetchContent_Declare(SDL_image
+- URL https://github.com/libsdl-org/SDL_image/archive/refs/tags/release-2.0.5.tar.gz
+- URL_HASH MD5=3446ed7ee3c700065dcb33426a9b0c6e
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/SDL_image/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(SDL_image)
+
+diff --git a/3rdParty/asio/CMakeLists.txt b/3rdParty/asio/CMakeLists.txt
+index 8f0c0cff0..453f4f8eb 100644
+--- a/3rdParty/asio/CMakeLists.txt
++++ b/3rdParty/asio/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(asio
+- URL https://github.com/diasurgical/asio/archive/4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d.tar.gz
+- URL_HASH MD5=7ffee993fc21b1115abf485958d03ac8
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/asio/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(asio)
+
+diff --git a/3rdParty/bzip2/CMakeLists.txt b/3rdParty/bzip2/CMakeLists.txt
+index 796856ec3..22cf39214 100644
+--- a/3rdParty/bzip2/CMakeLists.txt
++++ b/3rdParty/bzip2/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(bzip2
+- URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+- URL_HASH MD5=67e051268d0c475ea773822f7500d0e5
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/bzip2/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(bzip2)
+
+diff --git a/3rdParty/discord/CMakeLists.txt b/3rdParty/discord/CMakeLists.txt
+index f70e117c2..d744e47ea 100644
+--- a/3rdParty/discord/CMakeLists.txt
++++ b/3rdParty/discord/CMakeLists.txt
+@@ -4,8 +4,7 @@ include(FetchContent)
+ find_package(Patch REQUIRED)
+
+ FetchContent_Declare(discordsrc
+- URL https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
+- URL_HASH MD5=73e5e1b3f8413a2c7184ef17476822f2
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/discord/src"
+ PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 -N < "${CMAKE_CURRENT_LIST_DIR}/fixes.patch" || true
+ )
+ FetchContent_MakeAvailableExcludeFromAll(discordsrc)
+diff --git a/3rdParty/find_steam_game/CMakeLists.txt b/3rdParty/find_steam_game/CMakeLists.txt
+index ae5c7e6b8..6e6385730 100644
+--- a/3rdParty/find_steam_game/CMakeLists.txt
++++ b/3rdParty/find_steam_game/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(find_steam_game
+- URL https://github.com/cxong/find_steam_game/archive/a2bd6273fc002214052c2ee3bd48d7c1e7d3f366.tar.gz
+- URL_HASH MD5=a6950ce5d9ced8a259752bc2dc7f5311
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/find_steam_game/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(find_steam_game)
+
+diff --git a/3rdParty/googletest/CMakeLists.txt b/3rdParty/googletest/CMakeLists.txt
+index a6efb9229..e31195cd6 100644
+--- a/3rdParty/googletest/CMakeLists.txt
++++ b/3rdParty/googletest/CMakeLists.txt
+@@ -3,8 +3,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+ # branch: v1.12.x (master no longer supports C++11)
+ FetchContent_Declare(
+ googletest
+- URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz
+- URL_HASH MD5=22bdde3b84a8c506e7aba7b3c97dc760
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/googletest/src"
+ )
+
+ set(INSTALL_GTEST OFF)
+diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
+index df2295fb7..62ca3e6f7 100644
+--- a/3rdParty/libfmt/CMakeLists.txt
++++ b/3rdParty/libfmt/CMakeLists.txt
+@@ -14,13 +14,11 @@ include(FetchContent)
+ if(NXDK)
+ # branch: nxdk-v10.0.0
+ FetchContent_Declare(libfmt
+- URL https://github.com/diasurgical/fmt/archive/e421e854efcb21ee641349bab604d91b34af26b8.tar.gz
+- URL_HASH MD5=ebaac86fca56d4ef4a162ef125433f6f
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ else()
+ FetchContent_Declare(libfmt
+- URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz
+- URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdParty/libfmt/src"
+ )
+ endif()
+ FetchContent_MakeAvailableExcludeFromAll(libfmt)
+diff --git a/3rdParty/libmpq/CMakeLists.txt b/3rdParty/libmpq/CMakeLists.txt
+index 7df576b73..bc6ad4e0f 100644
+--- a/3rdParty/libmpq/CMakeLists.txt
++++ b/3rdParty/libmpq/CMakeLists.txt
+@@ -10,8 +10,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libmpq
+- URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
+- URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libmpq/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libmpq)
+
+diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt
+index b0d291f92..31d8e3bac 100644
+--- a/3rdParty/libpng/CMakeLists.txt
++++ b/3rdParty/libpng/CMakeLists.txt
+@@ -25,8 +25,7 @@ endif()
+
+ include(FetchContent)
+ FetchContent_Declare(libpng
+- URL https://github.com/glennrp/libpng/archive/0a158f3506502dfa23edfc42790dfaed82efba17.tar.gz
+- URL_HASH MD5=6d705417242732e8e081bff752c98c18
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libpng/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libpng)
+
+diff --git a/3rdParty/libsmackerdec/CMakeLists.txt b/3rdParty/libsmackerdec/CMakeLists.txt
+index d5cf319d7..c820a6ace 100644
+--- a/3rdParty/libsmackerdec/CMakeLists.txt
++++ b/3rdParty/libsmackerdec/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(libsmackerdec
+- URL https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz
+- URL_HASH MD5=c3b1ecbe702266e149b158178a03e2b3
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsmackerdec/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsmackerdec)
+
+diff --git a/3rdParty/libsodium/CMakeLists.txt b/3rdParty/libsodium/CMakeLists.txt
+index 9e308d9d0..527083750 100644
+--- a/3rdParty/libsodium/CMakeLists.txt
++++ b/3rdParty/libsodium/CMakeLists.txt
+@@ -12,8 +12,7 @@ if(NOT DEVILUTIONX_SYSTEM_LIBSODIUM)
+ endif()
+ include(FetchContent)
+ FetchContent_Declare(libsodium
+- GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+- GIT_TAG a8ac4509b22b84d6c2eb7d7448f08678e4a67da6
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libsodium/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(libsodium)
+ endif()
+diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt
+index e3feb8cd3..533e0ac2d 100644
+--- a/3rdParty/libzt/CMakeLists.txt
++++ b/3rdParty/libzt/CMakeLists.txt
+@@ -4,8 +4,7 @@ set(BUILD_HOST_SELFTEST OFF)
+
+ include(FetchContent)
+ FetchContent_Declare(libzt
+- GIT_REPOSITORY https://github.com/diasurgical/libzt.git
+- GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/libzt/src"
+ FetchContent_MakeAvailableExcludeFromAll(libzt)
+
+ if(NOT ANDROID)
+diff --git a/3rdParty/simpleini/CMakeLists.txt b/3rdParty/simpleini/CMakeLists.txt
+index e32fcf74d..f5860ad23 100644
+--- a/3rdParty/simpleini/CMakeLists.txt
++++ b/3rdParty/simpleini/CMakeLists.txt
+@@ -2,8 +2,7 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
+
+ include(FetchContent)
+ FetchContent_Declare(simpleini
+- URL https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz
+- URL_HASH MD5=02a561cea03ea11acb65848318ec4a81
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/simpleini/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(simpleini)
+
+diff --git a/3rdParty/zlib/CMakeLists.txt b/3rdParty/zlib/CMakeLists.txt
+index d7a8b8041..8b5ff33cc 100644
+--- a/3rdParty/zlib/CMakeLists.txt
++++ b/3rdParty/zlib/CMakeLists.txt
+@@ -4,10 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+ include(FetchContent)
+ FetchContent_Declare(zlib
+- URL https://www.zlib.net/zlib-1.2.13.tar.gz
+- https://www.zlib.net/fossils/zlib-1.2.13.tar.gz
+- https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
+- URL_HASH MD5=9b8aa094c4e5765dabf4da391f00d15c
++ SOURCE_DIR "${CMAKE_SOURCE_DIR}/zlib/src"
+ )
+ FetchContent_MakeAvailableExcludeFromAll(zlib)
+
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..91b7970604f3c4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,12 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
+_assets_version=4
+_simpleini_version=4.22
+_sdl_audiolib_hash=cc1bb6af8d4cf5e200259072bde1edd1c8c5137e
+_libsmackerdec_hash=91e732bb6953489077430572f43fc802bf2c75b2
+_libmpq_hash=b78d66c6fee6a501cc9b95d8556a129c68841b05
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +14,47 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz
+ https://github.com/brofield/simpleini/archive/refs/tags/v${_simpleini_version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_sdl_audiolib_hash}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_libsmackerdec_hash}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_hash}.tar.gz
+ https://github.com/diasurgical/devilutionx-assets/releases/download/v${_assets_version}/spawn.mpq"
+checksum="ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
+ b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+ 5adc71bee3506b16c505c1662da73fcfdfd878914645784f80fc70db979533a5
+ e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87
+ 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea
+ 64427cd7c1ba904eaa2e0031c16a6b136d0ecef9abc888c5ff8344b459356e38"
+skip_extraction="v${_simpleini_version}.tar.gz
+ ${_sdl_audiolib_hash}.tar.gz
+ ${_libsmackerdec_hash}.tar.gz
+ ${_libmpq_hash}.tar.gz
+ spawn.mpq"
+repository=nonfree
+
+# NOTE: DevilutionX's 3rdParty directory contains a lot of CMake package
+# download instructions that we patch away (even those that are not used) to
+# avoid accidental downloads during the build. The packages that are really
+# needed are provide through this template. Make sure the versions / hashes
+# are what DevilutionX expects and that no new downloads are added. It's a
+# good idea to keep an eye on the build logs.
+
+post_extract() {
+ vsrcextract -C "3rdParty/simpleini/src" v${_simpleini_version}.tar.gz
+ vsrcextract -C "3rdParty/SDL_audiolib/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libsmackerdec/src" ${_sdl_audiolib_hash}.tar.gz
+ vsrcextract -C "3rdParty/libmpq/src" ${_sdl_audiolib_hash}.tar.gz
+}
+
+pre_check() {
+ # The shareware version files are required for testing.
+ vsrccopy spawn.mpq build/
+}
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 58+ messages in thread
end of thread, other threads:[~2024-09-26 16:47 UTC | newest]
Thread overview: 58+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-09 15:12 [PR PATCH] devilutionX: update to 1.5.2 MIvanchev
2024-02-09 15:13 ` [PR PATCH] [Updated] " MIvanchev
2024-02-09 19:09 ` [PR PATCH] [Updated] [WIP] " MIvanchev
2024-02-09 19:13 ` MIvanchev
2024-02-09 19:52 ` MIvanchev
2024-02-10 10:33 ` MIvanchev
2024-02-10 10:36 ` MIvanchev
2024-02-10 10:41 ` MIvanchev
2024-02-10 10:48 ` MIvanchev
2024-02-10 10:57 ` MIvanchev
2024-02-10 16:48 ` MIvanchev
2024-02-10 17:05 ` MIvanchev
2024-02-10 17:12 ` MIvanchev
2024-02-10 17:16 ` MIvanchev
2024-02-10 17:22 ` MIvanchev
2024-02-10 17:30 ` MIvanchev
2024-02-11 10:46 ` MIvanchev
2024-02-11 10:51 ` MIvanchev
2024-02-11 11:00 ` MIvanchev
2024-02-11 11:03 ` MIvanchev
2024-02-11 11:10 ` MIvanchev
2024-02-11 11:40 ` MIvanchev
2024-02-11 11:54 ` MIvanchev
2024-02-11 11:55 ` MIvanchev
2024-02-11 11:55 ` MIvanchev
2024-02-11 12:06 ` MIvanchev
2024-02-11 18:12 ` MIvanchev
2024-02-11 18:15 ` MIvanchev
2024-02-11 18:17 ` MIvanchev
2024-02-11 18:23 ` MIvanchev
2024-02-11 18:42 ` MIvanchev
2024-02-11 18:44 ` MIvanchev
2024-02-11 18:56 ` MIvanchev
2024-02-11 19:03 ` MIvanchev
2024-02-11 19:11 ` MIvanchev
2024-02-11 19:29 ` MIvanchev
2024-02-11 19:30 ` MIvanchev
2024-02-15 14:57 ` [PR PATCH] [Updated] " MIvanchev
2024-02-15 15:02 ` MIvanchev
2024-02-15 15:07 ` MIvanchev
2024-02-15 15:10 ` MIvanchev
2024-02-15 15:13 ` MIvanchev
2024-02-15 15:15 ` [PR PATCH] [Updated] " MIvanchev
2024-02-15 15:16 ` MIvanchev
2024-02-15 15:20 ` [PR PATCH] [Updated] " MIvanchev
2024-04-08 17:32 ` MIvanchev
2024-07-08 1:51 ` github-actions
2024-07-08 9:16 ` MIvanchev
2024-08-07 3:59 ` [PR REVIEW] " classabbyamp
2024-08-07 3:59 ` classabbyamp
2024-08-07 3:59 ` classabbyamp
2024-08-07 7:26 ` MIvanchev
2024-08-07 7:27 ` MIvanchev
2024-09-26 13:34 ` [PR PATCH] [Updated] " MIvanchev
2024-09-26 14:20 ` MIvanchev
2024-09-26 14:30 ` MIvanchev
2024-09-26 16:20 ` MIvanchev
2024-09-26 16:47 ` [PR PATCH] [Updated] devilutionX: update to 1.5.3 MIvanchev
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).