games/megaglest{,-data}: update to 3.13.0

- Describe LICENSE for game data

Changes:	https://github.com/MegaGlest/megaglest-source/releases/tag/3.13.0
PR:		217725 217726
Submitted by:	Thibault Payet <monwarez@mailoo.org> (maintainer)
This commit is contained in:
Jan Beich 2017-03-13 04:12:54 +00:00
parent 1e6396e1a5
commit 1b51e0c31d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=436037
8 changed files with 14 additions and 44 deletions

View file

@ -2,13 +2,16 @@
# $FreeBSD$
PORTNAME= megaglest
PORTVERSION= 3.12.0
PORTVERSION= 3.13.0
CATEGORIES= games
PKGNAMESUFFIX= -data
MAINTAINER= monwarez@mailoo.org
COMMENT= MegaGlest data files
LICENSE= CC-BY-SA-3.0
LICENSE_FILE= ${WRKSRC}/docs/LICENSE.data.txt
USE_GITHUB= yes
GH_ACCOUNT= MegaGlest
GH_PROJECT= megaglest-data

View file

@ -1,2 +1,3 @@
SHA256 (MegaGlest-megaglest-data-3.12.0_GH0.tar.gz) = 7273dbc26aad06f5e796b1c76cd12d518ec6d172bd712b46aba05623e73ad154
SIZE (MegaGlest-megaglest-data-3.12.0_GH0.tar.gz) = 352540676
TIMESTAMP = 1489312394
SHA256 (MegaGlest-megaglest-data-3.13.0_GH0.tar.gz) = 99775601eae78e2c626bca76a6e9359491e13685541e36bee0d3207f81152e5e
SIZE (MegaGlest-megaglest-data-3.13.0_GH0.tar.gz) = 353518497

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= megaglest
PORTVERSION= 3.12.0
PORTREVISION= 1
PORTVERSION= 3.13.0
CATEGORIES= games
MAINTAINER= monwarez@mailoo.org

View file

@ -1,2 +1,3 @@
SHA256 (MegaGlest-megaglest-source-3.12.0_GH0.tar.gz) = 13c0ed6320f52558939cadcb1b1d16e6ac94cb3b22be6d4d761723ef41e87297
SIZE (MegaGlest-megaglest-source-3.12.0_GH0.tar.gz) = 3638252
TIMESTAMP = 1489313085
SHA256 (MegaGlest-megaglest-source-3.13.0_GH0.tar.gz) = efb5d755f44055e4b41ac6fc29e5cbe167f9d74eac800b3070f4b11b15f3b464
SIZE (MegaGlest-megaglest-source-3.13.0_GH0.tar.gz) = 3654879

View file

@ -1,11 +0,0 @@
--- source/shared_lib/sources/platform/posix/socket.cpp.orig 2016-12-26 00:02:43.325573000 +0100
+++ source/shared_lib/sources/platform/posix/socket.cpp 2016-12-26 00:04:06.681172000 +0100
@@ -2632,7 +2632,7 @@
//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);
+ char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0,0);
#else
char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])));
#endif

View file

@ -1,11 +0,0 @@
--- source/shared_lib/include/platform/sdl/platform_main.h.orig 2016-04-02 12:37:33 UTC
+++ source/shared_lib/include/platform/sdl/platform_main.h
@@ -667,7 +667,7 @@ int mainSetup(int argc, char **argv) {
}
else {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
- if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
+ if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) < 0) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 3;

View file

@ -1,11 +0,0 @@
--- source/shared_lib/sources/platform/common/platform_common.cpp.orig 2016-04-02 12:36:57 UTC
+++ source/shared_lib/sources/platform/common/platform_common.cpp
@@ -124,7 +124,7 @@ tm threadsafe_localtime(const time_t &ti
// extracting std::time_t from std:chrono for "now"
time_t systemtime_now() {
#if __cplusplus > 199711L
- system_time_point system_now = std::chrono::system_clock::now();
+ auto system_now = std::chrono::system_clock::now();
return std::chrono::system_clock::to_time_t(system_now);
#else
return time(NULL);

View file

@ -1,10 +1,9 @@
--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2016-04-02 12:36:57 UTC
--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2017-03-12 11:21:46 UTC
+++ source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -19,10 +19,7 @@
#if !defined(DISABLE_IRCCLIENT)
@@ -20,9 +20,7 @@
#include <libircclient.h>
-// upstream moved some defines into new headers as of 1.6
// upstream moved some defines into new headers as of 1.6
-#ifndef LIBIRCCLIENT_PRE1_6
#include <libirc_rfcnumeric.h>
-#endif