[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/, games-engines/devilutionx/
commit: 71c83c6e3b85eeffc8e58e7c85551a57006d8189
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Aug 7 13:39:37 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Aug 7 13:59:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c83c6e
games-engines/devilutionx: drop 1.4.0
Signed-off-by: Ionen Wolkens gentoo.org>
games-engines/devilutionx/Manifest | 1 -
games-engines/devilutionx/devilutionx-1.4.0.ebuild | 79 --
.../devilutionx-1.4.0-system-sdl_audiolib.patch| 18 -
3 files changed, 98 deletions(-)
diff --git a/games-engines/devilutionx/Manifest
b/games-engines/devilutionx/Manifest
index be798b6b8683..c36842a8700d 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1 @@
-DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B
3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a
SHA512
9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf
DIST devilutionx-1.4.1.tar.xz 19679968 BLAKE2B
51ae007d5d1dce25a9af20b98017826534d835c2a74bfcd78cb4fb3c8e86b4e2e55a302e0412cbbcff8f931ad33a2baab806199769660351f31cc49fa91814b6
SHA512
9709600395abfd697bc45757bd2cf3e5cf0e07e2c55c86a48a73e9f52003c274724e26306b4fcb36c2eda0776c51dbab96599c0d14744244c8c037fd5dd14263
diff --git a/games-engines/devilutionx/devilutionx-1.4.0.ebuild
b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
deleted file mode 100644
index d96c2032f7ce..
--- a/games-engines/devilutionx/devilutionx-1.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX/;
-SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
-> ${P}.tar.xz"
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1
)"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +sodium test zerotier"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/bzip2:=
- dev-libs/libfmt:=
- media-libs/libsdl2[haptic,joystick,opengl,video]
- media-libs/sdl2-image[png]
- sys-libs/zlib:=
- media-libs/sdl_audiolib
- sodium? ( dev-libs/libsodium:= )"
-DEPEND="
- ${RDEPEND}
- dev-cpp/asio
- test? ( dev-cpp/gtest )"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${P}-system-sdl_audiolib.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # use system asio
- echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- # TODO: unbundle simpleini next version (will use system by
default)
- -DBUILD_TESTING=$(usex test)
- -DCCACHE_PROGRAM=OFF #813768
- -DDEBUG=$(usex debug)
- -DDISABLE_LTO=ON # let CFLAGS control this
- -DDISABLE_ZERO_TIER=$(usex !zerotier)
- -DPACKET_ENCRYPTION=$(usex sodium)
- -DPIE=ON
- -DVERSION_NUM=${PV}
- )
-
- cmake_src_configure
-}
-
-src_install() {
- local DOCS=( Packaging/nix/README.txt docs/*.md )
- cmake_src_install
-
- rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "In order to play the game, you will need to copy the
following data file"
- elog "from the original game, and optionally the hellfire
expansion files:"
- elog " - DIABDAT.MPQ"
- elog " - hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
- elog "to ~/.local/share/diasurgical/devilution/"
- elog
- elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
- fi
-}
diff --git
a/games-engines/devilutionx/files/devilutionx-1.4.0-system-sdl_audiolib.patch
b/games-engines/devilutionx/files/devilutionx-1.4.0-system-sdl_audiolib.patch
deleted file mode 100644
index 26d0b0045022..
---
a/games-engines/devilutionx/files/devilutionx-1.4.0-system-sdl_audiolib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Short version of upstreamed:
-https://github.com/diasurgical/devilutionX/pull/4464
a/CMake/Dependencies.cmake
-+++ b/CMake/Dependencies.cmake
-@@ -118,9 +118,11 @@
- endif()
-
- if(NOT NOSOUND)
-- dependency_options("SDL_audiolib" DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF
DEVILUTIONX_STATIC_SDL_AUDIOLIB)
-+ dependency_options("SDL_audiolib" DEVILUTIONX_SYSTEM_SDL_AUDIOLIB ON
DEVILUTIONX_STATIC_SDL_AUDIOLIB)
- if(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB)
--
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/, games-engines/devilutionx/
commit: 9646f579b1acb2f1a089800dafd997cac7587aaa
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jul 21 05:04:39 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jul 21 05:37:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9646f579
games-engines/devilutionx: drop 1.2.1-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-engines/devilutionx/Manifest | 1 -
.../devilutionx/devilutionx-1.2.1-r1.ebuild| 72 --
.../devilutionx-1.2.0_pre-no_bundled_font.patch| 40
.../files/devilutionx-1.2.1-disable-ccache.patch | 16 -
games-engines/devilutionx/metadata.xml | 1 -
5 files changed, 130 deletions(-)
diff --git a/games-engines/devilutionx/Manifest
b/games-engines/devilutionx/Manifest
index c0aa8501e30f..f2549f29e76a 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1 @@
-DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B
c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649
SHA512
9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B
3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a
SHA512
9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf
diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
deleted file mode 100644
index 2a2abba3eba0..
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 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
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX;
-if [[ "${PV}" == ]] ; 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-fonts/sil-charis
- media-libs/libsdl2[haptic]
- media-libs/sdl2-mixer
- media-libs/sdl2-ttf
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
- "${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768
-)
-
-DOCS=( docs/CHANGELOG.md )
-
-src_configure() {
- local mycmakeargs=(
- -DASAN="OFF"
- -DDEBUG="$(usex debug)"
- -DDISABLE_LTO="$(usex !lto)"
- # Must be off to force dynamic linking.
- # See bug #791031
- -DDIST="OFF"
- -DUBSAN="OFF"
- )
-
- if [[ "${PV}" != ]] ; then
- mycmakeargs+=( -DVERSION_NUM="${PV}" )
- fi
-
- cmake_src_configure
-}
-
-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/files/devilutionx-1.2.0_pre-no_bundled_font.patch
b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
deleted file mode 100644
index 01f4006dd13f..
---
a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001
-From: Lars Wendler
-Date: Wed, 31 Mar 2021 17:55:03 +0200
-Subject: [PATCH] Fix font location
-
-https://bugs.gentoo.org/704508
- SourceS/paths.cpp | 2 +-
- SourceX/DiabloUI/fonts.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp
-index dd60fcb5..1c4f9d69 100644
a/SourceS/paths.cpp
-+++ b/SourceS/paths.cpp
-@@ -11,7 +11,7 @@
- #endif
-
- #ifndef TTF_FONT_NAME
--#define TTF_FONT_NAME "CharisSILB.ttf"
-+#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"
- #endif
-
- namespace dvl {
-diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp
-index 178dcbe9..5f825886 100644
a/SourceX/DiabloUI/fonts.cpp
-+++ b/SourceX/DiabloUI/fonts.cpp
-@@ -66,7 +66,7 @@ void LoadTtfFont()
- std::string
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/
commit: c94241e125b0f4037e2886b3f3f661dfb8a5dfbc
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 30 02:46:56 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 30 02:46:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94241e1
games-engines/devilutionx: remove obsolete patch
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/devilutionx-1.1.0-no_bundled_font.patch | 62 --
1 file changed, 62 deletions(-)
diff --git
a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
deleted file mode 100644
index 69131b562c8c..
--- a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/704508
-
devilutionX-1.1.0/CMakeLists.txt
-+++ devilutionX-1.1.0/CMakeLists.txt
-@@ -298,7 +298,6 @@
- SourceX/main.cpp
- SourceX/devilutionx.exe.manifest
- Packaging/macOS/AppIcon.icns
-- Packaging/resources/CharisSILB.ttf
- Packaging/windows/devilutionx.rc)
-
- if(NOT NONET)
-@@ -339,9 +338,6 @@
-
- add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS})
-
--# Copy the font to the build directory to it works from the build directory
--file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION
"${CMAKE_CURRENT_BINARY_DIR}")
--
- # Use file GENERATE instead of configure_file because configure_file
- # does not support generator expressions.
- get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-@@ -563,7 +559,6 @@
-
- if(APPLE)
- set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources)
-- set_source_files_properties("./Packaging/resources/CharisSILB.ttf"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx)
- set(MACOSX_BUNDLE_COPYRIGHT Unlicense)
- set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx)
-@@ -624,9 +619,6 @@
- DESTINATION "share/icons/hicolor/512x512/apps"
- RENAME "${project_name}.png"
- )
--install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
-- DESTINATION "share/fonts/truetype"
--)
-
- # -G DEB
- set(CPACK_PACKAGE_CONTACT "and...@jenbo.dk")
devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
-+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
-@@ -69,7 +69,7 @@
- #ifdef __linux__
- if (!FileExists(ttf_font_path))
- {
-- ttf_font_path = "/usr/share/fonts/truetype/" TTF_FONT_NAME;
-+ ttf_font_path = "/usr/share/fonts/" TTF_FONT_NAME;
- }
- #endif
- font = TTF_OpenFont(ttf_font_path, 17);
devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
-+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
-@@ -11,7 +11,7 @@
- #endif
-
- #ifndef TTF_FONT_NAME
--#define TTF_FONT_NAME "CharisSILB.ttf"
-+#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"
- #endif
-
- namespace dvl {
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/, games-engines/devilutionx/
commit: 4612f095b9e804494aa8797af3ea57b104b99ec2
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 30 01:28:06 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 30 01:59:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4612f095
games-engines/devilutionx: add 1.4.0
Essentially a new ebuild, upstream changed about everything around.
wrt bug #814170 about fonts, ttf is no longer used (sdl-ttf dep is
also gone) and instead it uses converted pcx fonts and so unbundling
doesn't feel realistic anymore.
Bug: https://bugs.gentoo.org/814170
Closes: https://bugs.gentoo.org/814167
Signed-off-by: Ionen Wolkens gentoo.org>
games-engines/devilutionx/Manifest | 1 +
games-engines/devilutionx/devilutionx-1.4.0.ebuild | 78 ++
.../devilutionx-1.4.0-system-sdl_audiolib.patch| 18 +
games-engines/devilutionx/metadata.xml | 2 +
4 files changed, 99 insertions(+)
diff --git a/games-engines/devilutionx/Manifest
b/games-engines/devilutionx/Manifest
index 6f525083a265..c0aa8501e30f 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B
c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649
SHA512
9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
+DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B
3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a
SHA512
9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf
diff --git a/games-engines/devilutionx/devilutionx-1.4.0.ebuild
b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
new file mode 100644
index ..c4ee3ebfae38
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/;
+SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
-> ${P}.tar.xz"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1
)"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/bzip2:=
+ dev-libs/libfmt:=
+ media-libs/libsdl2[haptic,joystick,opengl,video]
+ media-libs/sdl2-image[png]
+ sys-libs/zlib:=
+ media-libs/sdl_audiolib
+ sodium? ( dev-libs/libsodium:= )"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/asio
+ test? ( dev-cpp/gtest )"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-system-sdl_audiolib.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # use system asio
+ echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DCCACHE_PROGRAM=OFF #813768
+ -DDEBUG=$(usex debug)
+ -DDISABLE_LTO=ON # let CFLAGS control this
+ -DDISABLE_ZERO_TIER=$(usex !zerotier)
+ -DPACKET_ENCRYPTION=$(usex sodium)
+ -DPIE=ON
+ )
+ [[ ${PV} == ]] || mycmakeargs+=( -DVERSION_NUM=${PV} )
+
+ cmake_src_configure
+}
+
+src_install() {
+ local DOCS=( Packaging/nix/README.txt docs/*.md )
+ cmake_src_install
+
+ rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "In order to play the game, you will need to copy the
following data file"
+ elog "from the original game, and optionally the hellfire
expansion files:"
+ elog " - DIABDAT.MPQ"
+ elog " - hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+ elog "to ~/.local/share/diasurgical/devilution/"
+ elog
+ elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+ fi
+}
diff --git
a/games-engines/devilutionx/files/devilutionx-1.4.0-system-sdl_audiolib.patch
b/games-engines/devilutionx/files/devilutionx-1.4.0-system-sdl_audiolib.patch
new file mode 100644
index ..26d0b0045022
--- /dev/null
+++
b/games-engines/devilutionx/files/devilutionx-1.4.0-system-sdl_audiolib.patch
@@ -0,0 +1,18 @@
+Short version of upstreamed:
+https://github.com/diasurgical/devilutionX/pull/4464
+--- a/CMake/Dependencies.cmake
b/CMake/Dependencies.cmake
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/
commit: 2f56448cbb1052dbaf2c4fee7686542036cfceeb
Author: Sam James gentoo org>
AuthorDate: Mon Apr 11 19:24:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 11 19:24:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f56448c
games-engines/devilutionx: fix patch line endings
Closes: https://bugs.gentoo.org/837764
Signed-off-by: Sam James gentoo.org>
.../files/devilutionx-1.2.1-disable-ccache.patch | 23 +++---
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git
a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
index a89b53e63d34..177287810c94 100644
--- a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
+++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
@@ -1,17 +1,16 @@
We let users enable ccache by themselves. Avoids sandbox violation.
-
https://bugs.gentoo.org/813768
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,11 +54,6 @@ if(NOT VERSION_NUM)
- endif()
- endif()
-
--find_program(CCACHE_PROGRAM ccache)
--if(CCACHE_PROGRAM)
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
--endif()
--
- if(VERSION_NUM MATCHES untagged)
- project(DevilutionX
- LANGUAGES C CXX)
+ endif()
+ endif()
+
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ if(VERSION_NUM MATCHES untagged)
+ project(DevilutionX
+ LANGUAGES C CXX)
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/, games-engines/devilutionx/
commit: d084be5126940f15ddb66f52861dda2375e75b3e
Author: Lars Wendler gentoo org>
AuthorDate: Fri Nov 22 12:09:57 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Nov 22 12:10:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d084be51
games-engines/devilutionx: Removed no longer needed patch
Switch to emake for build because of
https://github.com/diasurgical/devilutionX/issues/490
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler gentoo.org>
games-engines/devilutionx/devilutionx-.ebuild | 13 ++--
...ilutionx-facebookincubator_find_libsodium.patch | 88 --
2 files changed, 6 insertions(+), 95 deletions(-)
diff --git a/games-engines/devilutionx/devilutionx-.ebuild
b/games-engines/devilutionx/devilutionx-.ebuild
index 3070232b106..d191d5e6593 100644
--- a/games-engines/devilutionx/devilutionx-.ebuild
+++ b/games-engines/devilutionx/devilutionx-.ebuild
@@ -3,6 +3,12 @@
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"
+
inherit cmake-utils desktop
DESCRIPTION="Diablo engine for modern operating systems"
@@ -31,13 +37,6 @@ BDEPEND="
virtual/pkgconfig
"
-src_prepare() {
- # https://github.com/diasurgical/devilutionX/issues/225
- eapply -R "${FILESDIR}"/${PN}-facebookincubator_find_libsodium.patch
-
- cmake-utils_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DBINARY_RELEASE=ON
diff --git
a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
deleted file mode 100644
index e81de974c4d..000
---
a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1f7f5bf3dccee957e23bdf4d976883b155d5e81a Mon Sep 17 00:00:00 2001
-From: Anders Jenbo
-Date: Tue, 23 Jul 2019 21:34:08 +0200
-Subject: [PATCH] Use facebookincubator findflindsodium cmake helper
-
-https://github.com/facebookincubator/fizz/blob/master/fizz/cmake/FindSodium.cmake
- CMake/Findsodium.cmake | 34 --
- 1 file changed, 20 insertions(+), 14 deletions(-)
-
-diff --git a/CMake/Findsodium.cmake b/CMake/Findsodium.cmake
-index 0667920c..c664ccbe 100644
a/CMake/Findsodium.cmake
-+++ b/CMake/Findsodium.cmake
-@@ -55,22 +55,22 @@ if (UNIX)
- endif()
-
- if(sodium_USE_STATIC_LIBS)
--if (sodium_PKG_STATIC_LIBRARIES)
--foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
--if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings
already ending with .a
--list(INSERT sodium_PKG_STATIC_LIBRARIES 0
"lib${_libname}.a")
--endif()
--endforeach()
--list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
--else()
--# if pkgconfig for libsodium doesn't provide
--# static lib info, then override PKG_STATIC here..
-+foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
-+if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already
ending with .a
-+list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
-+endif()
-+endforeach()
-+list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
-+
-+# if pkgconfig for libsodium doesn't provide
-+# static lib info, then override PKG_STATIC here..
-+if (NOT sodium_PKG_STATIC_FOUND)
- set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
- endif()
-
- set(XPREFIX sodium_PKG_STATIC)
- else()
--if (sodium_PKG_LIBRARIES STREQUAL "")
-+if (NOT sodium_PKG_FOUND)
- set(sodium_PKG_LIBRARIES sodium)
- endif()
-
-@@ -101,7 +101,7 @@ elseif (WIN32)
-
- if (MSVC)
- # detect target architecture
--file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
- #if defined _M_IX86
- #error ARCH_VALUE x86_32
- #elif defined _M_X64
-@@ -109,7 +109,7 @@ elseif (WIN32)
- #endif
- #error ARCH_VALUE unknown
- ]=])
--try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/arch.c"
-+try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
- OUTPUT_VARIABLE _COMPILATION_LOG
- )
- string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1"
_TARGET_ARCH "${_COMPILATION_LOG}")
-@@ -224,7 +224,8 @@ endif()
-
- # communicate results
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(sodium
[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/
commit: f61d1cc3832f22c056cf3d647ac165d06b2da2f2
Author: Lars Wendler gentoo org>
AuthorDate: Tue Sep 3 07:41:03 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Sep 3 07:41:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61d1cc3
games-engines/devilutionx: Added missing patch
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler gentoo.org>
...ilutionx-facebookincubator_find_libsodium.patch | 88 ++
1 file changed, 88 insertions(+)
diff --git
a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
new file mode 100644
index 000..e81de974c4d
--- /dev/null
+++
b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
@@ -0,0 +1,88 @@
+From 1f7f5bf3dccee957e23bdf4d976883b155d5e81a Mon Sep 17 00:00:00 2001
+From: Anders Jenbo
+Date: Tue, 23 Jul 2019 21:34:08 +0200
+Subject: [PATCH] Use facebookincubator findflindsodium cmake helper
+
+https://github.com/facebookincubator/fizz/blob/master/fizz/cmake/FindSodium.cmake
+---
+ CMake/Findsodium.cmake | 34 --
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/CMake/Findsodium.cmake b/CMake/Findsodium.cmake
+index 0667920c..c664ccbe 100644
+--- a/CMake/Findsodium.cmake
b/CMake/Findsodium.cmake
+@@ -55,22 +55,22 @@ if (UNIX)
+ endif()
+
+ if(sodium_USE_STATIC_LIBS)
+-if (sodium_PKG_STATIC_LIBRARIES)
+-foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
+-if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings
already ending with .a
+-list(INSERT sodium_PKG_STATIC_LIBRARIES 0
"lib${_libname}.a")
+-endif()
+-endforeach()
+-list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+-else()
+-# if pkgconfig for libsodium doesn't provide
+-# static lib info, then override PKG_STATIC here..
++foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
++if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already
ending with .a
++list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
++endif()
++endforeach()
++list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
++
++# if pkgconfig for libsodium doesn't provide
++# static lib info, then override PKG_STATIC here..
++if (NOT sodium_PKG_STATIC_FOUND)
+ set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
+ endif()
+
+ set(XPREFIX sodium_PKG_STATIC)
+ else()
+-if (sodium_PKG_LIBRARIES STREQUAL "")
++if (NOT sodium_PKG_FOUND)
+ set(sodium_PKG_LIBRARIES sodium)
+ endif()
+
+@@ -101,7 +101,7 @@ elseif (WIN32)
+
+ if (MSVC)
+ # detect target architecture
+-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
+ #if defined _M_IX86
+ #error ARCH_VALUE x86_32
+ #elif defined _M_X64
+@@ -109,7 +109,7 @@ elseif (WIN32)
+ #endif
+ #error ARCH_VALUE unknown
+ ]=])
+-try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/arch.c"
++try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
+ OUTPUT_VARIABLE _COMPILATION_LOG
+ )
+ string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1"
_TARGET_ARCH "${_COMPILATION_LOG}")
+@@ -224,7 +224,8 @@ endif()
+
+ # communicate results
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(sodium
++find_package_handle_standard_args(
++Sodium # The name must be either uppercase or match the filename case.
+ REQUIRED_VARS
+ sodium_LIBRARY_RELEASE
+ sodium_LIBRARY_DEBUG
+@@ -233,6 +234,11 @@ find_package_handle_standard_args(sodium
+ sodium_VERSION
+ )
+
++if(Sodium_FOUND)
++set(sodium_LIBRARIES
++optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
++endif()
++
+ # mark file paths as advanced
+ mark_as_advanced(sodium_INCLUDE_DIR)
+ mark_as_advanced(sodium_LIBRARY_DEBUG)
