summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-engines/fifengine/Manifest2
-rw-r--r--games-engines/fifengine/fifengine-0.4.2.ebuild (renamed from games-engines/fifengine/fifengine-0.4.1.ebuild)37
-rw-r--r--games-engines/fifengine/fifengine-9999.ebuild81
-rw-r--r--games-engines/fifengine/files/fifengine-0.4.2-unbundle-libpng.patch (renamed from games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch)0
-rw-r--r--games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch25
-rw-r--r--games-engines/fifengine/metadata.xml7
6 files changed, 22 insertions, 130 deletions
diff --git a/games-engines/fifengine/Manifest b/games-engines/fifengine/Manifest
index 2d6c1bf..1ddffca 100644
--- a/games-engines/fifengine/Manifest
+++ b/games-engines/fifengine/Manifest
@@ -1 +1 @@
-DIST fifengine-0.4.1.tar.gz 15972607 SHA256 bae3fc591cc2891f7d1b3a656a5d8ad700ecc2e297ad453bf4f1bcbbf82e8cb2 SHA512 97c7d00fc74ca88ea18d3088477c64e5163781fb4546cf620d64e55d848472335c164e24e9e804afc7e71b382df1c1fe1447494b97a7f67b339880598eef8fe0 WHIRLPOOL eb0397d67f41070d6fbee4b9317e8e41d05238a344196f8ec5b9b9b6f6b8f72a4f17aa3afa76935c6c6b2800e8358d0a72e997f0690624d4ed951c353c2c1a63
+DIST fifengine-0.4.2.tar.gz 15713939 SHA256 e882b55befa36ae2f1a89ada16af0f814a1b78f7cbe6021ec5b1605604cf8ff8 SHA512 2b92e936d3f900532c5dee235a217c338941c44da479dceb3e48b3e8b93a402b31dc5501a6533391a01af53d6dbd51b6793c74e8ac81301ae6f1fa18271761a4 WHIRLPOOL c16fc54bdb6d251a1203d135e3619f25ef06c6524a6f5d1638cbe8a7da028228150c4d47de0ffe3b45b35c53e4311d8221a85f4bc08c68b18919b8d6643de0bb
diff --git a/games-engines/fifengine/fifengine-0.4.1.ebuild b/games-engines/fifengine/fifengine-0.4.2.ebuild
index f48afad..d9c9a6d 100644
--- a/games-engines/fifengine/fifengine-0.4.1.ebuild
+++ b/games-engines/fifengine/fifengine-0.4.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-#PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5}} )
-# py3 is not yet tested by upstream -> not merged in master
-PYTHON_COMPAT=( pypy python2_7 )
+PYTHON_COMPAT=( python3_{7,8} )
inherit eutils python-single-r1 cmake-utils
@@ -15,12 +13,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="debug +log +opengl +zip +fifechan librocket cegui python"
+IUSE="debug +log +opengl +zip +fifechan cegui python"
RDEPEND="
- librocket? ( dev-libs/libRocket )
cegui? ( dev-games/cegui )
fifechan? ( games-engines/fifechan )
dev-libs/tinyxml
@@ -39,7 +36,7 @@ RDEPEND="
virtual/opengl
virtual/glu
python? (
- dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pyyaml
${PYTHON_DEPS}
)
"
@@ -50,26 +47,22 @@ DEPEND="
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-usx() { usex $* ON OFF; }
+PATCHES=(
+ "${FILESDIR}/${P}-unbundle-libpng.patch"
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
}
-src_prepare() {
- epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
- default
-}
-
src_configure() {
local mycmakeargs=(
- -Dopengl=$(usx opengl)
- -Dfifechan=$(usx fifechan)
- -Dlibrocket=$(usx librocket)
- -Dcegui=$(usx cegui)
- -Dlogging=$(usx log)
- -Dbuild-python=$(usx python)
+ -Dopengl=$(usex opengl)
+ -Dfifechan=$(usex fifechan)
+ -Dlibrocket=OFF
+ -Dcegui=$(usex cegui)
+ -Dlogging=$(usex log)
+ -Dbuild-python=$(usex python)
-Dbuild-library=ON
)
diff --git a/games-engines/fifengine/fifengine-9999.ebuild b/games-engines/fifengine/fifengine-9999.ebuild
deleted file mode 100644
index 5923bd6..0000000
--- a/games-engines/fifengine/fifengine-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5}} )
-# py3 is not yet tested by upstream -> not merged in master
-PYTHON_COMPAT=( pypy python2_7 )
-
-inherit eutils python-single-r1 cmake-utils git-r3
-
-DESCRIPTION="Flexible Isometric Free Engine, 2D"
-HOMEPAGE="http://fifengine.de"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-
-LICENSE="GPL-2"
-
-KEYWORDS=""
-SLOT="0"
-IUSE="debug +log +opengl +zip +fifechan librocket cegui python"
-
-RDEPEND="
- librocket? ( dev-libs/libRocket )
- cegui? ( dev-games/cegui )
- fifechan? ( games-engines/fifechan )
- dev-libs/tinyxml
- media-libs/libpng
- media-libs/mesa
- >=dev-libs/boost-1.33.1
- media-libs/libsdl2
- media-libs/sdl2-ttf
- media-libs/sdl2-image[png]
- media-libs/libvorbis
- media-libs/libogg
- media-libs/openal
- >=sys-libs/zlib-1.2
- x11-libs/libXcursor
- x11-libs/libXext
- virtual/opengl
- virtual/glu
- python? (
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
-"
-DEPEND="
- ${RDEPEND}
- python? ( >=dev-lang/swig-1.3.40 )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-
-usx() { usex $* ON OFF; }
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
- default
-}
-
-src_configure() {
- local mycmakeargs=(
- -Dopengl=$(usx opengl)
- -Dfifechan=$(usx fifechan)
- -Dlibrocket=$(usx librocket)
- -Dcegui=$(usx cegui)
- -Dlogging=$(usx log)
- -Dbuild-python=$(usx python)
- -Dbuild-library=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch b/games-engines/fifengine/files/fifengine-0.4.2-unbundle-libpng.patch
index 9509211..9509211 100644
--- a/games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch
+++ b/games-engines/fifengine/files/fifengine-0.4.2-unbundle-libpng.patch
diff --git a/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch b/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
deleted file mode 100644
index 9509211..0000000
--- a/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: image.h
-===================================================================
---- a/engine/core/video/image.h (revision 3239)
-+++ b/engine/core/video/image.h (working copy)
-@@ -27,8 +27,6 @@
-
- // 3rd party library includes
- #include <SDL.h>
--#define PNG_SKIP_SETJMP_CHECK
--#include <png.h>
-
- // FIFE includes
- // These includes are split up in two parts, separated by one empty line
-Index: image.cpp
-===================================================================
---- a/engine/core/video/image.cpp (revision 3239)
-+++ b/engine/core/video/image.cpp (working copy)
-@@ -25,6 +25,7 @@
-
- // 3rd party library includes
- #include <SDL.h>
-+#include <png.h>
-
- // FIFE includes
- // These includes are split up in two parts, separated by one empty line
diff --git a/games-engines/fifengine/metadata.xml b/games-engines/fifengine/metadata.xml
index eb2356d..c0bc2a6 100644
--- a/games-engines/fifengine/metadata.xml
+++ b/games-engines/fifengine/metadata.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>krytzz@soylent.eu</email>
<name>steffen stramm</name>
</maintainer>
+<use>
+<flag name="cegui">Enable cegui support</flag>
+<flag name="fifechan">Enable Fifechan GUI subsystem</flag>
+<flag name="log">Enable logging</flag>
+</use>
</pkgmetadata>