* [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/
@ 2023-06-19 20:15 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2023-06-19 20:15 UTC (permalink / raw
To: gentoo-commits
commit: c9dbfa96bd5fc3f7ac0f3632246fe0a5de013815
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon May 29 22:35:18 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 20:14:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9dbfa96
games-engines/fheroes2: new package, add 1.0.5
Closes: https://github.com/gentoo/gentoo/pull/29031
Closes: https://bugs.gentoo.org/279781
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/fheroes2/Manifest | 1 +
games-engines/fheroes2/fheroes2-1.0.5.ebuild | 78 ++++++++++++++++++++++
.../fheroes2/files/fheroes2-1.0.4-scripts.patch | 19 ++++++
games-engines/fheroes2/metadata.xml | 31 +++++++++
4 files changed, 129 insertions(+)
diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest
new file mode 100644
index 000000000000..a6c2ca02c945
--- /dev/null
+++ b/games-engines/fheroes2/Manifest
@@ -0,0 +1 @@
+DIST fheroes2-1.0.5.tar.gz 11570167 BLAKE2B 7294ae4a816ce0a42c035262cbc8d44fc53cfdaa1333934ac316607f7d086a44358fc13931e5dbce9b17ff65e58016efc57cd123747af30277bcf4c1bc195e1e SHA512 13f058319540fa9fa04955ff8a5f16a0113e791307d58c32025361c773757769306f632d2c6472ee6d0b704dc4c260a9c64954c19ba2e58ab21dc6744c3cdd3e
diff --git a/games-engines/fheroes2/fheroes2-1.0.5.ebuild b/games-engines/fheroes2/fheroes2-1.0.5.ebuild
new file mode 100644
index 000000000000..f58beedc9f5c
--- /dev/null
+++ b/games-engines/fheroes2/fheroes2-1.0.5.ebuild
@@ -0,0 +1,78 @@
+# 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"
+)
+
+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.4-scripts.patch b/games-engines/fheroes2/files/fheroes2-1.0.4-scripts.patch
new file mode 100644
index 000000000000..c5675fdc0a6f
--- /dev/null
+++ b/games-engines/fheroes2/files/fheroes2-1.0.4-scripts.patch
@@ -0,0 +1,19 @@
+Install the data-exporting scripts to a better place than docs
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,12 +182,12 @@ if(NOT MACOS_APP_BUNDLE)
+ install(
+ FILES script/demo/download_demo_version.sh
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+- DESTINATION ${CMAKE_INSTALL_DOCDIR}/demo
++ DESTINATION ${FHEROES2_DATA}
+ )
+ install(
+ FILES script/homm2/extract_homm2_resources.sh
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+- DESTINATION ${CMAKE_INSTALL_DOCDIR}/homm2
++ DESTINATION ${FHEROES2_DATA}
+ )
+ install(
+ FILES script/packaging/common/fheroes2.appdata.xml
diff --git a/games-engines/fheroes2/metadata.xml b/games-engines/fheroes2/metadata.xml
new file mode 100644
index 000000000000..b43e5734bbae
--- /dev/null
+++ b/games-engines/fheroes2/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>alexey+gentoo@asokolov.org</email>
+ <name>Alexey Sokolov</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <use>
+ <flag name="tools">Install development tools like 82m2wav and xmi2midi.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ihhub/fheroes2</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ fheroes2 is a recreation of the Heroes of Might and Magic II game engine.
+ This open source multiplatform project, written from scratch, is
+ designed to reproduce the original game with significant improvements in
+ gameplay, graphics and logic (including support for high-resolution
+ graphics, improved AI, numerous fixes and user interface improvements),
+ breathing new life into one of the most addictive turn-based strategy
+ games.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/
@ 2023-07-06 6:24 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-07-06 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 0ae9e85dc71b138b604bf8491f2de8897ee13b2e
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Jul 3 19:28:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 06:24:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae9e85d
games-engines/fheroes2: fix build with gettext 0.22
Closes: https://bugs.gentoo.org/908863
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/31730
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-engines/fheroes2/fheroes2-1.0.5.ebuild | 1 +
games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/games-engines/fheroes2/fheroes2-1.0.5.ebuild b/games-engines/fheroes2/fheroes2-1.0.5.ebuild
index f58beedc9f5c..3aeb794a8d78 100644
--- a/games-engines/fheroes2/fheroes2-1.0.5.ebuild
+++ b/games-engines/fheroes2/fheroes2-1.0.5.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/fheroes2-1.0.4-scripts.patch"
+ "${FILESDIR}/fheroes2-1.0.5-gettext.patch"
)
src_configure() {
diff --git a/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch b/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch
new file mode 100644
index 000000000000..20118037b779
--- /dev/null
+++ b/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch
@@ -0,0 +1,15 @@
+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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/
@ 2023-08-11 6:11 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-08-11 6:11 UTC (permalink / raw
To: gentoo-commits
commit: 16e78f6d6c609944edb91a530a38dcd8909f7a6f
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sat Jul 15 19:29:07 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 06:11:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e78f6d
games-engines/fheroes2: drop 1.0.5
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/31900
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
games-engines/fheroes2/Manifest | 1 -
games-engines/fheroes2/fheroes2-1.0.5.ebuild | 79 ----------------------
.../fheroes2/files/fheroes2-1.0.5-gettext.patch | 15 ----
3 files changed, 95 deletions(-)
diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest
index 11680cb1af94..22395c6b601f 100644
--- a/games-engines/fheroes2/Manifest
+++ b/games-engines/fheroes2/Manifest
@@ -1,2 +1 @@
-DIST fheroes2-1.0.5.tar.gz 11570167 BLAKE2B 7294ae4a816ce0a42c035262cbc8d44fc53cfdaa1333934ac316607f7d086a44358fc13931e5dbce9b17ff65e58016efc57cd123747af30277bcf4c1bc195e1e SHA512 13f058319540fa9fa04955ff8a5f16a0113e791307d58c32025361c773757769306f632d2c6472ee6d0b704dc4c260a9c64954c19ba2e58ab21dc6744c3cdd3e
DIST fheroes2-1.0.6.tar.gz 11611881 BLAKE2B b7219a1a843f4a08cfc9ade161e38b19dcb343fa6dc700568d2e38b984d2cd26c78d02b9792f7d893b0babcca7bf71a01d349bc3806136736d46768b048a8db2 SHA512 c42b2ded44b7d6e112de3e919044b6b7d69161cc8cf08198df88da42c7f77b2dcf9df9ea7b453def66902e85f42047c0375b093c8d2d91517acb42d1804e621b
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/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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-11 6:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-11 6:11 [gentoo-commits] repo/gentoo:master commit in: games-engines/fheroes2/files/, games-engines/fheroes2/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-07-06 6:24 Sam James
2023-06-19 20:15 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox