public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: games-sports/stuntrally/files/, games-sports/stuntrally/
@ 2013-05-03 17:49 Sergey Popov
  0 siblings, 0 replies; 2+ messages in thread
From: Sergey Popov @ 2013-05-03 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     502a2737e67bcd04124fbe544015ffccf1af8e0c
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 17:48:46 2013 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri May  3 17:48:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=502a2737

games-sports/stuntrally: revision bump

- add missing dependency on x11-libs/libXcursor;
- correct desktop files handling in src_install;
- fix desktop files;
- continue work on respecting games eclass variables;
- add TODO things as ebuild comments;
- install dedicated server binary, silence output from pushd/popd.

---
 .../stuntrally-1.9-sharedir-absolute-path.patch    |   16 ++++
 games-sports/stuntrally/stuntrally-1.9-r1.ebuild   |   94 ++++++++++++++++++++
 2 files changed, 110 insertions(+), 0 deletions(-)

diff --git a/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch b/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch
new file mode 100644
index 0000000..27ebe87
--- /dev/null
+++ b/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch
@@ -0,0 +1,16 @@
+Draft version of patch, that makes possible to define SHARED_DATA_DIR as
+absolute path.
+
+Notes: possibly breaks loading of data from user's home folder
+
+--- source/vdrift/pathmanager.cpp.orig	2013-04-22 14:44:09.626544667 +0400
++++ source/vdrift/pathmanager.cpp	2013-04-22 14:45:01.010546299 +0400
+@@ -176,7 +176,7 @@
+ 		//dirs.push_back(user_data_dir);
+ 
+ 		// Adding relative path from installed executable
+-		dirs.push_back(execname().parent_path().parent_path() / shareDir);
++		dirs.push_back(shareDir);
+ 		// Adding relative path for running from sources
+ 		dirs.push_back(execname().parent_path().parent_path() / "data");
+ 		dirs.push_back(execname().parent_path().parent_path());

diff --git a/games-sports/stuntrally/stuntrally-1.9-r1.ebuild b/games-sports/stuntrally/stuntrally-1.9-r1.ebuild
new file mode 100644
index 0000000..28c5743
--- /dev/null
+++ b/games-sports/stuntrally/stuntrally-1.9-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_P="StuntRally-${PV}-sources"
+
+inherit cmake-utils eutils games
+
+DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
+HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="dedicated +game editor"
+
+S="${WORKDIR}/${MY_P}"
+
+# TODO:
+# - check for bundled dependencies(for e.g. libbullet)
+# - verify dependencies in RDEPEND(libXcursor is already confirmed)
+# - possibly add one more string to REQUIRED_USE to avoid unneeded building with USE="-*"
+RDEPEND="game? (
+		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
+		dev-games/mygui
+		media-libs/libsdl:0
+		media-libs/libvorbis
+		media-libs/libogg
+		x11-libs/libXcursor
+	)
+	dev-libs/boost
+	net-libs/enet:1.3
+	virtual/libstdc++"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="editor? ( game )"
+
+DOCS=( Readme.txt )
+PATCHES=( "${FILESDIR}/${P}-sharedir-absolute-path.patch" )
+
+src_prepare() {
+	sed -i -e '/^Categories/s/Application;//' dist/*.desktop || die "sed on desktop files failed"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSHARE_INSTALL="${GAMES_DATADIR}/${PN}"
+		$(cmake-utils_use_build dedicated MASTER_SERVER)
+		$(cmake-utils_use_build game GAME)
+		$(cmake-utils_use_build editor EDITOR)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/*
+
+	rm config/CMakeLists.txt || die
+	doins -r config
+
+	dodoc ${DOCS[@]}
+	if use dedicated; then
+		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
+		dogamesbin sr-masterserver
+		popd &>/dev/null
+	fi
+	if use editor; then
+		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
+		dogamesbin sr-editor
+		popd &>/dev/null
+		domenu dist/sr-editor.desktop
+		doicon -s 64 dist/sr-editor.png
+	fi
+	if use game; then
+		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
+		dogamesbin ${PN}
+		popd &>/dev/null
+		domenu dist/${PN}.desktop
+		doicon -s 64 dist/${PN}.png
+	fi
+
+	prepgamesdirs
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-sports/stuntrally/files/, games-sports/stuntrally/
@ 2016-07-24 21:10 Vadim A. Misbakh-Soloviov
  0 siblings, 0 replies; 2+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2016-07-24 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f59b51841e388ed5dbfb4fb02f6d7cde5652b27e
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Jul 24 21:10:33 2016 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Jul 24 21:10:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=f59b5184

stuntrally: bump

 .../stuntrally-1.9-sharedir-absolute-path.patch    | 16 ----
 games-sports/stuntrally/stuntrally-1.9-r1.ebuild   | 94 ----------------------
 ...stuntrally-1.9.ebuild => stuntrally-2.6.ebuild} | 35 ++++----
 games-sports/stuntrally/stuntrally-9999.ebuild     | 40 ++++-----
 4 files changed, 34 insertions(+), 151 deletions(-)

diff --git a/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch b/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch
deleted file mode 100644
index 27ebe87..0000000
--- a/games-sports/stuntrally/files/stuntrally-1.9-sharedir-absolute-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Draft version of patch, that makes possible to define SHARED_DATA_DIR as
-absolute path.
-
-Notes: possibly breaks loading of data from user's home folder
-
---- source/vdrift/pathmanager.cpp.orig	2013-04-22 14:44:09.626544667 +0400
-+++ source/vdrift/pathmanager.cpp	2013-04-22 14:45:01.010546299 +0400
-@@ -176,7 +176,7 @@
- 		//dirs.push_back(user_data_dir);
- 
- 		// Adding relative path from installed executable
--		dirs.push_back(execname().parent_path().parent_path() / shareDir);
-+		dirs.push_back(shareDir);
- 		// Adding relative path for running from sources
- 		dirs.push_back(execname().parent_path().parent_path() / "data");
- 		dirs.push_back(execname().parent_path().parent_path());

diff --git a/games-sports/stuntrally/stuntrally-1.9-r1.ebuild b/games-sports/stuntrally/stuntrally-1.9-r1.ebuild
deleted file mode 100644
index 28c5743..0000000
--- a/games-sports/stuntrally/stuntrally-1.9-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_P="StuntRally-${PV}-sources"
-
-inherit cmake-utils eutils games
-
-DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
-HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="dedicated +game editor"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# - check for bundled dependencies(for e.g. libbullet)
-# - verify dependencies in RDEPEND(libXcursor is already confirmed)
-# - possibly add one more string to REQUIRED_USE to avoid unneeded building with USE="-*"
-RDEPEND="game? (
-		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
-		dev-games/mygui
-		media-libs/libsdl:0
-		media-libs/libvorbis
-		media-libs/libogg
-		x11-libs/libXcursor
-	)
-	dev-libs/boost
-	net-libs/enet:1.3
-	virtual/libstdc++"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="editor? ( game )"
-
-DOCS=( Readme.txt )
-PATCHES=( "${FILESDIR}/${P}-sharedir-absolute-path.patch" )
-
-src_prepare() {
-	sed -i -e '/^Categories/s/Application;//' dist/*.desktop || die "sed on desktop files failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSHARE_INSTALL="${GAMES_DATADIR}/${PN}"
-		$(cmake-utils_use_build dedicated MASTER_SERVER)
-		$(cmake-utils_use_build game GAME)
-		$(cmake-utils_use_build editor EDITOR)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/*
-
-	rm config/CMakeLists.txt || die
-	doins -r config
-
-	dodoc ${DOCS[@]}
-	if use dedicated; then
-		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
-		dogamesbin sr-masterserver
-		popd &>/dev/null
-	fi
-	if use editor; then
-		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
-		dogamesbin sr-editor
-		popd &>/dev/null
-		domenu dist/sr-editor.desktop
-		doicon -s 64 dist/sr-editor.png
-	fi
-	if use game; then
-		pushd "${CMAKE_BUILD_DIR}" &>/dev/null || die
-		dogamesbin ${PN}
-		popd &>/dev/null
-		domenu dist/${PN}.desktop
-		doicon -s 64 dist/${PN}.png
-	fi
-
-	prepgamesdirs
-}

diff --git a/games-sports/stuntrally/stuntrally-1.9.ebuild b/games-sports/stuntrally/stuntrally-2.6.ebuild
similarity index 59%
rename from games-sports/stuntrally/stuntrally-1.9.ebuild
rename to games-sports/stuntrally/stuntrally-2.6.ebuild
index 86ed7e0..70ac400 100644
--- a/games-sports/stuntrally/stuntrally-1.9.ebuild
+++ b/games-sports/stuntrally/stuntrally-2.6.ebuild
@@ -2,56 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI="6"
 
-[[ ${PV} = 9999* ]] && GIT="git-2"
+[[ ${PV} = 9999* ]] && GIT="git-r3"
 
-inherit games cmake-utils ${GIT}
+inherit cmake-utils ${GIT}
 
 DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
-HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
+HOMEPAGE="http://stuntrally.tuxfamily.org/"
 
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="dedicated +game editor"
+IUSE="dedicated +game editor static-libs"
 
 if [[ ${PV} = 9999* ]]; then
-        SRC_URI=""
-        KEYWORDS=""
+	SRC_URI=""
+	KEYWORDS=""
 	EGIT_REPO_URI="https://github.com/stuntrally/stuntrally"
 	LIVE_PDEPEND="=${CATEGORY}/${PN}-tracks-${PV}"
 else
-	MY_P="StuntRally-${PV}-sources"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
 RDEPEND="
 	game? (
 		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
-		dev-games/mygui
-		media-libs/libsdl:0
+		dev-games/mygui[ogre]
+		media-libs/libsdl2
 		media-libs/libvorbis
 		media-libs/libogg
+		media-libs/openal
+		sci-physics/bullet[bullet3,extras]
 	)
 	dev-libs/boost
 	net-libs/enet:1.3
 	virtual/libstdc++
-	sys-devel/gcc
 "
 DEPEND="${RDEPEND}"
 PDEPEND="${LIVE_PDEPEND}"
 
 REQUIRED_USE="editor? ( game )"
 
-DOCS=( Readme.txt )
+DOCS=(Readme.txt)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build dedicated MASTER_SERVER)
-		$(cmake-utils_use_build game GAME)
-		$(cmake-utils_use_build editor EDITOR)
+		-DBUILD_MASTER_SERVER=$(usex dedicated ON OFF)
+		-DBUILD_GAME=$(usex game ON OFF)
+		-DBUILD_EDITOR=$(usex editor ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs ON OFF)
 	)
 	cmake-utils_src_configure
 }
@@ -59,5 +59,4 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	prepgamesdirs
 }

diff --git a/games-sports/stuntrally/stuntrally-9999.ebuild b/games-sports/stuntrally/stuntrally-9999.ebuild
index 86ed7e0..398a19e 100644
--- a/games-sports/stuntrally/stuntrally-9999.ebuild
+++ b/games-sports/stuntrally/stuntrally-9999.ebuild
@@ -2,62 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI="6"
 
-[[ ${PV} = 9999* ]] && GIT="git-2"
+[[ ${PV} = 9999* ]] && GIT="git-r3"
 
-inherit games cmake-utils ${GIT}
+inherit ${GIT} cmake-utils
 
 DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements (jumps, loops, pipes)."
-HOMEPAGE="http://code.google.com/p/vdrift-ogre/"
+HOMEPAGE="http://stuntrally.tuxfamily.org/"
 
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="dedicated +game editor"
+IUSE="dedicated +game editor static-libs"
 
 if [[ ${PV} = 9999* ]]; then
-        SRC_URI=""
-        KEYWORDS=""
+	SRC_URI=""
+	KEYWORDS=""
 	EGIT_REPO_URI="https://github.com/stuntrally/stuntrally"
 	LIVE_PDEPEND="=${CATEGORY}/${PN}-tracks-${PV}"
 else
-	MY_P="StuntRally-${PV}-sources"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
 RDEPEND="
 	game? (
 		dev-games/ogre[cg,boost,ois,freeimage,opengl,zip]
-		dev-games/mygui
-		media-libs/libsdl:0
+		dev-games/mygui[ogre]
+		media-libs/libsdl2
 		media-libs/libvorbis
 		media-libs/libogg
+		media-libs/openal
+		sci-physics/bullet[bullet3,extras]
 	)
 	dev-libs/boost
 	net-libs/enet:1.3
 	virtual/libstdc++
-	sys-devel/gcc
 "
 DEPEND="${RDEPEND}"
 PDEPEND="${LIVE_PDEPEND}"
 
 REQUIRED_USE="editor? ( game )"
 
-DOCS=( Readme.txt )
+DOCS=(Readme.txt)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build dedicated MASTER_SERVER)
-		$(cmake-utils_use_build game GAME)
-		$(cmake-utils_use_build editor EDITOR)
+		-DBUILD_MASTER_SERVER=$(usex dedicated ON OFF)
+		-DBUILD_GAME=$(usex game ON OFF)
+		-DBUILD_EDITOR=$(usex editor ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs ON OFF)
 	)
 	cmake-utils_src_configure
 }
-
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-07-24 21:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-03 17:49 [gentoo-commits] proj/gamerlay:master commit in: games-sports/stuntrally/files/, games-sports/stuntrally/ Sergey Popov
  -- strict thread matches above, loose matches on Subject: below --
2016-07-24 21:10 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