summaryrefslogtreecommitdiff
path: root/games-strategy/megaglest
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-07 21:26:27 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-07 21:26:27 +0000
commit6c8694a707151d59555b0e4e48235f085ce166c3 (patch)
tree55a5daf0d84be7644afa7725018b5589f3369bcd /games-strategy/megaglest
parent54ef05621701a320a71e56f68a0a942bc53ae0e9 (diff)
gentoo auto-resync : 07:02:2023 - 21:26:27
Diffstat (limited to 'games-strategy/megaglest')
-rw-r--r--games-strategy/megaglest/Manifest6
-rw-r--r--games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch28
-rw-r--r--games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch17
-rw-r--r--games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch21
-rw-r--r--games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch63
-rw-r--r--games-strategy/megaglest/megaglest-3.11.1-r100.ebuild153
6 files changed, 0 insertions, 288 deletions
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index 716c599711b4..2a46289f2198 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,10 +1,4 @@
AUX megaglest-3.11.1-cmake-lua.patch 848 BLAKE2B ae918da49eb8bac6add4cd0df27f2e58cc632a3b5c3fc188fefd7152cbdff83e255bab9cdcd17580ef564ca99a88fc4715ed103001463981d7053d8338c3d5ca SHA512 33b1a3bb6fc0fed9cc30d5cd88aed4b738b831625e0d1a33cf11dfd0252b9bf8b5c2cbdfd1a8f62b4b683562e7d6fb824675850ac79ce7f74ce4d7e41feb7076
-AUX megaglest-3.11.1-cmake.patch 897 BLAKE2B 3076a11cbb18263aabfabdaadb4e201d26b7db6e55e32278c0f37ebd938ae8a41cccb906bcf30ff99a32f6ecb35d77512fd3904610443847d1e3bb3212122902 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc
-AUX megaglest-3.11.1-miniupnpc-api-version-16.patch 1336 BLAKE2B 66dd8eb198258ecc59e0f186f89976413e15d2d49314f877a4444ba598ab4cdaa00b18c3c8defe50f4da21d0b4557ac220e351b1d6c006032ae6bc5cfb054bee SHA512 c1f343f0987715aa7bded6f4dff85db1212e4b6e45c8ac6d27ea429e5698b39973e917c8ba3f1b25b3c60d2d0054608f036d89056263c09981ba6157ff75264a
-AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4
-AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
-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
-EBUILD megaglest-3.11.1-r100.ebuild 3993 BLAKE2B 9cac50646fc06f9a73bb233b91c460a1b6c876b1c9b7f1022bce037e854602dc33d86127fcb139d158f932a502bbd046d58dbff1cf3911ee2fcce337390303db SHA512 a95153df30b853b16d28202edadae744c8dbc1de026e5c2d04099d730a5a7414274169417982c482530e629cc0f7425b5511ff6b0166f625b649e8893dd2643c
EBUILD megaglest-3.13.0.ebuild 3681 BLAKE2B 637c56194556b157e5eabf97051e27a3c988a92d52ba028299490ce5038fb9ff46186e2d59fc689931c4582789d5ef5738f79588c901b14c5ad2a211dc6d613d SHA512 36f9bd1b500ee3c5d05b0df26a862a11db2b7602ff87608a6af8b7191fe3b93def37c697879862fbf038900d1327510f8da64d6cb897a0abb2a5e5fcfc3935a6
MISC metadata.xml 1622 BLAKE2B f4d7dddd0d654cefb22fe3acc00d366501a5fa93243bef3336965fffe2f8500f94eed915e5adf7655a8e1f7a28fcbc2fc49d99a2cdf2899173ffe819cdfdfa80 SHA512 5b65d3bf4ccf9619350293d3669e7a001fcb0f4addcb0c50f56c6ccba2239b87507a796a34d5fc5c3b2d144e740057496220aff2d0699a41db5f37ae8eaad2bc
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
deleted file mode 100644
index 527671246e98..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
+++ /dev/null
@@ -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
-
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
deleted file mode 100644
index b0275156bda1..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
+++ /dev/null
@@ -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
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
deleted file mode 100644
index 112e734c6efb..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
+++ /dev/null
@@ -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);
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
deleted file mode 100644
index 2586a561956b..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.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.11.1-r100.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
deleted file mode 100644
index 0ee6393c8030..000000000000
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ /dev/null
@@ -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
-}