1 |
commit: a6f2ea090989ec0dd8703c6fdd6a6f88a45bf1a3 |
2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 23 04:30:13 2015 +0000 |
4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 23 04:30:33 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f2ea09 |
7 |
|
8 |
version bump (bug #564076) |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
games-arcade/supertux/Manifest | 1 + |
13 |
.../supertux/files/supertux-0.1.3-desktop.patch | 4 +- |
14 |
.../supertux/files/supertux-0.1.3-gcc41.patch | 5 +-- |
15 |
.../supertux/files/supertux-0.1.3-ndebug.patch | 2 - |
16 |
.../supertux/files/supertux-0.4.0-desktop.patch | 11 +++++ |
17 |
.../supertux/files/supertux-0.4.0-flags.patch | 32 ++++++++++++++ |
18 |
.../supertux/files/supertux-0.4.0-icon.patch | 11 +++++ |
19 |
.../supertux/files/supertux-0.4.0-license.patch | 11 +++++ |
20 |
.../supertux/files/supertux-0.4.0-obstack.patch | 19 ++++++++ |
21 |
.../supertux/files/supertux-0.4.0-squirrel.patch | 20 +++++++++ |
22 |
.../files/supertux-0.4.0-tinygettext.patch | 50 ++++++++++++++++++++++ |
23 |
games-arcade/supertux/supertux-0.4.0.ebuild | 50 ++++++++++++++++++++++ |
24 |
12 files changed, 209 insertions(+), 7 deletions(-) |
25 |
|
26 |
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest |
27 |
index f487be0..a24f26b 100644 |
28 |
--- a/games-arcade/supertux/Manifest |
29 |
+++ b/games-arcade/supertux/Manifest |
30 |
@@ -1 +1,2 @@ |
31 |
DIST supertux-0.1.3.tar.bz2 6715265 SHA256 0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97 SHA512 75848583f9f9b9d0f36fec77812501875420fde8befe1ff9ac4ea7613f4d9464b2eb460c2ed89b4dc31e697fbb449a5431c72675e2820d13f5c42653dc07ad98 WHIRLPOOL bb8998845bee7f33a7aff94109d9767d000c89df6c670a1ccb85c4e9158a8ce6c4064f89587b9ea40d9ba1a854b9f5bba82ccc7dcac6dedcdb337cfaa1777898 |
32 |
+DIST supertux-0.4.0.tar.bz2 79713147 SHA256 d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5 WHIRLPOOL 12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64 |
33 |
|
34 |
diff --git a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch |
35 |
index 440881d..2fd7742 100644 |
36 |
--- a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch |
37 |
+++ b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch |
38 |
@@ -1,5 +1,5 @@ |
39 |
---- supertux.desktop.orig 2010-11-07 23:29:26.058571005 -0500 |
40 |
-+++ supertux.desktop 2010-11-07 23:30:09.457350053 -0500 |
41 |
+--- supertux.desktop.orig |
42 |
++++ supertux.desktop |
43 |
@@ -1,7 +1,6 @@ |
44 |
[Desktop Entry] |
45 |
Type=Application |
46 |
|
47 |
diff --git a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch |
48 |
index 5bcf537..449dc3b 100644 |
49 |
--- a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch |
50 |
+++ b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch |
51 |
@@ -1,6 +1,5 @@ |
52 |
-diff -uNr supertux-0.1.3.orig/src/menu.h supertux-0.1.3/src/menu.h |
53 |
---- supertux-0.1.3.orig/src/menu.h 2005-06-21 23:16:07.000000000 +0200 |
54 |
-+++ supertux-0.1.3/src/menu.h 2006-03-19 15:49:55.277266712 +0100 |
55 |
+--- supertux-0.1.3.orig/src/menu.h |
56 |
++++ supertux-0.1.3/src/menu.h |
57 |
@@ -207,7 +207,7 @@ |
58 |
|
59 |
bool isToggled(int id); |
60 |
|
61 |
diff --git a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch |
62 |
index 3a302d5..197a518 100644 |
63 |
--- a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch |
64 |
+++ b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch |
65 |
@@ -1,5 +1,3 @@ |
66 |
-Index: supertux-0.1.3/src/tile.cpp |
67 |
-=================================================================== |
68 |
--- supertux-0.1.3.orig/src/tile.cpp |
69 |
+++ supertux-0.1.3/src/tile.cpp |
70 |
@@ -99,7 +99,11 @@ void TileManager::load_tileset(std::stri |
71 |
|
72 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch |
73 |
new file mode 100644 |
74 |
index 0000000..b0e26e7 |
75 |
--- /dev/null |
76 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch |
77 |
@@ -0,0 +1,11 @@ |
78 |
+--- supertux2.desktop.orig |
79 |
++++ supertux2.desktop |
80 |
+@@ -35,7 +35,7 @@ |
81 |
+ Comment[pt]=Joga este clássico de plataformas 2D |
82 |
+ Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr |
83 |
+ Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék |
84 |
+-Icon=supertux.png |
85 |
++Icon=supertux |
86 |
+ Exec=supertux2 |
87 |
+ Terminal=false |
88 |
+ StartupNotify=false |
89 |
|
90 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch b/games-arcade/supertux/files/supertux-0.4.0-flags.patch |
91 |
new file mode 100644 |
92 |
index 0000000..97e3e74 |
93 |
--- /dev/null |
94 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-flags.patch |
95 |
@@ -0,0 +1,32 @@ |
96 |
+--- CMakeLists.txt.orig |
97 |
++++ CMakeLists.txt |
98 |
+@@ -329,7 +329,7 @@ |
99 |
+ endif(COMPILER_SUPPORTS_CXX11) |
100 |
+ |
101 |
+ |
102 |
+-IF(CMAKE_COMPILER_IS_GNUCC) |
103 |
++IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS) |
104 |
+ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags") |
105 |
+ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags") |
106 |
+ SET(CMAKE_CXX_FLAGS_PROFILE "-pg" CACHE STRING "Profile flags") |
107 |
+@@ -352,7 +352,7 @@ |
108 |
+ # -Wlogical-op -Wstrict-null-sentinel |
109 |
+ SET(SUPERTUX2_EXTRA_WARNING_FLAGS "-fdiagnostics-show-option -pedantic -Wno-long-long -Wcast-align -Wdisabled-optimization -Winit-self -Winvalid-pch -Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wredundant-decls -Wstack-protector -Wformat=2 -Weffc++ -Wctor-dtor-privacy -Wno-unused-parameter -Wshadow -Wnon-virtual-dtor -Wcast-qual") |
110 |
+ ENDIF(WARNINGS) |
111 |
+-ENDIF(CMAKE_COMPILER_IS_GNUCC) |
112 |
++ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS) |
113 |
+ |
114 |
+ ## If xgettext is available, generate messages.pot for sources |
115 |
+ |
116 |
+@@ -407,9 +407,9 @@ |
117 |
+ ENDIF(GENERATE_MESSAGESPOT) |
118 |
+ |
119 |
+ ## Some additional compiler switches |
120 |
+-IF(CMAKE_COMPILER_IS_GNUCC) |
121 |
++IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS) |
122 |
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") |
123 |
+-ENDIF(CMAKE_COMPILER_IS_GNUCC) |
124 |
++ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS) |
125 |
+ |
126 |
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |
127 |
+ ADD_DEFINITIONS(-DMACOSX) |
128 |
|
129 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch |
130 |
new file mode 100644 |
131 |
index 0000000..14552f2 |
132 |
--- /dev/null |
133 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-icon.patch |
134 |
@@ -0,0 +1,11 @@ |
135 |
+--- CMakeLists.txt.orig |
136 |
++++ CMakeLists.txt |
137 |
+@@ -571,7 +571,7 @@ |
138 |
+ |
139 |
+ SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2") |
140 |
+ |
141 |
+- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/") |
142 |
++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/") |
143 |
+ |
144 |
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING) |
145 |
+ ENDIF(WIN32 AND NOT UNIX) |
146 |
|
147 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch |
148 |
new file mode 100644 |
149 |
index 0000000..37558aa |
150 |
--- /dev/null |
151 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-license.patch |
152 |
@@ -0,0 +1,11 @@ |
153 |
+--- CMakeLists.txt.orig |
154 |
++++ CMakeLists.txt |
155 |
+@@ -578,7 +578,7 @@ |
156 |
+ |
157 |
+ INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN}) |
158 |
+ |
159 |
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC}) |
160 |
++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC}) |
161 |
+ |
162 |
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE}) |
163 |
+ |
164 |
|
165 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-obstack.patch b/games-arcade/supertux/files/supertux-0.4.0-obstack.patch |
166 |
new file mode 100644 |
167 |
index 0000000..609fe94 |
168 |
--- /dev/null |
169 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-obstack.patch |
170 |
@@ -0,0 +1,19 @@ |
171 |
+--- CMakeLists.txt.orig |
172 |
++++ CMakeLists.txt |
173 |
+@@ -251,7 +251,6 @@ |
174 |
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/) |
175 |
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/) |
176 |
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) |
177 |
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) |
178 |
+ |
179 |
+ IF(WIN32) |
180 |
+ ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX) |
181 |
+@@ -260,7 +259,7 @@ |
182 |
+ |
183 |
+ ## Build list of sources for supertux binary |
184 |
+ |
185 |
+-FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c) |
186 |
++FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c) |
187 |
+ |
188 |
+ FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp) |
189 |
+ FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc") |
190 |
|
191 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch b/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch |
192 |
new file mode 100644 |
193 |
index 0000000..0982442 |
194 |
--- /dev/null |
195 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch |
196 |
@@ -0,0 +1,20 @@ |
197 |
+--- supertux-0.4.0.orig/external/squirrel/CMakeLists.txt |
198 |
++++ supertux-0.4.0/external/squirrel/CMakeLists.txt |
199 |
+@@ -65,8 +65,6 @@ |
200 |
+ |
201 |
+ # the squirrel sources are out of our control so don't be too pedantic about |
202 |
+ # them |
203 |
+-SET(CMAKE_CXX_FLAGS "") |
204 |
+-SET(CMAKE_C_FLAGS "") |
205 |
+ |
206 |
+ ## define a target for building the library |
207 |
+ |
208 |
+@@ -82,8 +80,3 @@ |
209 |
+ set(LIB_SUBDIR "lib${LIB_SUFFIX}" |
210 |
+ CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)") |
211 |
+ |
212 |
+-INSTALL(TARGETS squirrel |
213 |
+- RUNTIME DESTINATION bin |
214 |
+- ARCHIVE DESTINATION ${LIB_SUBDIR} |
215 |
+- LIBRARY DESTINATION ${LIB_SUBDIR} |
216 |
+- COMPONENT squirrel) |
217 |
|
218 |
diff --git a/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch b/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch |
219 |
new file mode 100644 |
220 |
index 0000000..23e572d |
221 |
--- /dev/null |
222 |
+++ b/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch |
223 |
@@ -0,0 +1,50 @@ |
224 |
+--- supertux-0.4.0.orig/external/tinygettext/CMakeLists.txt |
225 |
++++ supertux-0.4.0/external/tinygettext/CMakeLists.txt |
226 |
+@@ -59,7 +59,7 @@ |
227 |
+ ) |
228 |
+ |
229 |
+ ## Reveal library type choice to users |
230 |
+-option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" ON) |
231 |
++option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" OFF) |
232 |
+ |
233 |
+ # TinyGetText library compilation |
234 |
+ |
235 |
+@@ -127,14 +127,9 @@ |
236 |
+ ## Debug options |
237 |
+ |
238 |
+ option(WERROR "Stops on first compiler warning in debug mode" OFF) |
239 |
+-option(WARNINGS "Enable long list of warnings for compiler to check" ON) |
240 |
++option(WARNINGS "Enable long list of warnings for compiler to check" OFF) |
241 |
+ |
242 |
+ CHECK_CXX_FLAG(std=c++0x) |
243 |
+-CHECK_CXX_FLAG(O3) |
244 |
+-CHECK_CXX_FLAG(Wall) |
245 |
+-CHECK_CXX_FLAG(Wextra) |
246 |
+-CHECK_CXX_FLAG(Weffc++) |
247 |
+-CHECK_CXX_FLAG(pedantic) |
248 |
+ |
249 |
+ if(WARNINGS) |
250 |
+ CHECK_CXX_FLAG(Wabi) |
251 |
+@@ -194,22 +189,4 @@ |
252 |
+ endforeach(TEST) |
253 |
+ ENDIF() |
254 |
+ |
255 |
+-## Install tinygettext |
256 |
+- |
257 |
+-# use standardized variable name |
258 |
+-set(LIB_SUBDIR "lib${LIB_SUFFIX}" |
259 |
+- CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)") |
260 |
+- |
261 |
+-## prepare tinygettext.pc |
262 |
+-configure_file(tinygettext.pc.in tinygettext.pc @ONLY) |
263 |
+- |
264 |
+-install(TARGETS tinygettext |
265 |
+- RUNTIME DESTINATION bin |
266 |
+- ARCHIVE DESTINATION ${LIB_SUBDIR} |
267 |
+- LIBRARY DESTINATION ${LIB_SUBDIR}) |
268 |
+-install(FILES ${TINYGETTEXT_HEADERS} |
269 |
+- DESTINATION include/tinygettext) |
270 |
+-install(FILES ${tinygettext_BINARY_DIR}/tinygettext.pc |
271 |
+- DESTINATION ${LIB_SUBDIR}/pkgconfig) |
272 |
+- |
273 |
+ # EOF # |
274 |
|
275 |
diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild b/games-arcade/supertux/supertux-0.4.0.ebuild |
276 |
new file mode 100644 |
277 |
index 0000000..4358068 |
278 |
--- /dev/null |
279 |
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild |
280 |
@@ -0,0 +1,50 @@ |
281 |
+# Copyright 1999-2015 Gentoo Foundation |
282 |
+# Distributed under the terms of the GNU General Public License v2 |
283 |
+# $Id$ |
284 |
+ |
285 |
+EAPI=5 |
286 |
+inherit cmake-utils games |
287 |
+ |
288 |
+DESCRIPTION="A game similar to Super Mario Bros." |
289 |
+HOMEPAGE="http://supertuxproject.org/" |
290 |
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2" |
291 |
+ |
292 |
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0" |
293 |
+SLOT="0" |
294 |
+KEYWORDS="~amd64 ~x86" |
295 |
+IUSE="debug" |
296 |
+ |
297 |
+RDEPEND="dev-games/physfs |
298 |
+ dev-libs/boost:= |
299 |
+ media-libs/glew:= |
300 |
+ virtual/opengl |
301 |
+ media-libs/libvorbis |
302 |
+ media-libs/openal |
303 |
+ >=media-libs/libsdl2-2.0.1[joystick,video] |
304 |
+ >=media-libs/sdl2-image-2.0.0[png,jpeg] |
305 |
+ >=net-misc/curl-7.21.7" |
306 |
+DEPEND="${RDEPEND} |
307 |
+ virtual/pkgconfig" |
308 |
+ |
309 |
+PATCHES=( "${FILESDIR}"/${P}-{obstack,tinygettext,squirrel,desktop,flags,license,icon}.patch ) |
310 |
+ |
311 |
+src_configure() { |
312 |
+ local mycmakeargs=( |
313 |
+ -DWERROR=OFF |
314 |
+ -DINSTALL_SUBDIR_BIN=games/bin |
315 |
+ -DINSTALL_SUBDIR_DOC=share/doc/${PF} |
316 |
+ $(cmake-utils_use_enable debug SQDBG) |
317 |
+ $(cmake-utils_use debug) |
318 |
+ ) |
319 |
+ |
320 |
+ cmake-utils_src_configure |
321 |
+} |
322 |
+ |
323 |
+src_compile() { |
324 |
+ cmake-utils_src_compile |
325 |
+} |
326 |
+ |
327 |
+src_install() { |
328 |
+ cmake-utils_src_install |
329 |
+ prepgamesdirs |
330 |
+} |