* [gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/, games-strategy/megaglest/
@ 2015-10-05 0:47 Michael Sterrett
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2015-10-05 0:47 UTC (permalink / raw
To: gentoo-commits
commit: ca000adb5b3ed930e21f729a57f8ad0f0715280d
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 00:44:52 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 00:47:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca000adb
add patch from Sander Sweers to support building against newer miniupnpc (bug #562046)
Package-Manager: portage-2.2.20.1
.../files/megaglest-3.11.1-miniupnpc.patch | 21 +++++++++++++++++++++
games-strategy/megaglest/megaglest-3.11.1.ebuild | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
new file mode 100644
index 0000000..112e734
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
@@ -0,0 +1,21 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..cb8ceb4 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
+ const char *upnp_minissdpdsock = NULL;
+ int upnp_sameport = 0;
+ int upnp_ipv6 = 0;
++ unsigned char upnp_ttl = 2;
+ int upnp_error = 0;
+
+-#ifndef MINIUPNPC_VERSION_PRE1_6
++#if (MINIUPNPC_API_VERSION >= 14)
++ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++
++ if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
++ if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
++#elif (MINIUPNPC_API_VERSION >= 8)
+ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+
+ if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild b/games-strategy/megaglest/megaglest-3.11.1.ebuild
index 7776e56..3c74a8d 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1.ebuild
@@ -71,7 +71,8 @@ src_prepare() {
fi
epatch "${FILESDIR}"/${P}-static-build.patch \
- "${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-cmake.patch \
+ "${FILESDIR}"/${P}-miniupnpc.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/, games-strategy/megaglest/
@ 2015-12-01 6:19 Michael Sterrett
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2015-12-01 6:19 UTC (permalink / raw
To: gentoo-commits
commit: 514dc17ffeba7bcfdfc91dfb365f01daf44ef5b9
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 06:19:31 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 06:19:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514dc17f
old
Package-Manager: portage-2.2.20.1
games-strategy/megaglest/Manifest | 1 -
.../megaglest/files/megaglest-3.9.1-cmake.patch | 46 ------
.../files/megaglest-3.9.1-static-build.patch | 63 --------
games-strategy/megaglest/megaglest-3.9.1-r1.ebuild | 165 ---------------------
4 files changed, 275 deletions(-)
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index b5cf59e..8651604 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,2 +1 @@
DIST megaglest-source-3.11.1.tar.xz 2863180 SHA256 94e28a9628f3593ce337ce663f258a125176b11128f16afb8c947f2763930841 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225 WHIRLPOOL 7a6b0908da7c6164f3baa71ea10c1f09fca86581b9da4930c3a0aa70e2c25d582349772d45ec8edee91ded2cbe1e68ee66e8756d1d23205c5d751eae135758b0
-DIST megaglest-source-3.9.1.tar.xz 2957360 SHA256 e62314b8108ba3c80706aa896f4fed5992a8ea8d82a410e09fbb242c4bf54edc SHA512 2a3d402aa68a1b1ee326bf49b6b6dee5ed561623b541ab47c1545596fa9c77f805245b66bd8457ecd82625a3f1d4868269a4a3888a54245c73d9cb6babbace70 WHIRLPOOL 59ad629c66633b2f320c7c80eef627f4326cbacb0cc48169c33b6783bfc26d1a8baef1773f0d05a1bc589ec5ae6bbedbb1f394c34616b166faa6e7f9630a22e5
diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
deleted file mode 100644
index c780146..0000000
--- a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Jan 27 00:46:56 UTC 2014
-Subject: fix installation
-
---- megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
-+++ megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
-@@ -310,9 +310,9 @@
- "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
- "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
- "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
-- "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
-+ "${PROJECT_SOURCE_DIR}/editor.ico"
- "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
-- "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
-+ "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
- DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
- ELSE()
-
-From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Wed, 13 May 2015 04:22:45 +1000
-Subject: [PATCH] Fix build with >=cmake-3.2.
-
-The FindOpenGL module no longer pulls in X11 libraries.
----
- source/shared_lib/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
-index 3da563e..e5a06fc 100644
---- a/source/shared_lib/CMakeLists.txt
-+++ b/source/shared_lib/CMakeLists.txt
-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
- ENDIF()
-
-+ IF(UNIX)
-+ FIND_PACKAGE(X11 REQUIRED)
-+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
-+ ENDIF()
-
- IF(WANT_XERCES)
- FIND_PACKAGE(XercesC REQUIRED)
---
-2.3.6
-
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
deleted file mode 100644
index 2586a56..0000000
--- a/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
-Author: hasufell <hasufell@gentoo.org>
-Date: Mon Nov 18 21:54:54 2013 +0100
-
- fix static build
-
-diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake
-index 2a026cc..8ca8a23 100644
---- a/mk/cmake/Modules/FindOGG.cmake
-+++ b/mk/cmake/Modules/FindOGG.cmake
-@@ -19,11 +19,11 @@
-
- FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
-
--#IF (OGG_STATIC AND NOT OGG_LIBRARY)
--# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
--#ELSE()
-- FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
--#ENDIF()
-+IF (OGG_STATIC AND NOT OGG_LIBRARY)
-+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a)
-+ELSE()
-+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so)
-+ENDIF()
-
- #IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
- # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
---- a/mk/cmake/Modules/FindXercesC.cmake
-+++ b/mk/cmake/Modules/FindXercesC.cmake
-@@ -83,6 +83,9 @@
- /usr/lib
- /usr/local/lib
- )
-+
-+ FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a)
-+ FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a)
-
- IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
- MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]")
-@@ -90,7 +93,7 @@
-
- IF(UNIX AND NOT APPLE)
- #SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata")
-- SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}")
-+ SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY} ${ICUDATA_LIBRARY}")
- ENDIF()
- ENDIF()
- ENDIF()
---- a/mk/cmake/Modules/FindFriBiDi.cmake
-+++ b/mk/cmake/Modules/FindFriBiDi.cmake
-@@ -28,9 +28,9 @@
- SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
-
- OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
--IF(WANT_STATIC_LIBS)
-- SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
--ENDIF()
-+#IF(WANT_STATIC_LIBS)
-+# SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
-+#ENDIF()
-
- MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
-
diff --git a/games-strategy/megaglest/megaglest-3.9.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.9.1-r1.ebuild
deleted file mode 100644
index dea6d1d..0000000
--- a/games-strategy/megaglest/megaglest-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# google-breakpad
-# TODO: fribidi, libvorbis static
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
-
-DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="http://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
-
-LICENSE="GPL-3 BitstreamVera"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
-
-RDEPEND="
- >=dev-lang/lua-5.1
- dev-libs/libxml2
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libsdl[X,sound,joystick,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/gnutls
- sys-libs/zlib
- virtual/opengl
- virtual/glu
- x11-libs/libX11
- x11-libs/libXext
- editor? ( x11-libs/wxGTK:2.8[X,opengl] )
- fribidi? ( dev-libs/fribidi )
- model-viewer? ( x11-libs/wxGTK:2.8[X] )
- !static? (
- dev-libs/xerces-c[icu]
- media-libs/ftgl
- media-libs/glew
- media-libs/libpng:0
- net-libs/libircclient
- >=net-libs/miniupnpc-1.8
- net-misc/curl
- virtual/jpeg
- )
- videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}
- sys-apps/help2man
- virtual/pkgconfig
- editor? ( ${VIRTUALX_DEPEND} )
- model-viewer? ( ${VIRTUALX_DEPEND} )
- static? (
- dev-libs/icu[static-libs]
- dev-libs/xerces-c[icu,static-libs]
- media-libs/ftgl[static-libs]
- media-libs/glew[static-libs]
- media-libs/libpng:0[static-libs]
- net-libs/libircclient[static-libs]
- net-libs/miniupnpc[static-libs]
- net-misc/curl[static-libs]
- virtual/jpeg[static-libs]
- )"
-PDEPEND="~games-strategy/${PN}-data-${PV}"
-
-src_prepare() {
- if use editor || use model-viewer ; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- fi
-
- epatch "${FILESDIR}"/${P}-static-build.patch \
- "${FILESDIR}"/${P}-cmake.patch
-}
-
-src_configure() {
- if use cpu_flags_x86_sse3; then
- SSE=3
- elif use cpu_flags_x86_sse2; then
- SSE=2
- elif use cpu_flags_x86_sse; then
- SSE=1
- else
- SSE=0
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_enable fribidi FRIBIDI)
- $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
- $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
- $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
- $(cmake-utils_use_with videos VLC)
- -DMAX_SSE_LEVEL_DESIRED="${SSE}"
- -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
- -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
- # icons are used at runtime, wrong default location share/pixmaps
- -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
- -DUSE_FTGL=ON
- $(cmake-utils_use_want static STATIC_LIBS)
- $(cmake-utils_use_want streflop STREFLOP)
- -DWANT_SVN_STAMP=off
- $(cmake-utils_use static wxWidgets_USE_STATIC)
- $(cmake-utils_use unicode wxWidgets_USE_UNICODE)
- $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
-
- $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
- )
-
- # support CMAKE_BUILD_TYPE=Gentoo
- append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- if use editor || use model-viewer; then
- VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
- else
- cmake-utils_src_compile
- fi
-}
-
-src_install() {
- # rebuilds some targets randomly without fast option
- emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
-
- dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
- doicon -s 48 ${PN}.png
-
- use editor &&
- make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
- use model-viewer &&
- make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
-
- # provided by megaglest-data
- rm "${ED%/}/${GAMES_DATADIR}"/${PN}/${PN}.bmp || die
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- einfo
- elog 'Note about Configuration:'
- elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
- elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
- elog 'values in these files.'
- elog
- elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
- elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
- elog 'Some graphics cards may require setting Max Lights to 1.'
- einfo
-
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-01 6:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-05 0:47 [gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/, games-strategy/megaglest/ Michael Sterrett
-- strict thread matches above, loose matches on Subject: below --
2015-12-01 6:19 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox