* [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/
@ 2015-12-23 4:31 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2015-12-23 4:31 UTC (permalink / raw
To: gentoo-commits
commit: a6f2ea090989ec0dd8703c6fdd6a6f88a45bf1a3
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 04:30:13 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 04:30:33 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f2ea09
version bump (bug #564076)
Package-Manager: portage-2.2.24
games-arcade/supertux/Manifest | 1 +
.../supertux/files/supertux-0.1.3-desktop.patch | 4 +-
.../supertux/files/supertux-0.1.3-gcc41.patch | 5 +--
.../supertux/files/supertux-0.1.3-ndebug.patch | 2 -
.../supertux/files/supertux-0.4.0-desktop.patch | 11 +++++
.../supertux/files/supertux-0.4.0-flags.patch | 32 ++++++++++++++
.../supertux/files/supertux-0.4.0-icon.patch | 11 +++++
.../supertux/files/supertux-0.4.0-license.patch | 11 +++++
.../supertux/files/supertux-0.4.0-obstack.patch | 19 ++++++++
.../supertux/files/supertux-0.4.0-squirrel.patch | 20 +++++++++
.../files/supertux-0.4.0-tinygettext.patch | 50 ++++++++++++++++++++++
games-arcade/supertux/supertux-0.4.0.ebuild | 50 ++++++++++++++++++++++
12 files changed, 209 insertions(+), 7 deletions(-)
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index f487be0..a24f26b 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1 +1,2 @@
DIST supertux-0.1.3.tar.bz2 6715265 SHA256 0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97 SHA512 75848583f9f9b9d0f36fec77812501875420fde8befe1ff9ac4ea7613f4d9464b2eb460c2ed89b4dc31e697fbb449a5431c72675e2820d13f5c42653dc07ad98 WHIRLPOOL bb8998845bee7f33a7aff94109d9767d000c89df6c670a1ccb85c4e9158a8ce6c4064f89587b9ea40d9ba1a854b9f5bba82ccc7dcac6dedcdb337cfaa1777898
+DIST supertux-0.4.0.tar.bz2 79713147 SHA256 d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5 WHIRLPOOL 12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64
diff --git a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
index 440881d..2fd7742 100644
--- a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
+++ b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
@@ -1,5 +1,5 @@
---- supertux.desktop.orig 2010-11-07 23:29:26.058571005 -0500
-+++ supertux.desktop 2010-11-07 23:30:09.457350053 -0500
+--- supertux.desktop.orig
++++ supertux.desktop
@@ -1,7 +1,6 @@
[Desktop Entry]
Type=Application
diff --git a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
index 5bcf537..449dc3b 100644
--- a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
+++ b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
@@ -1,6 +1,5 @@
-diff -uNr supertux-0.1.3.orig/src/menu.h supertux-0.1.3/src/menu.h
---- supertux-0.1.3.orig/src/menu.h 2005-06-21 23:16:07.000000000 +0200
-+++ supertux-0.1.3/src/menu.h 2006-03-19 15:49:55.277266712 +0100
+--- supertux-0.1.3.orig/src/menu.h
++++ supertux-0.1.3/src/menu.h
@@ -207,7 +207,7 @@
bool isToggled(int id);
diff --git a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
index 3a302d5..197a518 100644
--- a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
+++ b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
@@ -1,5 +1,3 @@
-Index: supertux-0.1.3/src/tile.cpp
-===================================================================
--- supertux-0.1.3.orig/src/tile.cpp
+++ supertux-0.1.3/src/tile.cpp
@@ -99,7 +99,11 @@ void TileManager::load_tileset(std::stri
diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
new file mode 100644
index 0000000..b0e26e7
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
@@ -0,0 +1,11 @@
+--- supertux2.desktop.orig
++++ supertux2.desktop
+@@ -35,7 +35,7 @@
+ Comment[pt]=Joga este clássico de plataformas 2D
+ Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr
+ Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
+-Icon=supertux.png
++Icon=supertux
+ Exec=supertux2
+ Terminal=false
+ StartupNotify=false
diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
new file mode 100644
index 0000000..97e3e74
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
@@ -0,0 +1,32 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -329,7 +329,7 @@
+ endif(COMPILER_SUPPORTS_CXX11)
+
+
+-IF(CMAKE_COMPILER_IS_GNUCC)
++IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
+ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
+ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
+ SET(CMAKE_CXX_FLAGS_PROFILE "-pg" CACHE STRING "Profile flags")
+@@ -352,7 +352,7 @@
+ # -Wlogical-op -Wstrict-null-sentinel
+ 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")
+ ENDIF(WARNINGS)
+-ENDIF(CMAKE_COMPILER_IS_GNUCC)
++ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
+
+ ## If xgettext is available, generate messages.pot for sources
+
+@@ -407,9 +407,9 @@
+ ENDIF(GENERATE_MESSAGESPOT)
+
+ ## Some additional compiler switches
+-IF(CMAKE_COMPILER_IS_GNUCC)
++IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
+-ENDIF(CMAKE_COMPILER_IS_GNUCC)
++ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
+
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ ADD_DEFINITIONS(-DMACOSX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
new file mode 100644
index 0000000..14552f2
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -571,7 +571,7 @@
+
+ SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
+
+- 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/")
++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/")
+
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
+ ENDIF(WIN32 AND NOT UNIX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch
new file mode 100644
index 0000000..37558aa
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-license.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -578,7 +578,7 @@
+
+ INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
+
+-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})
++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
+
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
+
diff --git a/games-arcade/supertux/files/supertux-0.4.0-obstack.patch b/games-arcade/supertux/files/supertux-0.4.0-obstack.patch
new file mode 100644
index 0000000..609fe94
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-obstack.patch
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -251,7 +251,6 @@
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+
+ IF(WIN32)
+ ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
+@@ -260,7 +259,7 @@
+
+ ## Build list of sources for supertux binary
+
+-FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
++FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
+
+ FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
+ FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch b/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch
new file mode 100644
index 0000000..0982442
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch
@@ -0,0 +1,20 @@
+--- supertux-0.4.0.orig/external/squirrel/CMakeLists.txt
++++ supertux-0.4.0/external/squirrel/CMakeLists.txt
+@@ -65,8 +65,6 @@
+
+ # the squirrel sources are out of our control so don't be too pedantic about
+ # them
+-SET(CMAKE_CXX_FLAGS "")
+-SET(CMAKE_C_FLAGS "")
+
+ ## define a target for building the library
+
+@@ -82,8 +80,3 @@
+ set(LIB_SUBDIR "lib${LIB_SUFFIX}"
+ CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)")
+
+-INSTALL(TARGETS squirrel
+- RUNTIME DESTINATION bin
+- ARCHIVE DESTINATION ${LIB_SUBDIR}
+- LIBRARY DESTINATION ${LIB_SUBDIR}
+- COMPONENT squirrel)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch b/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch
new file mode 100644
index 0000000..23e572d
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch
@@ -0,0 +1,50 @@
+--- supertux-0.4.0.orig/external/tinygettext/CMakeLists.txt
++++ supertux-0.4.0/external/tinygettext/CMakeLists.txt
+@@ -59,7 +59,7 @@
+ )
+
+ ## Reveal library type choice to users
+-option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" ON)
++option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" OFF)
+
+ # TinyGetText library compilation
+
+@@ -127,14 +127,9 @@
+ ## Debug options
+
+ option(WERROR "Stops on first compiler warning in debug mode" OFF)
+-option(WARNINGS "Enable long list of warnings for compiler to check" ON)
++option(WARNINGS "Enable long list of warnings for compiler to check" OFF)
+
+ CHECK_CXX_FLAG(std=c++0x)
+-CHECK_CXX_FLAG(O3)
+-CHECK_CXX_FLAG(Wall)
+-CHECK_CXX_FLAG(Wextra)
+-CHECK_CXX_FLAG(Weffc++)
+-CHECK_CXX_FLAG(pedantic)
+
+ if(WARNINGS)
+ CHECK_CXX_FLAG(Wabi)
+@@ -194,22 +189,4 @@
+ endforeach(TEST)
+ ENDIF()
+
+-## Install tinygettext
+-
+-# use standardized variable name
+-set(LIB_SUBDIR "lib${LIB_SUFFIX}"
+- CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)")
+-
+-## prepare tinygettext.pc
+-configure_file(tinygettext.pc.in tinygettext.pc @ONLY)
+-
+-install(TARGETS tinygettext
+- RUNTIME DESTINATION bin
+- ARCHIVE DESTINATION ${LIB_SUBDIR}
+- LIBRARY DESTINATION ${LIB_SUBDIR})
+-install(FILES ${TINYGETTEXT_HEADERS}
+- DESTINATION include/tinygettext)
+-install(FILES ${tinygettext_BINARY_DIR}/tinygettext.pc
+- DESTINATION ${LIB_SUBDIR}/pkgconfig)
+-
+ # EOF #
diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild b/games-arcade/supertux/supertux-0.4.0.ebuild
new file mode 100644
index 0000000..4358068
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils games
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="http://supertuxproject.org/"
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-games/physfs
+ dev-libs/boost:=
+ media-libs/glew:=
+ virtual/opengl
+ media-libs/libvorbis
+ media-libs/openal
+ >=media-libs/libsdl2-2.0.1[joystick,video]
+ >=media-libs/sdl2-image-2.0.0[png,jpeg]
+ >=net-misc/curl-7.21.7"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-{obstack,tinygettext,squirrel,desktop,flags,license,icon}.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DWERROR=OFF
+ -DINSTALL_SUBDIR_BIN=games/bin
+ -DINSTALL_SUBDIR_DOC=share/doc/${PF}
+ $(cmake-utils_use_enable debug SQDBG)
+ $(cmake-utils_use debug)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ prepgamesdirs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/
@ 2016-04-10 3:20 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2016-04-10 3:20 UTC (permalink / raw
To: gentoo-commits
commit: 38066468c4fc0caf85dbc1e6e28e913367224007
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 03:19:34 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 03:19:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38066468
games-arcade/supertux: clean old; drops support for ppc and sparc
Package-Manager: portage-2.2.26
games-arcade/supertux/Manifest | 1 -
.../supertux/files/supertux-0.1.3-desktop.patch | 21 -----------
.../supertux/files/supertux-0.1.3-gcc41.patch | 11 ------
.../supertux/files/supertux-0.1.3-ndebug.patch | 14 -------
games-arcade/supertux/supertux-0.1.3.ebuild | 43 ----------------------
5 files changed, 90 deletions(-)
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index a24f26b..30519d3 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,2 +1 @@
-DIST supertux-0.1.3.tar.bz2 6715265 SHA256 0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97 SHA512 75848583f9f9b9d0f36fec77812501875420fde8befe1ff9ac4ea7613f4d9464b2eb460c2ed89b4dc31e697fbb449a5431c72675e2820d13f5c42653dc07ad98 WHIRLPOOL bb8998845bee7f33a7aff94109d9767d000c89df6c670a1ccb85c4e9158a8ce6c4064f89587b9ea40d9ba1a854b9f5bba82ccc7dcac6dedcdb337cfaa1777898
DIST supertux-0.4.0.tar.bz2 79713147 SHA256 d18dde3c415e619b4bb035e694ffc384be16576250c9df16929d9ec38daff782 SHA512 66ca63c982b6076847662c187069eb965211439e5dfc628300f2a9bd0d2b4c0f7b53f6e7c2aed263c098cc9b77fedf132e73b1f3b3eacaf5535cae8300262fb5 WHIRLPOOL 12551b655f0459a37d3b91b1eff058ec383df34c9f3c29c1e8a63c070c12b32ec798b772053cd08b11d32b612bab1188b69678e71585279e94ad380052076f64
diff --git a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch b/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
deleted file mode 100644
index 2fd7742..0000000
--- a/games-arcade/supertux/files/supertux-0.1.3-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- supertux.desktop.orig
-+++ supertux.desktop
-@@ -1,7 +1,6 @@
- [Desktop Entry]
- Type=Application
- Version=1.0
--Encoding=UTF-8
- Name=SuperTux
- Name[en]=SuperTux
- Name[de]=SuperTux
-@@ -14,8 +13,8 @@
- Comment[en]=A Super Mario inspired penguin platform game
- Comment[de]=Ein von Super Mario inspiriertes Pinguin Jump&Run Spiel
- Comment[cs]=Plošinovka inspirovaná SuperMariem s tučňákem Tuxem v hlavní roli
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux
- Terminal=false
- StartupNotify=false
--Categories=Application;Game;ArcadeGame
-+Categories=Game;ArcadeGame;
diff --git a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch b/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
deleted file mode 100644
index 449dc3b..0000000
--- a/games-arcade/supertux/files/supertux-0.1.3-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- supertux-0.1.3.orig/src/menu.h
-+++ supertux-0.1.3/src/menu.h
-@@ -207,7 +207,7 @@
-
- bool isToggled(int id);
-
-- void Menu::get_controlfield_key_into_input(MenuItem *item);
-+ void get_controlfield_key_into_input(MenuItem *item);
-
- void draw ();
- void draw_item(int index, int menu_width, int menu_height);
diff --git a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch b/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
deleted file mode 100644
index 197a518..0000000
--- a/games-arcade/supertux/files/supertux-0.1.3-ndebug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- supertux-0.1.3.orig/src/tile.cpp
-+++ supertux-0.1.3/src/tile.cpp
-@@ -99,7 +99,11 @@ void TileManager::load_tileset(std::stri
- tile->anim_speed = 25;
-
- LispReader reader(lisp_cdr(element));
-+ #ifdef NDEBUG
-+ void(reader.read_int("id", &tile->id));
-+ #else
- assert(reader.read_int("id", &tile->id));
-+ #endif
- reader.read_bool("solid", &tile->solid);
- reader.read_bool("brick", &tile->brick);
- reader.read_bool("ice", &tile->ice);
diff --git a/games-arcade/supertux/supertux-0.1.3.ebuild b/games-arcade/supertux/supertux-0.1.3.ebuild
deleted file mode 100644
index 632c953..0000000
--- a/games-arcade/supertux/supertux-0.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="http://super-tux.sourceforge.net"
-SRC_URI="https://supertux.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl[joystick]
- media-libs/sdl-image[png,jpeg]
- media-libs/sdl-mixer[mod,vorbis]
- x11-libs/libXt"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gcc41.patch \
- "${FILESDIR}"/${P}-ndebug.patch \
- "${FILESDIR}"/${P}-desktop.patch
-}
-
-src_configure() {
- egamesconf \
- --disable-debug \
- $(use_enable opengl)
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- desktopdir=/usr/share/applications \
- icondir=/usr/share/pixmaps \
- install
- dodoc AUTHORS ChangeLog LEVELDESIGN README TODO
- prepgamesdirs
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/
@ 2018-07-01 9:46 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2018-07-01 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 252a6dd9f24a9054f7d4e5b7996c531a640f1541
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 09:43:31 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 09:46:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252a6dd9
games-arcade/supertux: Build using Ninja
* Use system PhysFS
* Fix CMake unused variable error
Closes: https://bugs.gentoo.org/638076
Closes: https://bugs.gentoo.org/649458
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../supertux/files/supertux-0.5.1-ninja.patch | 30 ++++++++++++++++++++++
games-arcade/supertux/supertux-0.5.1.ebuild | 19 +++++---------
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
new file mode 100644
index 00000000000..d5181177fdc
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
@@ -0,0 +1,30 @@
+Allow building with ninja instead of CMake, see also:
+
+ https://bugs.gentoo.org/649458
+ https://cmake.org/pipermail/cmake/2015-April/060234.html
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -332,7 +332,10 @@
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
+- -DINSTALL_INC_DIR=include)
++ -DINSTALL_INC_DIR=include
++ BUILD_BYPRODUCTS
++ squirrel/lib/libsquirrel_static.a
++ squirrel/lib/libsqstdlib_static.a)
+
+ IF(WIN32)
+ ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
+@@ -370,7 +373,9 @@
+ -DHAVE_SDL=ON
+ -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
+ -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
+- -DLIB_SUFFIX=${LIB_SUFFIX})
++ -DLIB_SUFFIX=${LIB_SUFFIX}
++ BUILD_BYPRODUCTS
++ tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
+
+ ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
+ SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.5.1.ebuild
index af91e8b026d..c1773f3228c 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
inherit cmake-utils flag-o-matic
MY_P="SuperTux-v${PV}-Source"
@@ -32,35 +34,28 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
"${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
+ "${FILESDIR}"/${PN}-0.5.1-ninja.patch
)
src_prepare() {
cmake-utils_src_prepare
# This is not a developer release so switch the logo to the non-dev one.
- sed 's@logo_dev@logo@' \
+ sed -e 's@logo_dev@logo@' \
-i data/images/objects/logo/logo.sprite || die
}
src_configure() {
append-cxxflags -std=c++11
+
local mycmakeargs=(
-DWERROR=OFF
-DINSTALL_SUBDIR_BIN=bin
-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-DINSTALL_SUBDIR_SHARE=share/${PN}2
-DENABLE_SQDBG="$(usex debug)"
- -DUSE_DEBUG="$(usex debug)"
-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
+ -DUSE_SYSTEM_PHYSFS=ON
)
-
cmake-utils_src_configure
}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/
@ 2019-12-20 8:27 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-12-20 8:27 UTC (permalink / raw
To: gentoo-commits
commit: de2fdc312e0d2c950a42a2ea16ff911c3f873188
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 08:25:21 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 08:25:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2fdc31
games-arcade/supertux: Removed old
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
games-arcade/supertux/Manifest | 1 -
.../supertux/files/supertux-0.4.0-desktop.patch | 11 ----
.../supertux/files/supertux-0.4.0-icon.patch | 11 ----
.../supertux/files/supertux-0.4.0-license.patch | 11 ----
.../supertux/files/supertux-0.5.0-obstack.patch | 19 -------
.../supertux/files/supertux-0.5.1-ninja.patch | 30 -----------
games-arcade/supertux/supertux-0.5.1.ebuild | 61 ----------------------
7 files changed, 144 deletions(-)
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 42580820a30..8f44c648f7e 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,3 +1,2 @@
-DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
deleted file mode 100644
index 74a08726336..00000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/supertux2.desktop
-+++ b/supertux2.desktop
-@@ -35,7 +35,7 @@
- Comment[pt]=Joga este clássico de plataformas 2D
- Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr
- Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux2
- Terminal=false
- StartupNotify=false
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
deleted file mode 100644
index 66be0ebe493..00000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -571,7 +571,7 @@
-
- SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
-
-- 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/")
-+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/")
-
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
- ENDIF(WIN32 AND NOT UNIX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch
deleted file mode 100644
index e35f85ce416..00000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -578,7 +578,7 @@
-
- INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
-
--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})
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
-
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
-
diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
deleted file mode 100644
index 1b05369f67f..00000000000
--- a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- supertux-0.5.0/CMakeLists.txt
-+++ supertux-0.5.0/CMakeLists.txt
-@@ -382,7 +382,6 @@
- include_directories(${CMAKE_BINARY_DIR}/)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
--include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
-
- IF(WIN32)
-@@ -392,7 +391,7 @@
-
- ## Build list of sources for supertux binary
-
--FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
-+FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
-
- FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
- FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
deleted file mode 100644
index d5181177fdc..00000000000
--- a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Allow building with ninja instead of CMake, see also:
-
- https://bugs.gentoo.org/649458
- https://cmake.org/pipermail/cmake/2015-April/060234.html
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -332,7 +332,10 @@
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
-- -DINSTALL_INC_DIR=include)
-+ -DINSTALL_INC_DIR=include
-+ BUILD_BYPRODUCTS
-+ squirrel/lib/libsquirrel_static.a
-+ squirrel/lib/libsqstdlib_static.a)
-
- IF(WIN32)
- ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
-@@ -370,7 +373,9 @@
- -DHAVE_SDL=ON
- -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
- -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
-- -DLIB_SUFFIX=${LIB_SUFFIX})
-+ -DLIB_SUFFIX=${LIB_SUFFIX}
-+ BUILD_BYPRODUCTS
-+ tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
-
- ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
- SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.5.1.ebuild
deleted file mode 100644
index f61607c368e..00000000000
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils flag-o-matic
-
-MY_P="SuperTux-v${PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="https://supertux.org/"
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-games/physfs-3.0
- dev-libs/boost:=
- media-libs/glew:=
- virtual/opengl
- media-libs/libvorbis
- media-libs/openal
- >=media-libs/libsdl2-2.0.1[joystick,video]
- >=media-libs/sdl2-image-2.0.0[png,jpeg]
- >=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
- "${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
- "${FILESDIR}"/${PN}-0.5.1-ninja.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # This is not a developer release so switch the logo to the non-dev one.
- sed -e 's@logo_dev@logo@' \
- -i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
- append-cxxflags -std=c++11
-
- local mycmakeargs=(
- -DWERROR=OFF
- -DINSTALL_SUBDIR_BIN=bin
- -DINSTALL_SUBDIR_DOC=share/doc/${PF}
- -DINSTALL_SUBDIR_SHARE=share/${PN}2
- -DENABLE_SQDBG="$(usex debug)"
- -DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
- -DUSE_SYSTEM_PHYSFS=ON
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-20 8:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-01 9:46 [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/, games-arcade/supertux/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2019-12-20 8:27 Lars Wendler
2016-04-10 3:20 Michael Sterrett
2015-12-23 4:31 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox