From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97F06139085 for ; Sun, 29 Jan 2017 15:16:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8570C234021; Sun, 29 Jan 2017 15:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D90A234021 for ; Sun, 29 Jan 2017 15:16:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B629341265 for ; Sun, 29 Jan 2017 15:16:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FAA039E7 for ; Sun, 29 Jan 2017 15:16:09 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1485702958.4adcc7ce36c70cc14368b862fa3b23b2c2fa8f2e.mva@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-puzzle/puzzlemoppet/files/, games-puzzle/puzzlemoppet/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild X-VCS-Directories: games-puzzle/puzzlemoppet/files/ games-puzzle/puzzlemoppet/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: 4adcc7ce36c70cc14368b862fa3b23b2c2fa8f2e X-VCS-Branch: master Date: Sun, 29 Jan 2017 15:16:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ff8e1bbc-2235-4287-8833-9be69c205418 X-Archives-Hash: 0b5dd2efd1f194d98eb0a9ef0419a46e commit: 4adcc7ce36c70cc14368b862fa3b23b2c2fa8f2e Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Sun Jan 29 15:15:58 2017 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Sun Jan 29 15:15:58 2017 +0000 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=4adcc7ce puzzlemoppet: fix gentoo bug #607578 .../puzzlemoppet/files/puzzlemoppet-64bit.patch | 4 +- .../puzzlemoppet/files/puzzlemoppet-cmake.patch | 4 +- .../puzzlemoppet/files/puzzlemoppet-irrhack.patch | 10 ++-- .../puzzlemoppet/files/puzzlemoppet-irrpatch.patch | 5 +- games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild | 54 +++++++++++----------- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch index 86015d8..99152ba 100644 --- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch +++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch @@ -1,5 +1,5 @@ ---- PuzzleMoppetSource/Litha Engine/source/Engine.cppO 2011-09-17 15:06:28.000000000 +0200 -+++ PuzzleMoppetSource/Litha Engine/source/Engine.cpp 2012-07-14 10:07:32.120033849 +0200 +--- a/source/Engine.cpp 2011-09-17 15:06:28.000000000 +0200 ++++ b/source/Engine.cpp 2012-07-14 10:07:32.120033849 +0200 @@ -781,10 +781,11 @@ // this engine. Obviously this event cannot be stored or transmitted over a network // in case the pointer gets invalidated. diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch index 42932b2..cd3f4e9 100644 --- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch +++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch @@ -1,5 +1,5 @@ ---- PuzzleMoppetSource/Litha Engine/projects/Puzzle/CMakeLists.txtO 2011-09-17 15:06:24.000000000 +0200 -+++ PuzzleMoppetSource/Litha Engine/projects/Puzzle/CMakeLists.txt 2012-07-14 09:52:14.060028541 +0200 +--- a/projects/Puzzle/CMakeLists.txt 2011-09-17 15:06:24.000000000 +0200 ++++ b/projects/Puzzle/CMakeLists.txt 2012-07-14 09:52:14.060028541 +0200 @@ -26,18 +26,8 @@ diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch index 43c9a75..4c1978f 100644 --- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch +++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch @@ -1,6 +1,5 @@ -diff -Naur PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp PuzzleMoppetSource-p2/Litha Engine/projects/Puzzle/Events.cpp ---- PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp 2012-06-30 13:19:23.000000000 +0200 -+++ PuzzleMoppetSource-p2/Litha Engine/projects/Puzzle/Events.cpp 2012-07-13 15:21:09.048032909 +0200 +--- a/projects/Puzzle/Events.cpp 2012-06-30 13:19:23.000000000 +0200 ++++ b/projects/Puzzle/Events.cpp 2012-07-13 15:21:09.048032909 +0200 @@ -355,11 +355,11 @@ // Emit entire one second's worth of particles all at once. @@ -16,9 +15,8 @@ diff -Naur PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp PuzzleM scene::IParticleAffector *affector = ps->createFadeOutParticleAffector(); -diff -Naur PuzzleMoppetSource-p1/Litha Engine/source/PostProcessingChain.cpp PuzzleMoppetSource-p2/Litha Engine/source/PostProcessingChain.cpp ---- PuzzleMoppetSource-p1/Litha Engine/source/PostProcessingChain.cpp 2011-09-17 15:06:28.000000000 +0200 -+++ PuzzleMoppetSource-p2/Litha Engine/source/PostProcessingChain.cpp 2012-07-13 15:16:01.148032909 +0200 +--- a/source/PostProcessingChain.cpp 2011-09-17 15:06:28.000000000 +0200 ++++ b/source/PostProcessingChain.cpp 2012-07-13 15:16:01.148032909 +0200 @@ -62,12 +62,12 @@ // Create RTT diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch index f525092..48d26f5 100644 --- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch +++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch @@ -1,6 +1,5 @@ -diff -Naur PuzzleMoppetSource-o/Litha Engine/CMakeLists.txt PuzzleMoppetSource/Litha Engine/CMakeLists.txt ---- PuzzleMoppetSource-o/Litha Engine/CMakeLists.txt 2012-07-13 18:19:24.600053643 +0200 -+++ PuzzleMoppetSource/Litha Engine/CMakeLists.txt 2012-07-13 18:34:48.960062962 +0200 +--- a/CMakeLists.txt 2017-01-29 21:07:57.191535103 +0700 ++++ b/CMakeLists.txt 2017-01-29 21:08:48.953560110 +0700 @@ -57,11 +57,19 @@ # (things required by both litha engine and individual projects) # (actually some of these probably aren't required by both...) diff --git a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild index c35946a..f6229b4 100644 --- a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild +++ b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild @@ -1,52 +1,54 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: games-puzzle/puzzlemoppet-1.0.ebuild frostwork Exp $ -EAPI="3" +EAPI="6" MY_PN="PuzzleMoppet" -inherit games cmake-utils +inherit cmake-utils DESCRIPTION="a serenely peaceful yet devilishly challenging 3D puzzle game" -HOMEPAGE="http://http://garnetgames.com/${PN}" -SRC_URI="http://garnetgames.com/${MY_PN}Full.tar.gz - http://garnetgames.com/${MY_PN}Source.tar.gz - http://nothings.org/stb_vorbis/stb_vorbis.c" +HOMEPAGE="http://garnetgames.com/puzzlemoppet" +SRC_URI=" + http://garnetgames.com/${MY_PN}Full.tar.gz + http://garnetgames.com/${MY_PN}Source.tar.gz + https://raw.githubusercontent.com/nothings/stb/e2caccb811d70af0dc359be5522e6b0d3b503e46/stb_vorbis.c -> ${PN}.stb_vorbis.c +" LICENSE="WTFPL" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-games/ode - dev-games/irrlicht" +RDEPEND=" + dev-games/ode + dev-games/irrlicht +" DEPEND="${RDEPEND}" S="${WORKDIR}"/"${MY_PN}Source/Litha Engine" DAT="${WORKDIR}"/"${MY_PN}FullVersion" -src_prepare(){ - cp "${DISTDIR}"/stb_vorbis.c "${S}"/source/SoundSystems/OpenALSoundSystem - epatch "${FILESDIR}"/${PN}-irrpatch.patch - epatch "${FILESDIR}"/${PN}-irrhack.patch - epatch "${FILESDIR}"/${PN}-cmake.patch - epatch "${FILESDIR}"/${PN}-64bit.patch - for i in `find projects/Puzzle -name *.cpp`; do sed -i "$i" -e "s:../projects:"${GAMES_DATADIR}"/"${PN}"/projects:g"; done - for i in `find projects/ConfigApp -name *.cpp`; do sed -i "$i" -e "s:../projects:"${GAMES_DATADIR}"/"${PN}"/projects:g"; done +src_prepare() { + cp "${DISTDIR}"/${PN}.stb_vorbis.c "${S}"/source/SoundSystems/OpenALSoundSystem/stb_vorbis.c + eapply "${FILESDIR}"/${PN}-irrpatch.patch + eapply "${FILESDIR}"/${PN}-irrhack.patch + eapply "${FILESDIR}"/${PN}-cmake.patch + eapply "${FILESDIR}"/${PN}-64bit.patch + for i in `find projects/Puzzle -name *.cpp`; do sed -i "$i" -e "s:../projects:/usr/share/${PN}/projects:g"; done + for i in `find projects/ConfigApp -name *.cpp`; do sed -i "$i" -e "s:../projects:/usr/share/${PN}/projects:g"; done sed -i -e "s:config:"${PN}-config":g" -i projects/ConfigApp/CMakeLists.txt + default } src_install() { + insinto "/usr/share/${PN}" + doins -r "${DAT}/projects" - insinto "${GAMES_DATADIR}/${PN}" - doins -r "${DAT}"/projects + dobin "bin/${PN}" + dobin "bin/${PN}-config" - dogamesbin bin/${PN} || die "dogamesbin failed" - dogamesbin bin/${PN}-config || die "dogamesbin failed" + newicon "${DAT}/icons/main.png" "${PN}.png" - newicon "${DAT}"/icons/main.png ${PN}.png - - make_desktop_entry ${PN} ${MY_PN} ${PN} - prepgamesdirs + make_desktop_entry "${PN}" "${MY_PN}" "${PN}" }