| 1 |
commit: 514dc17ffeba7bcfdfc91dfb365f01daf44ef5b9 |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 1 06:19:31 2015 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 1 06:19:46 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514dc17f |
| 7 |
|
| 8 |
old |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
games-strategy/megaglest/Manifest | 1 - |
| 13 |
.../megaglest/files/megaglest-3.9.1-cmake.patch | 46 ------ |
| 14 |
.../files/megaglest-3.9.1-static-build.patch | 63 -------- |
| 15 |
games-strategy/megaglest/megaglest-3.9.1-r1.ebuild | 165 --------------------- |
| 16 |
4 files changed, 275 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest |
| 19 |
index b5cf59e..8651604 100644 |
| 20 |
--- a/games-strategy/megaglest/Manifest |
| 21 |
+++ b/games-strategy/megaglest/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
DIST megaglest-source-3.11.1.tar.xz 2863180 SHA256 94e28a9628f3593ce337ce663f258a125176b11128f16afb8c947f2763930841 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225 WHIRLPOOL 7a6b0908da7c6164f3baa71ea10c1f09fca86581b9da4930c3a0aa70e2c25d582349772d45ec8edee91ded2cbe1e68ee66e8756d1d23205c5d751eae135758b0 |
| 24 |
-DIST megaglest-source-3.9.1.tar.xz 2957360 SHA256 e62314b8108ba3c80706aa896f4fed5992a8ea8d82a410e09fbb242c4bf54edc SHA512 2a3d402aa68a1b1ee326bf49b6b6dee5ed561623b541ab47c1545596fa9c77f805245b66bd8457ecd82625a3f1d4868269a4a3888a54245c73d9cb6babbace70 WHIRLPOOL 59ad629c66633b2f320c7c80eef627f4326cbacb0cc48169c33b6783bfc26d1a8baef1773f0d05a1bc589ec5ae6bbedbb1f394c34616b166faa6e7f9630a22e5 |
| 25 |
|
| 26 |
diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index c780146..0000000 |
| 29 |
--- a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,46 +0,0 @@ |
| 32 |
-From: Julian Ospald <hasufell@g.o> |
| 33 |
-Date: Mon Jan 27 00:46:56 UTC 2014 |
| 34 |
-Subject: fix installation |
| 35 |
- |
| 36 |
---- megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt |
| 37 |
-+++ megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt |
| 38 |
-@@ -310,9 +310,9 @@ |
| 39 |
- "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png" |
| 40 |
- "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm" |
| 41 |
- "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp" |
| 42 |
-- "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico" |
| 43 |
-+ "${PROJECT_SOURCE_DIR}/editor.ico" |
| 44 |
- "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico" |
| 45 |
-- "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico" |
| 46 |
-+ "${PROJECT_SOURCE_DIR}/g3dviewer.ico" |
| 47 |
- DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) |
| 48 |
- ELSE() |
| 49 |
- |
| 50 |
-From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001 |
| 51 |
-From: Michael Palimaka <kensington@g.o> |
| 52 |
-Date: Wed, 13 May 2015 04:22:45 +1000 |
| 53 |
-Subject: [PATCH] Fix build with >=cmake-3.2. |
| 54 |
- |
| 55 |
-The FindOpenGL module no longer pulls in X11 libraries. |
| 56 |
---- |
| 57 |
- source/shared_lib/CMakeLists.txt | 4 ++++ |
| 58 |
- 1 file changed, 4 insertions(+) |
| 59 |
- |
| 60 |
-diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt |
| 61 |
-index 3da563e..e5a06fc 100644 |
| 62 |
---- a/source/shared_lib/CMakeLists.txt |
| 63 |
-+++ b/source/shared_lib/CMakeLists.txt |
| 64 |
-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST |
| 65 |
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY}) |
| 66 |
- ENDIF() |
| 67 |
- |
| 68 |
-+ IF(UNIX) |
| 69 |
-+ FIND_PACKAGE(X11 REQUIRED) |
| 70 |
-+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES}) |
| 71 |
-+ ENDIF() |
| 72 |
- |
| 73 |
- IF(WANT_XERCES) |
| 74 |
- FIND_PACKAGE(XercesC REQUIRED) |
| 75 |
--- |
| 76 |
-2.3.6 |
| 77 |
- |
| 78 |
|
| 79 |
diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch |
| 80 |
deleted file mode 100644 |
| 81 |
index 2586a56..0000000 |
| 82 |
--- a/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch |
| 83 |
+++ /dev/null |
| 84 |
@@ -1,63 +0,0 @@ |
| 85 |
-commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a |
| 86 |
-Author: hasufell <hasufell@g.o> |
| 87 |
-Date: Mon Nov 18 21:54:54 2013 +0100 |
| 88 |
- |
| 89 |
- fix static build |
| 90 |
- |
| 91 |
-diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake |
| 92 |
-index 2a026cc..8ca8a23 100644 |
| 93 |
---- a/mk/cmake/Modules/FindOGG.cmake |
| 94 |
-+++ b/mk/cmake/Modules/FindOGG.cmake |
| 95 |
-@@ -19,11 +19,11 @@ |
| 96 |
- |
| 97 |
- FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) |
| 98 |
- |
| 99 |
--#IF (OGG_STATIC AND NOT OGG_LIBRARY) |
| 100 |
--# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) |
| 101 |
--#ELSE() |
| 102 |
-- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) |
| 103 |
--#ENDIF() |
| 104 |
-+IF (OGG_STATIC AND NOT OGG_LIBRARY) |
| 105 |
-+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) |
| 106 |
-+ELSE() |
| 107 |
-+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) |
| 108 |
-+ENDIF() |
| 109 |
- |
| 110 |
- #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) |
| 111 |
- # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) |
| 112 |
---- a/mk/cmake/Modules/FindXercesC.cmake |
| 113 |
-+++ b/mk/cmake/Modules/FindXercesC.cmake |
| 114 |
-@@ -83,6 +83,9 @@ |
| 115 |
- /usr/lib |
| 116 |
- /usr/local/lib |
| 117 |
- ) |
| 118 |
-+ |
| 119 |
-+ FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a) |
| 120 |
-+ FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a) |
| 121 |
- |
| 122 |
- IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) |
| 123 |
- MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]") |
| 124 |
-@@ -90,7 +93,7 @@ |
| 125 |
- |
| 126 |
- IF(UNIX AND NOT APPLE) |
| 127 |
- #SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata") |
| 128 |
-- SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}") |
| 129 |
-+ SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY} ${ICUDATA_LIBRARY}") |
| 130 |
- ENDIF() |
| 131 |
- ENDIF() |
| 132 |
- ENDIF() |
| 133 |
---- a/mk/cmake/Modules/FindFriBiDi.cmake |
| 134 |
-+++ b/mk/cmake/Modules/FindFriBiDi.cmake |
| 135 |
-@@ -28,9 +28,9 @@ |
| 136 |
- SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) |
| 137 |
- |
| 138 |
- OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) |
| 139 |
--IF(WANT_STATIC_LIBS) |
| 140 |
-- SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) |
| 141 |
--ENDIF() |
| 142 |
-+#IF(WANT_STATIC_LIBS) |
| 143 |
-+# SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) |
| 144 |
-+#ENDIF() |
| 145 |
- |
| 146 |
- MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...") |
| 147 |
- |
| 148 |
|
| 149 |
diff --git a/games-strategy/megaglest/megaglest-3.9.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.9.1-r1.ebuild |
| 150 |
deleted file mode 100644 |
| 151 |
index dea6d1d..0000000 |
| 152 |
--- a/games-strategy/megaglest/megaglest-3.9.1-r1.ebuild |
| 153 |
+++ /dev/null |
| 154 |
@@ -1,165 +0,0 @@ |
| 155 |
-# Copyright 1999-2015 Gentoo Foundation |
| 156 |
-# Distributed under the terms of the GNU General Public License v2 |
| 157 |
-# $Id$ |
| 158 |
- |
| 159 |
-# google-breakpad |
| 160 |
-# TODO: fribidi, libvorbis static |
| 161 |
- |
| 162 |
-EAPI=5 |
| 163 |
-VIRTUALX_REQUIRED="manual" |
| 164 |
-inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games |
| 165 |
- |
| 166 |
-DESCRIPTION="Cross-platform 3D realtime strategy game" |
| 167 |
-HOMEPAGE="http://www.megaglest.org/" |
| 168 |
-SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz" |
| 169 |
- |
| 170 |
-LICENSE="GPL-3 BitstreamVera" |
| 171 |
-SLOT="0" |
| 172 |
-KEYWORDS="amd64 x86" |
| 173 |
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos" |
| 174 |
- |
| 175 |
-RDEPEND=" |
| 176 |
- >=dev-lang/lua-5.1 |
| 177 |
- dev-libs/libxml2 |
| 178 |
- media-libs/fontconfig |
| 179 |
- media-libs/freetype |
| 180 |
- media-libs/libsdl[X,sound,joystick,opengl,video] |
| 181 |
- media-libs/libvorbis |
| 182 |
- media-libs/openal |
| 183 |
- net-libs/gnutls |
| 184 |
- sys-libs/zlib |
| 185 |
- virtual/opengl |
| 186 |
- virtual/glu |
| 187 |
- x11-libs/libX11 |
| 188 |
- x11-libs/libXext |
| 189 |
- editor? ( x11-libs/wxGTK:2.8[X,opengl] ) |
| 190 |
- fribidi? ( dev-libs/fribidi ) |
| 191 |
- model-viewer? ( x11-libs/wxGTK:2.8[X] ) |
| 192 |
- !static? ( |
| 193 |
- dev-libs/xerces-c[icu] |
| 194 |
- media-libs/ftgl |
| 195 |
- media-libs/glew |
| 196 |
- media-libs/libpng:0 |
| 197 |
- net-libs/libircclient |
| 198 |
- >=net-libs/miniupnpc-1.8 |
| 199 |
- net-misc/curl |
| 200 |
- virtual/jpeg |
| 201 |
- ) |
| 202 |
- videos? ( media-video/vlc )" |
| 203 |
-DEPEND="${RDEPEND} |
| 204 |
- sys-apps/help2man |
| 205 |
- virtual/pkgconfig |
| 206 |
- editor? ( ${VIRTUALX_DEPEND} ) |
| 207 |
- model-viewer? ( ${VIRTUALX_DEPEND} ) |
| 208 |
- static? ( |
| 209 |
- dev-libs/icu[static-libs] |
| 210 |
- dev-libs/xerces-c[icu,static-libs] |
| 211 |
- media-libs/ftgl[static-libs] |
| 212 |
- media-libs/glew[static-libs] |
| 213 |
- media-libs/libpng:0[static-libs] |
| 214 |
- net-libs/libircclient[static-libs] |
| 215 |
- net-libs/miniupnpc[static-libs] |
| 216 |
- net-misc/curl[static-libs] |
| 217 |
- virtual/jpeg[static-libs] |
| 218 |
- )" |
| 219 |
-PDEPEND="~games-strategy/${PN}-data-${PV}" |
| 220 |
- |
| 221 |
-src_prepare() { |
| 222 |
- if use editor || use model-viewer ; then |
| 223 |
- WX_GTK_VER="2.8" |
| 224 |
- need-wxwidgets unicode |
| 225 |
- fi |
| 226 |
- |
| 227 |
- epatch "${FILESDIR}"/${P}-static-build.patch \ |
| 228 |
- "${FILESDIR}"/${P}-cmake.patch |
| 229 |
-} |
| 230 |
- |
| 231 |
-src_configure() { |
| 232 |
- if use cpu_flags_x86_sse3; then |
| 233 |
- SSE=3 |
| 234 |
- elif use cpu_flags_x86_sse2; then |
| 235 |
- SSE=2 |
| 236 |
- elif use cpu_flags_x86_sse; then |
| 237 |
- SSE=1 |
| 238 |
- else |
| 239 |
- SSE=0 |
| 240 |
- fi |
| 241 |
- |
| 242 |
- local mycmakeargs=( |
| 243 |
- $(cmake-utils_use_enable fribidi FRIBIDI) |
| 244 |
- $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR) |
| 245 |
- $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS) |
| 246 |
- $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER) |
| 247 |
- $(cmake-utils_use_with videos VLC) |
| 248 |
- -DMAX_SSE_LEVEL_DESIRED="${SSE}" |
| 249 |
- -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" |
| 250 |
- -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" |
| 251 |
- # icons are used at runtime, wrong default location share/pixmaps |
| 252 |
- -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" |
| 253 |
- -DUSE_FTGL=ON |
| 254 |
- $(cmake-utils_use_want static STATIC_LIBS) |
| 255 |
- $(cmake-utils_use_want streflop STREFLOP) |
| 256 |
- -DWANT_SVN_STAMP=off |
| 257 |
- $(cmake-utils_use static wxWidgets_USE_STATIC) |
| 258 |
- $(cmake-utils_use unicode wxWidgets_USE_UNICODE) |
| 259 |
- $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL) |
| 260 |
- |
| 261 |
- $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") |
| 262 |
- ) |
| 263 |
- |
| 264 |
- # support CMAKE_BUILD_TYPE=Gentoo |
| 265 |
- append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' |
| 266 |
- |
| 267 |
- cmake-utils_src_configure |
| 268 |
-} |
| 269 |
- |
| 270 |
-src_compile() { |
| 271 |
- if use editor || use model-viewer; then |
| 272 |
- VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake |
| 273 |
- else |
| 274 |
- cmake-utils_src_compile |
| 275 |
- fi |
| 276 |
-} |
| 277 |
- |
| 278 |
-src_install() { |
| 279 |
- # rebuilds some targets randomly without fast option |
| 280 |
- emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast |
| 281 |
- |
| 282 |
- dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt |
| 283 |
- doicon -s 48 ${PN}.png |
| 284 |
- |
| 285 |
- use editor && |
| 286 |
- make_desktop_entry ${PN}_editor "MegaGlest Map Editor" |
| 287 |
- use model-viewer && |
| 288 |
- make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" |
| 289 |
- |
| 290 |
- # provided by megaglest-data |
| 291 |
- rm "${ED%/}/${GAMES_DATADIR}"/${PN}/${PN}.bmp || die |
| 292 |
- |
| 293 |
- prepgamesdirs |
| 294 |
-} |
| 295 |
- |
| 296 |
-pkg_preinst() { |
| 297 |
- games_pkg_preinst |
| 298 |
- gnome2_icon_savelist |
| 299 |
-} |
| 300 |
- |
| 301 |
-pkg_postinst() { |
| 302 |
- einfo |
| 303 |
- elog 'Note about Configuration:' |
| 304 |
- elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' |
| 305 |
- elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' |
| 306 |
- elog 'values in these files.' |
| 307 |
- elog |
| 308 |
- elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' |
| 309 |
- elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' |
| 310 |
- elog 'Some graphics cards may require setting Max Lights to 1.' |
| 311 |
- einfo |
| 312 |
- |
| 313 |
- games_pkg_postinst |
| 314 |
- gnome2_icon_cache_update |
| 315 |
-} |
| 316 |
- |
| 317 |
-pkg_postrm() { |
| 318 |
- gnome2_icon_cache_update |
| 319 |
-} |
Archives