* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2015-06-10 9:36 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 7+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-06-10 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 42df82ea28769ab387fe1769a43191e2dbbcc3d2
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Mon May 4 17:35:10 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 4 17:35:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=42df82ea
[games-strategy/vcmi] added 9999
games-strategy/vcmi/vcmi-9999.ebuild | 81 ++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/games-strategy/vcmi/vcmi-9999.ebuild b/games-strategy/vcmi/vcmi-9999.ebuild
new file mode 100644
index 0000000..ce5f4b0
--- /dev/null
+++ b/games-strategy/vcmi/vcmi-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils games cmake-utils git-r3
+
+DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
+HOMEPAGE="http://forum.vcmi.eu/index.php"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+EGIT_BRANCH="develop"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug editor launcher +erm"
+
+CDEPEND="
+ media-libs/libsdl2[video]
+ media-libs/sdl2-image
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
+ virtual/ffmpeg
+ sys-libs/zlib[minizip]
+ editor? (
+ dev-qt/qtgui
+ dev-qt/qtcore
+ dev-qt/qtwidgets
+ )
+ launcher? (
+ dev-qt/qtgui
+ dev-qt/qtcore
+ dev-qt/qtnetwork
+ dev-qt/qtwidgets
+ )
+ dev-libs/fuzzylite
+"
+
+DEPEND="
+ >dev-libs/boost-1.48.0
+ virtual/pkgconfig
+ ${CDEPEND}
+"
+RDEPEND="
+ ${CDEPEND}
+"
+PDEPEND="
+ games-strategy/vcmi-data
+"
+
+src_configure() {
+ local MY_DATADIR="${GAMES_DATADIR#/usr/}/${PN}"
+ local MY_GAMESLIBDIR=$(games_get_libdir)
+ local MY_LIBDIR=${MY_GAMESLIBDIR#/usr/}
+ local MY_BINDIR=${GAMES_BINDIR#/usr/}
+
+ use editor && ewarn "Editor seems to be broken. At least, it fails to build for me"
+ use debug || ewarn "Somewhy, buildsystem don't want to use cotire (compile time reducer) generated pch (precompiled header) with disabled debug, so, you will see the warnings on each target."
+
+ local mycmakeargs=(
+ -DDATA_DIR="${MY_DATADIR}"
+ -DLIB_DIR="${MY_LIBDIR}"
+ -DBIN_DIR="${MY_BINDIR}"
+ $(cmake-utils_use_enable erm ERM)
+ $(cmake-utils_use_enable editor EDITOR)
+ $(cmake-utils_use_enable launcher LAUNCHER)
+ )
+ export CCACHE_SLOPPINESS="time_macros"
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ prepgamesdirs
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2020-03-04 0:08 Azamat H. Hackimov
0 siblings, 0 replies; 7+ messages in thread
From: Azamat H. Hackimov @ 2020-03-04 0:08 UTC (permalink / raw
To: gentoo-commits
commit: c7ca20eeeed4dcf5b1e25b0622c6d0335d891ffc
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Mar 3 22:49:19 2020 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Mar 3 22:49:19 2020 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=c7ca20ee
games-strategy/vcmi: minor fixes
Removed live ebuild
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
games-strategy/vcmi/metadata.xml | 8 ++++
games-strategy/vcmi/vcmi-0.99.ebuild | 5 +--
games-strategy/vcmi/vcmi-9999.ebuild | 81 ------------------------------------
3 files changed, 10 insertions(+), 84 deletions(-)
diff --git a/games-strategy/vcmi/metadata.xml b/games-strategy/vcmi/metadata.xml
new file mode 100644
index 0000000..0fbb816
--- /dev/null
+++ b/games-strategy/vcmi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<use>
+<flag name="erm">Enable compilation of ERM scripting module</flag>
+<flag name="launcher">Enable launcer support</flag>
+</use>
+</pkgmetadata>
diff --git a/games-strategy/vcmi/vcmi-0.99.ebuild b/games-strategy/vcmi/vcmi-0.99.ebuild
index bf28be7..82ccb57 100644
--- a/games-strategy/vcmi/vcmi-0.99.ebuild
+++ b/games-strategy/vcmi/vcmi-0.99.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
EAPI=7
@@ -12,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="+debug erm +launcher"
CDEPEND="
diff --git a/games-strategy/vcmi/vcmi-9999.ebuild b/games-strategy/vcmi/vcmi-9999.ebuild
deleted file mode 100644
index ce5f4b0..0000000
--- a/games-strategy/vcmi/vcmi-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils games cmake-utils git-r3
-
-DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
-HOMEPAGE="http://forum.vcmi.eu/index.php"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-EGIT_BRANCH="develop"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug editor launcher +erm"
-
-CDEPEND="
- media-libs/libsdl2[video]
- media-libs/sdl2-image
- media-libs/sdl2-mixer
- media-libs/sdl2-ttf
- virtual/ffmpeg
- sys-libs/zlib[minizip]
- editor? (
- dev-qt/qtgui
- dev-qt/qtcore
- dev-qt/qtwidgets
- )
- launcher? (
- dev-qt/qtgui
- dev-qt/qtcore
- dev-qt/qtnetwork
- dev-qt/qtwidgets
- )
- dev-libs/fuzzylite
-"
-
-DEPEND="
- >dev-libs/boost-1.48.0
- virtual/pkgconfig
- ${CDEPEND}
-"
-RDEPEND="
- ${CDEPEND}
-"
-PDEPEND="
- games-strategy/vcmi-data
-"
-
-src_configure() {
- local MY_DATADIR="${GAMES_DATADIR#/usr/}/${PN}"
- local MY_GAMESLIBDIR=$(games_get_libdir)
- local MY_LIBDIR=${MY_GAMESLIBDIR#/usr/}
- local MY_BINDIR=${GAMES_BINDIR#/usr/}
-
- use editor && ewarn "Editor seems to be broken. At least, it fails to build for me"
- use debug || ewarn "Somewhy, buildsystem don't want to use cotire (compile time reducer) generated pch (precompiled header) with disabled debug, so, you will see the warnings on each target."
-
- local mycmakeargs=(
- -DDATA_DIR="${MY_DATADIR}"
- -DLIB_DIR="${MY_LIBDIR}"
- -DBIN_DIR="${MY_BINDIR}"
- $(cmake-utils_use_enable erm ERM)
- $(cmake-utils_use_enable editor EDITOR)
- $(cmake-utils_use_enable launcher LAUNCHER)
- )
- export CCACHE_SLOPPINESS="time_macros"
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2021-07-12 20:47 Azamat H. Hackimov
0 siblings, 0 replies; 7+ messages in thread
From: Azamat H. Hackimov @ 2021-07-12 20:47 UTC (permalink / raw
To: gentoo-commits
commit: b477605151fd118fcbda43a444fe8a1232cbd5fc
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Jul 12 20:23:26 2021 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Jul 12 20:45:59 2021 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=b4776051
games-strategy/vcmi: migrate to cmake.eclass
Fix ffmpeg dependency
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
games-strategy/vcmi/vcmi-0.99.ebuild | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/games-strategy/vcmi/vcmi-0.99.ebuild b/games-strategy/vcmi/vcmi-0.99.ebuild
index 82ccb57..0e8adba 100644
--- a/games-strategy/vcmi/vcmi-0.99.ebuild
+++ b/games-strategy/vcmi/vcmi-0.99.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils cmake-utils flag-o-matic
+inherit eutils cmake flag-o-matic
DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
HOMEPAGE="http://forum.vcmi.eu/index.php"
@@ -19,7 +19,7 @@ CDEPEND="
media-libs/sdl2-image
media-libs/sdl2-mixer
media-libs/sdl2-ttf
- virtual/ffmpeg
+ media-video/ffmpeg
sys-libs/zlib[minizip]
launcher? (
dev-qt/qtgui
@@ -61,10 +61,6 @@ src_configure() {
# ^ or not?
)
export CCACHE_SLOPPINESS="time_macros"
- cmake-utils_src_configure
+ cmake_src_configure
strip-cppflags -DNDEBUG
}
-
-src_install() {
- cmake-utils_src_install
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2023-04-15 22:48 Vadim Misbakh-Soloviov
0 siblings, 0 replies; 7+ messages in thread
From: Vadim Misbakh-Soloviov @ 2023-04-15 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 82f18269e486ba1238d4a49d1e1c85b220ccaa7a
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 21:01:20 2023 +0000
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 21:01:20 2023 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=82f18269
games-strategy/vcmi: bump
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
games-strategy/vcmi/vcmi-0.99.ebuild | 66 -----------------------
games-strategy/vcmi/vcmi-1.2.0.ebuild | 98 +++++++++++++++++++++++++++++++++++
2 files changed, 98 insertions(+), 66 deletions(-)
diff --git a/games-strategy/vcmi/vcmi-0.99.ebuild b/games-strategy/vcmi/vcmi-0.99.ebuild
deleted file mode 100644
index 0e8adba..0000000
--- a/games-strategy/vcmi/vcmi-0.99.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake flag-o-matic
-
-DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
-HOMEPAGE="http://forum.vcmi.eu/index.php"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+debug erm +launcher"
-
-CDEPEND="
- media-libs/libsdl2[video]
- media-libs/sdl2-image
- media-libs/sdl2-mixer
- media-libs/sdl2-ttf
- media-video/ffmpeg
- sys-libs/zlib[minizip]
- launcher? (
- dev-qt/qtgui
- dev-qt/qtcore
- dev-qt/qtnetwork
- dev-qt/qtwidgets
- )
- dev-libs/fuzzylite
-"
-
-BDEPEND="
- >dev-libs/boost-1.48.0
- virtual/pkgconfig
-"
-DEPEND="
- ${BDEPEND}
- ${CDEPEND}
-"
-RDEPEND="
- ${CDEPEND}
-"
-PDEPEND="
- games-strategy/vcmi-data
-"
-
-pkg_pretend() {
- ewarn 'Looks like current this release is incompatible with modern boost and fails to compile.'
- ewarn 'Please, report me in case if it will build fine for you'
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_ERM=$(usex erm)
- -DENABLE_LAUNCHER=$(usex launcher)
- -DENABLE_PCH=$(usex debug)
- # ^ cc1plus: warning: .../work/vcmi-0.99_build/lib/cotire/vcmi_CXX_prefix.hxx.gch: not used because `NDEBUG' is defined [-Winvalid-pch]
- # (cmake-utils_src_configure somewhy defines -DNDEBUG in release build. I dunno why on the earth it's author did that)
- -DENABLE_MONOLITHIC_INSTALL=OFF
- # ^ or not?
- )
- export CCACHE_SLOPPINESS="time_macros"
- cmake_src_configure
- strip-cppflags -DNDEBUG
-}
diff --git a/games-strategy/vcmi/vcmi-1.2.0.ebuild b/games-strategy/vcmi/vcmi-1.2.0.ebuild
new file mode 100644
index 0000000..aa35155
--- /dev/null
+++ b/games-strategy/vcmi/vcmi-1.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=(luajit)
+# TODO: other targets (buildsystem is fucked and needs patches)
+
+inherit cmake lua-single flag-o-matic
+
+DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
+HOMEPAGE="http://forum.vcmi.eu/index.php"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: other arches
+IUSE="+editor +debug +erm +launcher +lua +nullkiller-ai +translations"
+
+REQUIRED_USE="
+ erm? ( lua )
+ lua? ( ${LUA_REQUIRED_USE} )
+"
+
+CDEPEND="
+ media-libs/libsdl2[video]
+ media-libs/sdl2-image
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
+ media-video/ffmpeg
+ launcher? (
+ dev-qt/qtgui
+ dev-qt/qtcore
+ dev-qt/qtnetwork
+ dev-qt/qtwidgets
+ translations? ( dev-qt/linguist-tools )
+ )
+ editor? (
+ dev-qt/qtgui
+ dev-qt/qtcore
+ dev-qt/qtnetwork
+ dev-qt/qtwidgets
+ translations? ( dev-qt/linguist-tools )
+ )
+ dev-libs/fuzzylite
+ nullkiller-ai? ( dev-cpp/tbb )
+ sys-libs/zlib[minizip]
+"
+
+BDEPEND="
+ >dev-libs/boost-1.48.0
+ virtual/pkgconfig
+"
+DEPEND="
+ ${BDEPEND}
+ ${CDEPEND}
+"
+RDEPEND="
+ ${CDEPEND}
+"
+# PDEPEND="
+# games-strategy/vcmi-data
+# "
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_ERM=$(usex erm)
+ -DENABLE_LUA=$(usex lua)
+ -DENABLE_LAUNCHER=$(usex launcher)
+ -DENABLE_EDITOR=$(usex editor)
+ -DENABLE_TRANSLATIONS=$(usex translations)
+ -DENABLE_PCH=$(usex !debug)
+ -DENABLE_NULLKILLER_AI=$(usex nullkiller-ai)
+
+ -DENABLE_MONOLITHIC_INSTALL=OFF
+ )
+ export CCACHE_SLOPPINESS="time_macros"
+ cmake_src_configure
+ strip-cppflags -DNDEBUG
+}
+
+pkg_postinst() {
+ elog "For the game to work properly, please copy your"
+ elog 'Heroes Of Might and Magic ("The Wake Of Gods" or'
+ elog '"Shadow of Death" or "Complete edition")'
+ elog "game directory into /usr/share/${PN}."
+ elog "or use 'vcmibuilder' utility on your:"
+ elog " a) One or two CD's or CD images"
+ elog " b) gog.com installer"
+ elog " c) Directory with installed game"
+ elog "(although installing it in such way is 'bad practices')."
+ elog "For more information, please visit:"
+ elog "http://wiki.vcmi.eu/index.php?title=Installation_on_Linux"
+ elog ""
+ elog "Also, you may want to install VCMI Extras and Wake of Gods"
+ elog "mods from the launcher after you'll start the game"
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2024-01-15 16:59 Vadim Misbakh-Soloviov
0 siblings, 0 replies; 7+ messages in thread
From: Vadim Misbakh-Soloviov @ 2024-01-15 16:59 UTC (permalink / raw
To: gentoo-commits
commit: cc94c1ccdb5805a994ba097ea6acf31a0d4d4f3d
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 16:51:37 2024 +0000
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 16:55:48 2024 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=cc94c1cc
games-strategy/vcmi: Bump
Closes: https://bugs.gentoo.org/905707
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
games-strategy/vcmi/metadata.xml | 14 ++++++++++----
.../vcmi/{vcmi-1.2.0.ebuild => vcmi-1.4.2.ebuild} | 11 +++++++----
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/games-strategy/vcmi/metadata.xml b/games-strategy/vcmi/metadata.xml
index 0fbb816..a946854 100644
--- a/games-strategy/vcmi/metadata.xml
+++ b/games-strategy/vcmi/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<use>
-<flag name="erm">Enable compilation of ERM scripting module</flag>
-<flag name="launcher">Enable launcer support</flag>
-</use>
+ <use>
+ <flag name="erm">Enable compilation of ERM scripting module</flag>
+ <flag name="launcher">Enable launcer support</flag>
+ <flag name="editor">Enable editor support</flag>
+ <flag name="nullkiller-ai">Enable NulKIller AI</flag>
+ <flag name="translations">Install translations</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">vcmi/vcmi</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/games-strategy/vcmi/vcmi-1.2.0.ebuild b/games-strategy/vcmi/vcmi-1.4.2.ebuild
similarity index 89%
rename from games-strategy/vcmi/vcmi-1.2.0.ebuild
rename to games-strategy/vcmi/vcmi-1.4.2.ebuild
index aa35155..06a7390 100644
--- a/games-strategy/vcmi/vcmi-1.2.0.ebuild
+++ b/games-strategy/vcmi/vcmi-1.4.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
LUA_COMPAT=(luajit)
-# TODO: other targets (buildsystem is fucked and needs patches)
+# TODO: other targets (buildsystem is crazy and needs patches)
-inherit cmake lua-single flag-o-matic
+inherit cmake lua-single
DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
HOMEPAGE="http://forum.vcmi.eu/index.php"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# TODO: other arches
-IUSE="+editor +debug +erm +launcher +lua +nullkiller-ai +translations"
+IUSE="+editor debug erm +launcher lua +nullkiller-ai +translations"
REQUIRED_USE="
erm? ( lua )
@@ -74,10 +74,13 @@ src_configure() {
-DENABLE_NULLKILLER_AI=$(usex nullkiller-ai)
-DENABLE_MONOLITHIC_INSTALL=OFF
+ -DFORCE_BUNDLED_FL=OFF
+ -DFORCE_BUNDLED_MINIZIP=OFF
+ -DENABLE_GITVERSION=OFF
+ -DBoost_NO_BOOST_CMAKE=ON
)
export CCACHE_SLOPPINESS="time_macros"
cmake_src_configure
- strip-cppflags -DNDEBUG
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2024-09-19 1:04 Vadim Misbakh-Soloviov
0 siblings, 0 replies; 7+ messages in thread
From: Vadim Misbakh-Soloviov @ 2024-09-19 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 0e8038ac14cd2b2b4c8b29805820b26dfc9f453f
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 01:04:37 2024 +0000
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 01:04:37 2024 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=0e8038ac
games-strategy/vcmi: bump
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
.../vcmi/{vcmi-1.4.2.ebuild => vcmi-1.5.7.ebuild} | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/games-strategy/vcmi/vcmi-1.4.2.ebuild b/games-strategy/vcmi/vcmi-1.5.7.ebuild
similarity index 90%
rename from games-strategy/vcmi/vcmi-1.4.2.ebuild
rename to games-strategy/vcmi/vcmi-1.5.7.ebuild
index 06a7390..21dc51e 100644
--- a/games-strategy/vcmi/vcmi-1.4.2.ebuild
+++ b/games-strategy/vcmi/vcmi-1.5.7.ebuild
@@ -24,11 +24,11 @@ REQUIRED_USE="
"
CDEPEND="
- media-libs/libsdl2[video]
- media-libs/sdl2-image
- media-libs/sdl2-mixer
- media-libs/sdl2-ttf
- media-video/ffmpeg
+ media-libs/libsdl2:=[video]
+ media-libs/sdl2-image:=
+ media-libs/sdl2-mixer:=
+ media-libs/sdl2-ttf:=
+ media-video/ffmpeg:=
launcher? (
dev-qt/qtgui
dev-qt/qtcore
@@ -43,13 +43,13 @@ CDEPEND="
dev-qt/qtwidgets
translations? ( dev-qt/linguist-tools )
)
- dev-libs/fuzzylite
+ dev-libs/fuzzylite:=
nullkiller-ai? ( dev-cpp/tbb )
- sys-libs/zlib[minizip]
+ sys-libs/zlib:=[minizip]
"
BDEPEND="
- >dev-libs/boost-1.48.0
+ >dev-libs/boost-1.70.0
virtual/pkgconfig
"
DEPEND="
@@ -79,7 +79,7 @@ src_configure() {
-DENABLE_GITVERSION=OFF
-DBoost_NO_BOOST_CMAKE=ON
)
- export CCACHE_SLOPPINESS="time_macros"
+ # export CCACHE_SLOPPINESS="time_macros"
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/
@ 2024-09-19 1:35 Vadim Misbakh-Soloviov
0 siblings, 0 replies; 7+ messages in thread
From: Vadim Misbakh-Soloviov @ 2024-09-19 1:35 UTC (permalink / raw
To: gentoo-commits
commit: 0b528a6fa810acfc36650d42ec5f84bf326bddea
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 01:35:13 2024 +0000
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 01:35:13 2024 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=0b528a6f
games-strategy/vcmi: fix build && added 9999
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>
games-strategy/vcmi/vcmi-1.5.7.ebuild | 32 ++++++++++++++++++++--
.../vcmi/{vcmi-1.5.7.ebuild => vcmi-9999.ebuild} | 32 ++++++++++++++++++++--
2 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/games-strategy/vcmi/vcmi-1.5.7.ebuild b/games-strategy/vcmi/vcmi-1.5.7.ebuild
index 21dc51e..b8b54f3 100644
--- a/games-strategy/vcmi/vcmi-1.5.7.ebuild
+++ b/games-strategy/vcmi/vcmi-1.5.7.ebuild
@@ -10,11 +10,27 @@ inherit cmake lua-single
DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
HOMEPAGE="http://forum.vcmi.eu/index.php"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vcmi/vcmi"
+ EGIT_SUBMODULES=(
+ "-*"
+ "innoextract"
+ )
+else
+ INNO_SHA="9977089412ebafe9f79936aa65a2edf16a84ae3e"
+ SRC_URI="
+ https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/vcmi/innoextract/archive/${INNO_SHA}.tar.gz -> ${PN}-innoextract-${INNO_SHA}.tar.gz
+ "
+ # N.B.: see here for correct commit of innoextract:
+ #https://github.com/vcmi/vcmi/tree/develop/launcher
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
# TODO: other arches
IUSE="+editor debug erm +launcher lua +nullkiller-ai +translations"
@@ -47,7 +63,8 @@ CDEPEND="
nullkiller-ai? ( dev-cpp/tbb )
sys-libs/zlib:=[minizip]
"
-
+ # app-arch/innoextract
+ # XXX: 👆 vcmi wants it's own patched version to build extractor as library (bruh...)
BDEPEND="
>dev-libs/boost-1.70.0
virtual/pkgconfig
@@ -63,6 +80,15 @@ RDEPEND="
# games-strategy/vcmi-data
# "
+src_unpack() {
+ [[ "${PV}" == *9999* ]] && git-r3_src_unpack
+ default
+ [[ "${PV}" == *9999* ]] || {
+ rmdir "${S}/launcher/lib/innoextract"
+ mv "${WORKDIR}/innoextract-${INNO_SHA}" "${S}/launcher/lib/innoextract"
+ }
+}
+
src_configure() {
local mycmakeargs=(
-DENABLE_ERM=$(usex erm)
diff --git a/games-strategy/vcmi/vcmi-1.5.7.ebuild b/games-strategy/vcmi/vcmi-9999.ebuild
similarity index 73%
copy from games-strategy/vcmi/vcmi-1.5.7.ebuild
copy to games-strategy/vcmi/vcmi-9999.ebuild
index 21dc51e..b8b54f3 100644
--- a/games-strategy/vcmi/vcmi-1.5.7.ebuild
+++ b/games-strategy/vcmi/vcmi-9999.ebuild
@@ -10,11 +10,27 @@ inherit cmake lua-single
DESCRIPTION="Heroes of Might and Magic III game engine rewrite"
HOMEPAGE="http://forum.vcmi.eu/index.php"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vcmi/vcmi"
+ EGIT_SUBMODULES=(
+ "-*"
+ "innoextract"
+ )
+else
+ INNO_SHA="9977089412ebafe9f79936aa65a2edf16a84ae3e"
+ SRC_URI="
+ https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/vcmi/innoextract/archive/${INNO_SHA}.tar.gz -> ${PN}-innoextract-${INNO_SHA}.tar.gz
+ "
+ # N.B.: see here for correct commit of innoextract:
+ #https://github.com/vcmi/vcmi/tree/develop/launcher
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
# TODO: other arches
IUSE="+editor debug erm +launcher lua +nullkiller-ai +translations"
@@ -47,7 +63,8 @@ CDEPEND="
nullkiller-ai? ( dev-cpp/tbb )
sys-libs/zlib:=[minizip]
"
-
+ # app-arch/innoextract
+ # XXX: 👆 vcmi wants it's own patched version to build extractor as library (bruh...)
BDEPEND="
>dev-libs/boost-1.70.0
virtual/pkgconfig
@@ -63,6 +80,15 @@ RDEPEND="
# games-strategy/vcmi-data
# "
+src_unpack() {
+ [[ "${PV}" == *9999* ]] && git-r3_src_unpack
+ default
+ [[ "${PV}" == *9999* ]] || {
+ rmdir "${S}/launcher/lib/innoextract"
+ mv "${WORKDIR}/innoextract-${INNO_SHA}" "${S}/launcher/lib/innoextract"
+ }
+}
+
src_configure() {
local mycmakeargs=(
-DENABLE_ERM=$(usex erm)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-19 1:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-19 1:35 [gentoo-commits] proj/gamerlay:master commit in: games-strategy/vcmi/ Vadim Misbakh-Soloviov
-- strict thread matches above, loose matches on Subject: below --
2024-09-19 1:04 Vadim Misbakh-Soloviov
2024-01-15 16:59 Vadim Misbakh-Soloviov
2023-04-15 22:48 Vadim Misbakh-Soloviov
2021-07-12 20:47 Azamat H. Hackimov
2020-03-04 0:08 Azamat H. Hackimov
2015-06-10 9:36 Vadim A. Misbakh-Soloviov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox