From 7e2b5bc2c2e2e045de6095d46c24ee857453adf2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Aug 2023 09:34:39 +0100 Subject: gentoo auto-resync : 11:08:2023 - 09:34:39 --- games-engines/Manifest.gz | Bin 3554 -> 3552 bytes games-engines/fheroes2/Manifest | 5 +- games-engines/fheroes2/fheroes2-1.0.5.ebuild | 79 --------------------- games-engines/fheroes2/fheroes2-1.0.6.ebuild | 77 ++++++++++++++++++++ .../fheroes2/files/fheroes2-1.0.5-gettext.patch | 15 ---- 5 files changed, 79 insertions(+), 97 deletions(-) delete mode 100644 games-engines/fheroes2/fheroes2-1.0.5.ebuild create mode 100644 games-engines/fheroes2/fheroes2-1.0.6.ebuild delete mode 100644 games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch (limited to 'games-engines') diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz index d999962dd40a..f2ff5fffc98d 100644 Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest index b9bc0cdc0d4b..710fff7866f4 100644 --- a/games-engines/fheroes2/Manifest +++ b/games-engines/fheroes2/Manifest @@ -1,5 +1,4 @@ AUX fheroes2-1.0.4-scripts.patch 716 BLAKE2B 0b944bf9f012e0fc6789230343e230b400b8a3446a0d07140816c9cb2262ad5b11f5a87562a70f32d71676b55d504299ba610e097cfe4b1fe52147e70c11c249 SHA512 fc5772dab278884f78741f3122554df9e5befc31ff3b07f0d4c5bf6e8764deee651d1999982a2c73c3a0bc49e517dd67bdf8b50151e9b489e08b9f4ebb13123f -AUX fheroes2-1.0.5-gettext.patch 666 BLAKE2B 618cd57db5285beac2a7875348656308c719209b8c0b82f96646c49e0a28092c2ee58c35cdf9bf5ade11b1d71011a28a96c07864ed69516838bb13f517deadfc SHA512 b8d9dfa840711b718a0812a4b4a4ce952b5f0202e2b4e8ddcd102f16cffed55a57b85998d2ecb8da658d43de09292c9e43c9c3b2bfd1128254045792e83ff937 -DIST fheroes2-1.0.5.tar.gz 11570167 BLAKE2B 7294ae4a816ce0a42c035262cbc8d44fc53cfdaa1333934ac316607f7d086a44358fc13931e5dbce9b17ff65e58016efc57cd123747af30277bcf4c1bc195e1e SHA512 13f058319540fa9fa04955ff8a5f16a0113e791307d58c32025361c773757769306f632d2c6472ee6d0b704dc4c260a9c64954c19ba2e58ab21dc6744c3cdd3e -EBUILD fheroes2-1.0.5.ebuild 1795 BLAKE2B 1aa91fd560c4fb7f32473328e5162e4db28e726ff995ef39cc61b8918bee621591955d569cb716602172a6fb2380423b4a00bcd547e221bf8746da45920a7af6 SHA512 a8e4643f18b71c9988b1a9a6259f3f57c3503aecc58a08c7b72811d1d6af3b4032aca504622798cc925a17b09e5359e1ce436043dd3d7a8e3fb3051b29b8502c +DIST fheroes2-1.0.6.tar.gz 11611881 BLAKE2B b7219a1a843f4a08cfc9ade161e38b19dcb343fa6dc700568d2e38b984d2cd26c78d02b9792f7d893b0babcca7bf71a01d349bc3806136736d46768b048a8db2 SHA512 c42b2ded44b7d6e112de3e919044b6b7d69161cc8cf08198df88da42c7f77b2dcf9df9ea7b453def66902e85f42047c0375b093c8d2d91517acb42d1804e621b +EBUILD fheroes2-1.0.6.ebuild 1712 BLAKE2B 4a834d6833b47665efd563e0c8ef370d56c0a8d5136d0114d3c3f8a5014e6524c922e63afcfb7c57372788d409b75e67741abe66844c132f1c6583ceee0cc2e4 SHA512 5465923ace15b87e3368d439c4954379c11c57040dc593286c32e0b5c0741dab329353a38caa421cae20ec4c347f7a4beab550643457193b2dba69583343815c MISC metadata.xml 1185 BLAKE2B 28d22394a735740a0c230888558eccb00c4ca9ec0072aabfc27d271c9a5089ea011bc167678a7c3bf81cbeeaccbc8a0fb0b2b94d80fd83b42bc8f9a654da756a SHA512 8b3033b5de642317d2624486810cd189dee8746c9e10110a5f6ae023d51a9203c226f2b41ac4d0afb1e4b29f862063f0749b5170534b17732d26dd8dbaa89625 diff --git a/games-engines/fheroes2/fheroes2-1.0.5.ebuild b/games-engines/fheroes2/fheroes2-1.0.5.ebuild deleted file mode 100644 index 3aeb794a8d78..000000000000 --- a/games-engines/fheroes2/fheroes2-1.0.5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake python-single-r1 xdg - -DESCRIPTION="Recreation of HoMM2 game engine" -HOMEPAGE="https://ihhub.github.io/fheroes2/" -SRC_URI="https://github.com/ihhub/fheroes2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="tools" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - media-libs/libpng:= - media-libs/libsdl2[video] - media-libs/sdl2-image - media-libs/sdl2-mixer - sys-libs/zlib -" -RDEPEND=" - ${COMMON_DEPEND} - ${PYTHON_DEPS} - app-arch/libarchive - dev-lang/python - virtual/libintl -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/fheroes2-1.0.4-scripts.patch" - "${FILESDIR}/fheroes2-1.0.5-gettext.patch" -) - -src_configure() { - # Not using dev-games/libsmacker because the game crashes with it - local mycmakeargs=( - -DENABLE_IMAGE=ON - -DENABLE_TOOLS=$(usex tools) - -DUSE_SYSTEM_LIBSMACKER=NO - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - emake -C files/lang -} - -src_install() { - cmake_src_install - - if use tools; then - for file in 82m2wav bin2txt extractor h2dmgr icn2img pal2img til2img xmi2midi; do - newbin "${BUILD_DIR}/${file}" "fheroes2-${file}" - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "You need original HoMM2 data files to play fheroes2." - elog "If you have an installer (.exe) from GOG, install:" - elog " games-strategy/homm2-gold-gog" - elog "If you have the original game installed somewhere already, run:" - elog " ${EPREFIX}/usr/share/fheroes2/extract_homm2_resources.sh" - elog "Also you can automatically get a demo version for free by installing:" - elog " games-strategy/homm2-demo" -} diff --git a/games-engines/fheroes2/fheroes2-1.0.6.ebuild b/games-engines/fheroes2/fheroes2-1.0.6.ebuild new file mode 100644 index 000000000000..0481e2bc397d --- /dev/null +++ b/games-engines/fheroes2/fheroes2-1.0.6.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake python-single-r1 xdg + +DESCRIPTION="Recreation of HoMM2 game engine" +HOMEPAGE="https://ihhub.github.io/fheroes2/" +SRC_URI="https://github.com/ihhub/fheroes2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="tools" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + media-libs/libpng:= + media-libs/libsdl2[video] + media-libs/sdl2-image + media-libs/sdl2-mixer + sys-libs/zlib +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + app-arch/libarchive + dev-lang/python + virtual/libintl +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/fheroes2-1.0.4-scripts.patch" +) + +src_configure() { + # Not using dev-games/libsmacker because the game crashes with it + local mycmakeargs=( + -DENABLE_IMAGE=ON + -DENABLE_TOOLS=$(usex tools) + -DUSE_SYSTEM_LIBSMACKER=NO + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + emake -C files/lang +} + +src_install() { + cmake_src_install + + if use tools; then + for file in 82m2wav bin2txt extractor h2dmgr icn2img pal2img til2img xmi2midi; do + newbin "${BUILD_DIR}/${file}" "fheroes2-${file}" + done + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "You need original HoMM2 data files to play fheroes2." + elog "If you have an installer (.exe) from GOG, install:" + elog " games-strategy/homm2-gold-gog" + elog "If you have the original game installed somewhere already, run:" + elog " ${EPREFIX}/usr/share/fheroes2/extract_homm2_resources.sh" + elog "Also you can automatically get a demo version for free by installing:" + elog " games-strategy/homm2-demo" +} diff --git a/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch b/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch deleted file mode 100644 index 20118037b779..000000000000 --- a/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/ihhub/fheroes2/commit/e55c33c1bc7ac1b8c2ffc6e4ca61ab47921ec1b1 -https://bugs.gentoo.org/908863 - ---- a/files/lang/Makefile -+++ b/files/lang/Makefile -@@ -19,7 +19,8 @@ - ########################################################################### - - ICONV = iconv --MSGFMT = sed -e '1,20 s/UTF-8/$(1)/' $< | $(ICONV) -f utf-8 -t $(1) | msgfmt - -o $@ -+# TODO: consider converting game fonts and texts to UTF-8 in the engine instead -+MSGFMT = sed -e '1,20 s/UTF-8/$(1)/' $< | $(ICONV) -f utf-8 -t $(1) | if msgfmt --help | grep -q no-convert >/dev/null 2>/dev/null; then msgfmt - -o $@ --no-convert; else msgfmt - -o $@; fi - - .PHONY: all clean merge - -- cgit v1.2.3