commit: 71c83c6e3b85eeffc8e58e7c85551a57006d8189 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Aug 7 13:39:37 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Aug 7 13:59:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c83c6e
games-engines/devilutionx: drop 1.4.0 Signed-off-by: Ionen Wolkens <ionen <AT> 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..000000000000 --- 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..000000000000 --- 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) -- find_package(SDL_audiolib REQUIRED) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(SDL_audiolib REQUIRED IMPORTED_TARGET SDL_audiolib) -+ add_library(SDL_audiolib ALIAS PkgConfig::SDL_audiolib) - else() - add_subdirectory(3rdParty/SDL_audiolib) - endif()
