Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/supertux/files/, games-arcade/supertux/
Date: Tue, 25 Dec 2018 14:53:47
Message-Id: 1545749615.835d16aaf608ed4bb5e2a008279d1ec903581c60.polynomial-c@gentoo
1 commit: 835d16aaf608ed4bb5e2a008279d1ec903581c60
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 25 14:53:18 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 25 14:53:35 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835d16aa
7
8 games-arcade/supertux: Bump to version 0.6.0
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 games-arcade/supertux/Manifest | 1 +
14 .../supertux/files/supertux-0.6.0-icon.patch | 11 ++++
15 .../supertux/files/supertux-0.6.0-license.patch | 11 ++++
16 .../supertux/files/supertux-0.6.0-obstack.patch | 19 +++++++
17 games-arcade/supertux/supertux-0.6.0.ebuild | 60 ++++++++++++++++++++++
18 5 files changed, 102 insertions(+)
19
20 diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
21 index 3451c717190..02fccc57d69 100644
22 --- a/games-arcade/supertux/Manifest
23 +++ b/games-arcade/supertux/Manifest
24 @@ -1 +1,2 @@
25 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
26 +DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
27
28 diff --git a/games-arcade/supertux/files/supertux-0.6.0-icon.patch b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
29 new file mode 100644
30 index 00000000000..aac503c8cc9
31 --- /dev/null
32 +++ b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
33 @@ -0,0 +1,11 @@
34 +--- SuperTux-v0.6.0-Source/CMakeLists.txt
35 ++++ SuperTux-v0.6.0-Source/CMakeLists.txt
36 +@@ -846,7 +846,7 @@
37 + install(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN})
38 + endif()
39 +
40 +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION ".")
41 ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION ".")
42 +
43 + option(PACKAGE_VCREDIST "Package the VCREDIST libraries with the program" OFF)
44 +
45
46 diff --git a/games-arcade/supertux/files/supertux-0.6.0-license.patch b/games-arcade/supertux/files/supertux-0.6.0-license.patch
47 new file mode 100644
48 index 00000000000..600a3fd0c96
49 --- /dev/null
50 +++ b/games-arcade/supertux/files/supertux-0.6.0-license.patch
51 @@ -0,0 +1,11 @@
52 +--- SuperTux-v0.6.0-Source/CMakeLists.txt
53 ++++ SuperTux-v0.6.0-Source/CMakeLists.txt
54 +@@ -895,7 +895,7 @@
55 + install(FILES ${SQUIRREL_LIB_PATH} ${SQSTDLIB_LIB_PATH} ${PHYSFS_LIB_PATH} DESTINATION ${INSTALL_SUBDIR_BIN})
56 + endif()
57 +
58 +-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})
59 ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
60 +
61 + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.stxt DESTINATION ${INSTALL_SUBDIR_SHARE})
62 +
63
64 diff --git a/games-arcade/supertux/files/supertux-0.6.0-obstack.patch b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
65 new file mode 100644
66 index 00000000000..a46ca3afd12
67 --- /dev/null
68 +++ b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
69 @@ -0,0 +1,19 @@
70 +--- SuperTux-v0.6.0-Source/CMakeLists.txt
71 ++++ SuperTux-v0.6.0-Source/CMakeLists.txt
72 +@@ -470,7 +470,6 @@
73 + include_directories(${CMAKE_BINARY_DIR}/)
74 + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
75 + include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
76 +-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
77 + include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
78 + include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
79 +
80 +@@ -481,7 +480,7 @@
81 +
82 + ## Build list of sources for supertux binary
83 +
84 +-file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
85 ++file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
86 +
87 + file(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp src/video/null/*.cpp)
88 + file(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
89
90 diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild b/games-arcade/supertux/supertux-0.6.0.ebuild
91 new file mode 100644
92 index 00000000000..2fc8444ed9d
93 --- /dev/null
94 +++ b/games-arcade/supertux/supertux-0.6.0.ebuild
95 @@ -0,0 +1,60 @@
96 +# Copyright 1999-2018 Gentoo Authors
97 +# Distributed under the terms of the GNU General Public License v2
98 +
99 +EAPI=7
100 +
101 +: ${CMAKE_MAKEFILE_GENERATOR:=emake}
102 +inherit cmake-utils flag-o-matic
103 +
104 +MY_P="SuperTux-v${PV}-Source"
105 +
106 +DESCRIPTION="A game similar to Super Mario Bros."
107 +HOMEPAGE="https://supertux.org/"
108 +SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
109 +
110 +LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
111 +SLOT="0"
112 +KEYWORDS="~amd64 ~x86"
113 +IUSE="debug"
114 +
115 +RDEPEND="dev-games/physfs
116 + dev-libs/boost:=
117 + media-libs/glew:=
118 + virtual/opengl
119 + media-libs/libvorbis
120 + media-libs/openal
121 + >=media-libs/libsdl2-2.0.1[joystick,video]
122 + >=media-libs/sdl2-image-2.0.0[png,jpeg]
123 + >=net-misc/curl-7.21.7"
124 +DEPEND="${RDEPEND}
125 + virtual/pkgconfig"
126 +
127 +S="${WORKDIR}/${MY_P}"
128 +
129 +PATCHES=(
130 + "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
131 + "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
132 +)
133 +
134 +src_prepare() {
135 + cmake-utils_src_prepare
136 +
137 + # This is not a developer release so switch the logo to the non-dev one.
138 + sed -e 's@logo_dev@logo@' \
139 + -i data/images/objects/logo/logo.sprite || die
140 +}
141 +
142 +src_configure() {
143 + append-cxxflags -std=c++11
144 +
145 + local mycmakeargs=(
146 + -DWERROR=OFF
147 + -DINSTALL_SUBDIR_BIN=bin
148 + -DINSTALL_SUBDIR_DOC=share/doc/${PF}
149 + -DINSTALL_SUBDIR_SHARE=share/${PN}2
150 + -DENABLE_SQDBG="$(usex debug)"
151 + -DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
152 + -DUSE_SYSTEM_PHYSFS=ON
153 + )
154 + cmake-utils_src_configure
155 +}