summaryrefslogtreecommitdiff
path: root/games-engines/devilutionx
diff options
context:
space:
mode:
Diffstat (limited to 'games-engines/devilutionx')
-rw-r--r--games-engines/devilutionx/Manifest8
-rw-r--r--games-engines/devilutionx/devilutionx-1.0.3.ebuild (renamed from games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild)11
-rw-r--r--games-engines/devilutionx/devilutionx-1.1.0.ebuild60
-rw-r--r--games-engines/devilutionx/devilutionx-9999.ebuild24
4 files changed, 74 insertions, 29 deletions
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index b7ea624108be..54cf9f37bb5c 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,6 +1,8 @@
-DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
-EBUILD devilutionx-1.0.0-r1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
+DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
EBUILD devilutionx-1.0.1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
-EBUILD devilutionx-9999.ebuild 1820 BLAKE2B 91ff7876c9ecf4797d52d0e8a264f99e5c8dd8c6bf5ccc278aa17cd8add404266350716f8e9b46daec7fbb29ed6f421b687a8f1d495c11ffcd7b70bc67ba2e53 SHA512 bf00756e29a2ef5b8c7a4a19164b23b176f886c99295840c5f10a33a5454a3a80f1d2b885f7edea9eb83ceff1f22235220a1382e272bcf47fa650f7b84dd34f9
+EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
+EBUILD devilutionx-1.1.0.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
+EBUILD devilutionx-9999.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.0.3.ebuild
index b363bc7378ac..90302aa10ef4 100644
--- a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.0.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
# Sometimes build with ninja fails.
# Please check occasionally if we can revert back to ninja.
# Latest known issue:
-# https://github.com/diasurgical/devilutionX/issues/490
-CMAKE_MAKEFILE_GENERATOR="emake"
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake desktop
@@ -62,8 +62,10 @@ src_configure() {
src_install() {
dobin "${BUILD_DIR}/${PN}"
- newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
- newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
+ local size
+ for size in 32 48 ; do
+ newicon -s ${size} Packaging/resources/Diablo_${size}.png ${PN}.png
+ done
make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
}
@@ -72,5 +74,4 @@ pkg_postinst() {
einfo " diabdat.mpq"
einfo "from the original game CD into the following directory:"
einfo " \${HOME}/.local/share/diasurgical/devilution/"
- einfo "and make sure it's writeable (chmod u+w)."
}
diff --git a/games-engines/devilutionx/devilutionx-1.1.0.ebuild b/games-engines/devilutionx/devilutionx-1.1.0.ebuild
new file mode 100644
index 000000000000..3966e9a6b14a
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX"
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
+else
+ SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/devilutionX-${PV}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug lto"
+
+RDEPEND="
+ dev-libs/libsodium
+ media-libs/libsdl2[haptic]
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DASAN="OFF"
+ -DDEBUG="$(usex debug)"
+ -DDISABLE_LTO="$(usex !lto)"
+ -DDIST="ON"
+ -DUBSAN="OFF"
+ )
+ cmake_src_configure
+
+ # Build system still doesn't reliably set release version in the build
+ sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
+}
+
+pkg_postinst() {
+ einfo "In order to play the game you need to install the file"
+ einfo " diabdat.mpq"
+ einfo "from the original game CD into the following directory:"
+ einfo " \${HOME}/.local/share/diasurgical/devilution/"
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 829fcf1b68b3..3966e9a6b14a 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -29,7 +29,6 @@ IUSE="debug lto"
RDEPEND="
dev-libs/libsodium
- media-fonts/sil-charis
media-libs/libsdl2[haptic]
media-libs/sdl2-mixer
media-libs/sdl2-ttf
@@ -39,34 +38,18 @@ BDEPEND="
virtual/pkgconfig
"
-src_prepare() {
- sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \
- -i SourceS/config.h.in || die
- sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \
- -i SourceX/DiabloUI/fonts.h || die
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DASAN="OFF"
-DDEBUG="$(usex debug)"
+ -DDISABLE_LTO="$(usex !lto)"
-DDIST="ON"
- -DFASTER="OFF"
- -DLTO="$(usex lto)"
-DUBSAN="OFF"
)
cmake_src_configure
-}
-
-src_install() {
- dobin "${BUILD_DIR}/${PN}"
- local size
- for size in 32 48 ; do
- newicon -s ${size} Packaging/resources/Diablo_${size}.png ${PN}.png
- done
- make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
+ # Build system still doesn't reliably set release version in the build
+ sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
}
pkg_postinst() {
@@ -74,5 +57,4 @@ pkg_postinst() {
einfo " diabdat.mpq"
einfo "from the original game CD into the following directory:"
einfo " \${HOME}/.local/share/diasurgical/devilution/"
- einfo "and make sure it's writeable (chmod u+w)."
}