mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
games-strategy/megaglest: drop 3.11.1-r100
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
|
||||
DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac
|
||||
|
||||
--- a/source/shared_lib/sources/platform/posix/socket.cpp
|
||||
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
|
||||
@@ -2610,8 +2610,10 @@
|
||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
|
||||
|
||||
//printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr);
|
||||
-#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
|
||||
- char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0);
|
||||
+#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 16)
|
||||
+ char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0, NULL);
|
||||
+#elif (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
|
||||
+ char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0);
|
||||
#else
|
||||
char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])));
|
||||
#endif
|
||||
@@ -1,21 +0,0 @@
|
||||
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);
|
||||
@@ -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}] ...")
|
||||
|
||||
@@ -1,153 +0,0 @@
|
||||
# Copyright 2010-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# google-breakpad
|
||||
# TODO: fribidi, libvorbis static
|
||||
|
||||
EAPI=7
|
||||
|
||||
# src_install() currently requires this
|
||||
CMAKE_MAKEFILE_GENERATOR="emake"
|
||||
|
||||
LUA_COMPAT=( lua5-{1..2} )
|
||||
|
||||
# Only needed by certain features
|
||||
VIRTUALX_REQUIRED="manual"
|
||||
|
||||
WX_GTK_VER="3.0"
|
||||
inherit cmake desktop lua-single virtualx wxwidgets xdg-utils
|
||||
|
||||
DESCRIPTION="Cross-platform 3D realtime strategy game"
|
||||
HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
|
||||
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 +streflop +tools +unicode wxuniversal +model-viewer videos"
|
||||
|
||||
REQUIRED_USE="${LUA_REQUIRED_USE}"
|
||||
|
||||
# Older versions of megaglest-data install into /usr/games
|
||||
RDEPEND="${LUA_DEPS}
|
||||
~games-strategy/${PN}-data-${PV}
|
||||
>=games-strategy/${PN}-data-3.11.1-r1
|
||||
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:${WX_GTK_VER}[X,opengl] )
|
||||
fribidi? ( dev-libs/fribidi )
|
||||
model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
|
||||
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:0
|
||||
videos? ( media-video/vlc )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="sys-apps/help2man
|
||||
virtual/pkgconfig
|
||||
editor? ( ${VIRTUALX_DEPEND} )
|
||||
model-viewer? ( ${VIRTUALX_DEPEND} )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-static-build.patch
|
||||
"${FILESDIR}"/${P}-cmake.patch
|
||||
"${FILESDIR}"/${P}-cmake-lua.patch
|
||||
"${FILESDIR}"/${P}-miniupnpc.patch
|
||||
"${FILESDIR}"/${P}-miniupnpc-api-version-16.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
if use editor || use model-viewer ; then
|
||||
setup-wxwidgets
|
||||
fi
|
||||
}
|
||||
|
||||
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=(
|
||||
-DBUILD_MEGAGLEST_MAP_EDITOR=$(usex editor)
|
||||
-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=$(usex tools)
|
||||
-DBUILD_MEGAGLEST_MODEL_VIEWER=$(usex model-viewer)
|
||||
-DENABLE_FRIBIDI=$(usex fribidi)
|
||||
-DFORCE_LUA_VERSION="$(lua_get_version)"
|
||||
-DMAX_SSE_LEVEL_DESIRED="${SSE}"
|
||||
-DUSE_FTGL=ON
|
||||
-DWANT_STATIC_LIBS=OFF
|
||||
-DWANT_STREFLOP=$(usex streflop)
|
||||
-DWITH_VLC=$(usex videos)
|
||||
-DwxWidgets_USE_STATIC=OFF
|
||||
-DwxWidgets_USE_UNICODE=$(usex unicode)
|
||||
-DwxWidgets_USE_UNIVERSAL=$(usex wxuniversal)
|
||||
|
||||
$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use editor || use model-viewer; then
|
||||
# work around parallel make issues - bug #561380
|
||||
MAKEOPTS="-j1 ${MAKEOPTS}" \
|
||||
virtx cmake_src_compile
|
||||
else
|
||||
cmake_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# rebuilds some targets randomly without fast option
|
||||
emake -C "${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"
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
Reference in New Issue
Block a user