public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: games-puzzle/puzzlemoppet/, games-puzzle/puzzlemoppet/files/
@ 2012-07-14  7:53 Marcel Unbehaun
  0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2012-07-14  7:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2142f0179f80135580bbf21e32e7b8cb26ae224b
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sat Jul 14 07:55:18 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sat Jul 14 07:55:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=2142f017

[games-puzzle/puzzlemoppet]	initial dirty puzzlemoppet-1.0.ebuild

---
 .../puzzlemoppet/files/puzzlemoppet-cmake.patch    |   24 +++++++++
 .../puzzlemoppet/files/puzzlemoppet-irrhack.patch  |   37 ++++++++++++++
 .../puzzlemoppet/files/puzzlemoppet-irrpatch.patch |   25 ++++++++++
 games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild  |   50 ++++++++++++++++++++
 4 files changed, 136 insertions(+), 0 deletions(-)

diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch
new file mode 100644
index 0000000..42932b2
--- /dev/null
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch
@@ -0,0 +1,24 @@
+--- 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
+@@ -26,18 +26,8 @@
+ 
+ 
+ # No need to modify these lines.
+-add_executable(${projectName}_FullVersion ${sourceFiles})
++add_executable(puzzlemoppet ${sourceFiles})
+ if (projectProperties)
+-	set_target_properties(${projectName}_FullVersion ${projectProperties})
++	set_target_properties(puzzlemoppet ${projectProperties})
+ endif (projectProperties)
+-target_link_libraries(${projectName}_FullVersion ${projectLibs})
+-
+-
+-# Special for this project: Trial version!
+-add_executable(${projectName}_TrialVersion ${sourceFiles})
+-if (projectProperties)
+-	set_target_properties(${projectName}_TrialVersion ${projectProperties} COMPILE_FLAGS -DTRIAL)
+-else (projectProperties)
+-	set_target_properties(${projectName}_TrialVersion PROPERTIES COMPILE_FLAGS -DTRIAL)
+-endif (projectProperties)
+-target_link_libraries(${projectName}_TrialVersion ${projectLibs})
++target_link_libraries(puzzlemoppet ${projectLibs})

diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch
new file mode 100644
index 0000000..43c9a75
--- /dev/null
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch
@@ -0,0 +1,37 @@
+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
+@@ -355,11 +355,11 @@
+ 			
+ 			// Emit entire one second's worth of particles all at once.
+ 			// Then no more...!
+-			scene::IParticleEmitter *singleEmissionEmitter = new SingleEmissionEmitter(emitter);
++//			scene::IParticleEmitter *singleEmissionEmitter = new SingleEmissionEmitter(emitter);
+ 			emitter->drop();
+ 			
+-			ps->setEmitter(singleEmissionEmitter);
+-			singleEmissionEmitter->drop();
++//			ps->setEmitter(singleEmissionEmitter);
++//			singleEmissionEmitter->drop();
+ 			
+ 			
+ 			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
+@@ -62,12 +62,12 @@
+ 	
+ 	// Create RTT
+ 	material.TextureLayer[0].Texture = rt;
+-	material.TextureLayer[0].TextureWrap = video::ETC_CLAMP_TO_EDGE;
++//	material.TextureLayer[0].TextureWrap = video::ETC_CLAMP_TO_EDGE;
++	
+ 	
+-	/*
+ 	material.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
+ 	material.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
+-	*/
++	
+ 	
+ 	Effect effect =
+ 	{

diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch
new file mode 100644
index 0000000..f525092
--- /dev/null
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch
@@ -0,0 +1,25 @@
+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
+@@ -57,11 +57,19 @@
+ # (things required by both litha engine and individual projects)
+ # (actually some of these probably aren't required by both...)
+ 
+-include_directories(${rootDir} ${rootDir}/include ${rootDir}/thirdparty/irrlicht-1.6.1/include)
++include_directories(${rootDir} ${rootDir}/include /usr/include/irrlicht)
+ 
+ link_directories(${rootDir}/thirdparty/irrlicht-1.6.1/lib/${irrlichtLibDir})
+ 
+-
++#find_package(PkgConfig)
++#pkg_check_modules(IRR irrlicht)
++#include_directories(${IRR_INCLUDE_DIRS})
++#link_directories(${IRR_LIBRARY_DIRS})
++
++#find_package(PkgConfig)
++#pkg_check_modules(ODE ode)
++#ADD_DEFINITIONS (${ODE_INCLUDE_DIRS})
++ADD_DEFINITIONS ( -DdSINGLE )
+ 
+ ########## LITHA ENGINE CONFIG ########
+ 

diff --git a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
new file mode 100644
index 0000000..a10ee4e
--- /dev/null
+++ b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: games-puzzle/puzzlemoppet-1.0.ebuild frostwork Exp $
+
+EAPI="3"
+
+MY_PN="PuzzleMoppet"
+
+inherit games 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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-games/ode
+		dev-games/irrlicht"
+
+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
+	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
+	sed -i -e "s:config:"${PN}-config":g" -i projects/ConfigApp/CMakeLists.txt
+}
+
+src_install() {
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r "${DAT}"/projects
+
+	dogamesbin bin/${PN} || die "dogamesbin failed"
+	dogamesbin bin/${PN}-config || die "dogamesbin failed"
+
+	newicon "${DAT}"/icons/main.png ${PN}.png
+
+	make_desktop_entry ${PN} ${MY_PN} ${PN}
+	prepgamesdirs
+}



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

* [gentoo-commits] proj/gamerlay:master commit in: games-puzzle/puzzlemoppet/, games-puzzle/puzzlemoppet/files/
@ 2012-07-14  8:08 Marcel Unbehaun
  0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2012-07-14  8:08 UTC (permalink / raw
  To: gentoo-commits

commit:     984b8b5218308f3aa3b319c3ca109333195fb413
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sat Jul 14 08:10:29 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sat Jul 14 08:10:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=984b8b52

[games-puzzle/puzzlemoppet]	64bit hack puzzlemoppet-1.0.ebuild

---
 .../puzzlemoppet/files/puzzlemoppet-64bit.patch    |   15 +++++++++++++++
 games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild  |    1 +
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch
new file mode 100644
index 0000000..86015d8
--- /dev/null
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch
@@ -0,0 +1,15 @@
+--- 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
+@@ -781,10 +781,11 @@
+ 	// this engine. Obviously this event cannot be stored or transmitted over a network
+ 	// in case the pointer gets invalidated.
+ 	// Also the pointer will probably not be valid on 64 bit systems.
++/*
+ 	Event event("IrrlichtEvent");
+ 	event["SEvent"] = (u32)&irrEvent;
+ 	newEvents.push_back(event);
+-	
++*/	
+ 	// Send 'em all!
+ 	for (u32 i = 0; i < newEvents.size(); i ++)
+ 		PostEvent(newEvents[i]);

diff --git a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
index 487ff23..c35946a 100644
--- a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
+++ b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
@@ -31,6 +31,7 @@ src_prepare(){
 	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
 	sed -i -e "s:config:"${PN}-config":g" -i projects/ConfigApp/CMakeLists.txt



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

end of thread, other threads:[~2012-07-14  8:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-14  7:53 [gentoo-commits] proj/gamerlay:master commit in: games-puzzle/puzzlemoppet/, games-puzzle/puzzlemoppet/files/ Marcel Unbehaun
  -- strict thread matches above, loose matches on Subject: below --
2012-07-14  8:08 Marcel Unbehaun

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox