1 |
commit: 4adcc7ce36c70cc14368b862fa3b23b2c2fa8f2e |
2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
3 |
AuthorDate: Sun Jan 29 15:15:58 2017 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Sun Jan 29 15:15:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=4adcc7ce |
7 |
|
8 |
puzzlemoppet: fix gentoo bug #607578 |
9 |
|
10 |
.../puzzlemoppet/files/puzzlemoppet-64bit.patch | 4 +- |
11 |
.../puzzlemoppet/files/puzzlemoppet-cmake.patch | 4 +- |
12 |
.../puzzlemoppet/files/puzzlemoppet-irrhack.patch | 10 ++-- |
13 |
.../puzzlemoppet/files/puzzlemoppet-irrpatch.patch | 5 +- |
14 |
games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild | 54 +++++++++++----------- |
15 |
5 files changed, 38 insertions(+), 39 deletions(-) |
16 |
|
17 |
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch |
18 |
index 86015d8..99152ba 100644 |
19 |
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch |
20 |
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch |
21 |
@@ -1,5 +1,5 @@ |
22 |
---- PuzzleMoppetSource/Litha Engine/source/Engine.cppO 2011-09-17 15:06:28.000000000 +0200 |
23 |
-+++ PuzzleMoppetSource/Litha Engine/source/Engine.cpp 2012-07-14 10:07:32.120033849 +0200 |
24 |
+--- a/source/Engine.cpp 2011-09-17 15:06:28.000000000 +0200 |
25 |
++++ b/source/Engine.cpp 2012-07-14 10:07:32.120033849 +0200 |
26 |
@@ -781,10 +781,11 @@ |
27 |
// this engine. Obviously this event cannot be stored or transmitted over a network |
28 |
// in case the pointer gets invalidated. |
29 |
|
30 |
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch |
31 |
index 42932b2..cd3f4e9 100644 |
32 |
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch |
33 |
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch |
34 |
@@ -1,5 +1,5 @@ |
35 |
---- PuzzleMoppetSource/Litha Engine/projects/Puzzle/CMakeLists.txtO 2011-09-17 15:06:24.000000000 +0200 |
36 |
-+++ PuzzleMoppetSource/Litha Engine/projects/Puzzle/CMakeLists.txt 2012-07-14 09:52:14.060028541 +0200 |
37 |
+--- a/projects/Puzzle/CMakeLists.txt 2011-09-17 15:06:24.000000000 +0200 |
38 |
++++ b/projects/Puzzle/CMakeLists.txt 2012-07-14 09:52:14.060028541 +0200 |
39 |
@@ -26,18 +26,8 @@ |
40 |
|
41 |
|
42 |
|
43 |
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch |
44 |
index 43c9a75..4c1978f 100644 |
45 |
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch |
46 |
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch |
47 |
@@ -1,6 +1,5 @@ |
48 |
-diff -Naur PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp PuzzleMoppetSource-p2/Litha Engine/projects/Puzzle/Events.cpp |
49 |
---- PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp 2012-06-30 13:19:23.000000000 +0200 |
50 |
-+++ PuzzleMoppetSource-p2/Litha Engine/projects/Puzzle/Events.cpp 2012-07-13 15:21:09.048032909 +0200 |
51 |
+--- a/projects/Puzzle/Events.cpp 2012-06-30 13:19:23.000000000 +0200 |
52 |
++++ b/projects/Puzzle/Events.cpp 2012-07-13 15:21:09.048032909 +0200 |
53 |
@@ -355,11 +355,11 @@ |
54 |
|
55 |
// Emit entire one second's worth of particles all at once. |
56 |
@@ -16,9 +15,8 @@ diff -Naur PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp PuzzleM |
57 |
|
58 |
|
59 |
scene::IParticleAffector *affector = ps->createFadeOutParticleAffector(); |
60 |
-diff -Naur PuzzleMoppetSource-p1/Litha Engine/source/PostProcessingChain.cpp PuzzleMoppetSource-p2/Litha Engine/source/PostProcessingChain.cpp |
61 |
---- PuzzleMoppetSource-p1/Litha Engine/source/PostProcessingChain.cpp 2011-09-17 15:06:28.000000000 +0200 |
62 |
-+++ PuzzleMoppetSource-p2/Litha Engine/source/PostProcessingChain.cpp 2012-07-13 15:16:01.148032909 +0200 |
63 |
+--- a/source/PostProcessingChain.cpp 2011-09-17 15:06:28.000000000 +0200 |
64 |
++++ b/source/PostProcessingChain.cpp 2012-07-13 15:16:01.148032909 +0200 |
65 |
@@ -62,12 +62,12 @@ |
66 |
|
67 |
// Create RTT |
68 |
|
69 |
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch |
70 |
index f525092..48d26f5 100644 |
71 |
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch |
72 |
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch |
73 |
@@ -1,6 +1,5 @@ |
74 |
-diff -Naur PuzzleMoppetSource-o/Litha Engine/CMakeLists.txt PuzzleMoppetSource/Litha Engine/CMakeLists.txt |
75 |
---- PuzzleMoppetSource-o/Litha Engine/CMakeLists.txt 2012-07-13 18:19:24.600053643 +0200 |
76 |
-+++ PuzzleMoppetSource/Litha Engine/CMakeLists.txt 2012-07-13 18:34:48.960062962 +0200 |
77 |
+--- a/CMakeLists.txt 2017-01-29 21:07:57.191535103 +0700 |
78 |
++++ b/CMakeLists.txt 2017-01-29 21:08:48.953560110 +0700 |
79 |
@@ -57,11 +57,19 @@ |
80 |
# (things required by both litha engine and individual projects) |
81 |
# (actually some of these probably aren't required by both...) |
82 |
|
83 |
diff --git a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild |
84 |
index c35946a..f6229b4 100644 |
85 |
--- a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild |
86 |
+++ b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild |
87 |
@@ -1,52 +1,54 @@ |
88 |
-# Copyright 1999-2012 Gentoo Foundation |
89 |
+# Copyright 1999-2017 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
-# $Header: games-puzzle/puzzlemoppet-1.0.ebuild frostwork Exp $ |
92 |
|
93 |
-EAPI="3" |
94 |
+EAPI="6" |
95 |
|
96 |
MY_PN="PuzzleMoppet" |
97 |
|
98 |
-inherit games cmake-utils |
99 |
+inherit cmake-utils |
100 |
|
101 |
DESCRIPTION="a serenely peaceful yet devilishly challenging 3D puzzle game" |
102 |
-HOMEPAGE="http://http://garnetgames.com/${PN}" |
103 |
-SRC_URI="http://garnetgames.com/${MY_PN}Full.tar.gz |
104 |
- http://garnetgames.com/${MY_PN}Source.tar.gz |
105 |
- http://nothings.org/stb_vorbis/stb_vorbis.c" |
106 |
+HOMEPAGE="http://garnetgames.com/puzzlemoppet" |
107 |
+SRC_URI=" |
108 |
+ http://garnetgames.com/${MY_PN}Full.tar.gz |
109 |
+ http://garnetgames.com/${MY_PN}Source.tar.gz |
110 |
+ https://raw.githubusercontent.com/nothings/stb/e2caccb811d70af0dc359be5522e6b0d3b503e46/stb_vorbis.c -> ${PN}.stb_vorbis.c |
111 |
+" |
112 |
|
113 |
LICENSE="WTFPL" |
114 |
SLOT="0" |
115 |
KEYWORDS="~amd64 ~x86" |
116 |
IUSE="" |
117 |
|
118 |
-RDEPEND="dev-games/ode |
119 |
- dev-games/irrlicht" |
120 |
+RDEPEND=" |
121 |
+ dev-games/ode |
122 |
+ dev-games/irrlicht |
123 |
+" |
124 |
DEPEND="${RDEPEND}" |
125 |
|
126 |
S="${WORKDIR}"/"${MY_PN}Source/Litha Engine" |
127 |
DAT="${WORKDIR}"/"${MY_PN}FullVersion" |
128 |
|
129 |
-src_prepare(){ |
130 |
- cp "${DISTDIR}"/stb_vorbis.c "${S}"/source/SoundSystems/OpenALSoundSystem |
131 |
- epatch "${FILESDIR}"/${PN}-irrpatch.patch |
132 |
- epatch "${FILESDIR}"/${PN}-irrhack.patch |
133 |
- epatch "${FILESDIR}"/${PN}-cmake.patch |
134 |
- epatch "${FILESDIR}"/${PN}-64bit.patch |
135 |
- for i in `find projects/Puzzle -name *.cpp`; do sed -i "$i" -e "s:../projects:"${GAMES_DATADIR}"/"${PN}"/projects:g"; done |
136 |
- for i in `find projects/ConfigApp -name *.cpp`; do sed -i "$i" -e "s:../projects:"${GAMES_DATADIR}"/"${PN}"/projects:g"; done |
137 |
+src_prepare() { |
138 |
+ cp "${DISTDIR}"/${PN}.stb_vorbis.c "${S}"/source/SoundSystems/OpenALSoundSystem/stb_vorbis.c |
139 |
+ eapply "${FILESDIR}"/${PN}-irrpatch.patch |
140 |
+ eapply "${FILESDIR}"/${PN}-irrhack.patch |
141 |
+ eapply "${FILESDIR}"/${PN}-cmake.patch |
142 |
+ eapply "${FILESDIR}"/${PN}-64bit.patch |
143 |
+ for i in `find projects/Puzzle -name *.cpp`; do sed -i "$i" -e "s:../projects:/usr/share/${PN}/projects:g"; done |
144 |
+ for i in `find projects/ConfigApp -name *.cpp`; do sed -i "$i" -e "s:../projects:/usr/share/${PN}/projects:g"; done |
145 |
sed -i -e "s:config:"${PN}-config":g" -i projects/ConfigApp/CMakeLists.txt |
146 |
+ default |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
+ insinto "/usr/share/${PN}" |
151 |
+ doins -r "${DAT}/projects" |
152 |
|
153 |
- insinto "${GAMES_DATADIR}/${PN}" |
154 |
- doins -r "${DAT}"/projects |
155 |
+ dobin "bin/${PN}" |
156 |
+ dobin "bin/${PN}-config" |
157 |
|
158 |
- dogamesbin bin/${PN} || die "dogamesbin failed" |
159 |
- dogamesbin bin/${PN}-config || die "dogamesbin failed" |
160 |
+ newicon "${DAT}/icons/main.png" "${PN}.png" |
161 |
|
162 |
- newicon "${DAT}"/icons/main.png ${PN}.png |
163 |
- |
164 |
- make_desktop_entry ${PN} ${MY_PN} ${PN} |
165 |
- prepgamesdirs |
166 |
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" |
167 |
} |