Attachment 168918 Details for Bug 205485 – megaglest diff

[patch] megaglest diff

megaglest-3.12.0.diff (text/plain), 9.74 KB, created by Thibault Payet on 2016-04-03 07:59:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Payet

Created: 2016-04-03 07:59:45 UTC

Size: 9.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 412412)
>+++ Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	megaglest
>-PORTVERSION=	3.11.1
>+PORTVERSION=	3.12.0
> CATEGORIES=	games
> DISTNAME=	${PORTNAME}-source-${PORTVERSION}
> 
>@@ -30,7 +30,7 @@
> USES=		cmake compiler:c++11-lib display:build dos2unix jpeg lua \
> 		openal:al,alut pkgconfig tar:xz
> USE_GL=		glew gl glu
>-USE_SDL=	yes
>+USE_SDL=	sdl2
> USE_WX=		3.0
> USE_CXXSTD=	c++11
> 
>@@ -37,9 +37,10 @@
> CFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lssl -lcrypto
> 
>-OPTIONS_DEFINE=	EDITOR DOCS
>+OPTIONS_DEFINE=	EDITOR DOCS VIEWER
> OPTIONS_SUB=	yes
> EDITOR_DESC=	Install MegaGlest Editor
>+VIEWER_DESC=	Install Megaglest G3D viewer
> 
> .include <bsd.port.options.mk>
> 
>@@ -52,9 +53,8 @@
> do-install:
> 	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
>-	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
>+	${INSTALL_DATA} ${WRKSRC}/mk/shared/megaglest.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
> 	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> .for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
>@@ -66,7 +66,13 @@
> . endfor
> .endif
> .if ${PORT_OPTIONS:MEDITOR}
>+	${STRIP_CMD} ${WRKSRC}/source/glest_map_editor/megaglest_editor
> 	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor
>+	${INSTALL_DATA} ${WRKSRC}/mk/shared/editor.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
> .endif
>-
>+.if ${PORT_OPTIONS:MVIEWER}
>+	${STRIP_CMD} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer
>+	${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer
>+	${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
>+.endif
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 412412)
>+++ distinfo	(copie de travail)
>@@ -1,2 +1,2 @@
>-SHA256 (megaglest-source-3.11.1_GH0.tar.xz) = 6bbbbb69d01bc765f439a60c74178b75dc47753cc126e6758e3bc740d8b42a21
>-SIZE (megaglest-source-3.11.1_GH0.tar.xz) = 4807372
>+SHA256 (megaglest-source-3.12.0_GH0.tar.xz) = 13c0ed6320f52558939cadcb1b1d16e6ac94cb3b22be6d4d761723ef41e87297
>+SIZE (megaglest-source-3.12.0_GH0.tar.xz) = 3638252
>Index: files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
>===================================================================
>--- files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	(rÃ©vision 412412)
>+++ files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	(copie de travail)
>@@ -1,5 +1,5 @@
>---- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2013-11-22 15:51:23.000000000 -0600
>-+++ source/shared_lib/sources/platform/posix/ircclient.cpp	2013-11-22 15:51:42.000000000 -0600
>+--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2016-04-02 12:36:57 UTC
>++++ source/shared_lib/sources/platform/posix/ircclient.cpp
> @@ -19,10 +19,7 @@
>  #if !defined(DISABLE_IRCCLIENT)
>  
>Index: files/patch-source__shared_lib__CMakeLists.txt
>===================================================================
>--- files/patch-source__shared_lib__CMakeLists.txt	(rÃ©vision 412412)
>+++ files/patch-source__shared_lib__CMakeLists.txt	(nonexistent)
>@@ -1,21 +0,0 @@
>-commit fc07d9caf22ee609c03b2edd5ca03b17fd5c2098
>-Author: Michael Palimaka <kensington@gentoo.org>
>-Date:   Wed May 13 04:22:45 2015 +1000
>-
>-    Fix build with >=cmake-3.2.
>-
>-    The FindOpenGL module no longer pulls in X11 libraries.
>-
>---- source/shared_lib/CMakeLists.txt
>-+++ 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)
>
>Modification de propriÃ©tÃ©s sur files/patch-source__shared_lib__CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-source_shared__lib_include_platform_sdl_platform__main.h
>===================================================================
>--- files/patch-source_shared__lib_include_platform_sdl_platform__main.h	(nonexistent)
>+++ files/patch-source_shared__lib_include_platform_sdl_platform__main.h	(copie de travail)
>@@ -0,0 +1,11 @@
>+--- 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;
>
>Modification de propriÃ©tÃ©s sur files/patch-source_shared__lib_include_platform_sdl_platform__main.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_shared__lib_sources_platform_common_platform__common.cpp
>===================================================================
>--- files/patch-source_shared__lib_sources_platform_common_platform__common.cpp	(nonexistent)
>+++ files/patch-source_shared__lib_sources_platform_common_platform__common.cpp	(copie de travail)
>@@ -0,0 +1,11 @@
>+--- 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);
>
>Modification de propriÃ©tÃ©s sur files/patch-source_shared__lib_sources_platform_common_platform__common.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_shared__lib_sources_platform_posix_socket.cpp
>===================================================================
>--- files/patch-source_shared__lib_sources_platform_posix_socket.cpp	(rÃ©vision 412412)
>+++ files/patch-source_shared__lib_sources_platform_posix_socket.cpp	(nonexistent)
>@@ -1,14 +0,0 @@
>---- source/shared_lib/sources/platform/posix/socket.cpp.orig	2015-10-14 18:18:16 UTC
>-+++ source/shared_lib/sources/platform/posix/socket.cpp
>-@@ -2554,7 +2554,11 @@ int UPNP_Tools::upnp_init(void *param) {
>- 		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, 2, &upnp_error);
>-+#else
>- 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
>-+#endif
>- 
>- 		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);
>
>Modification de propriÃ©tÃ©s sur files/patch-source_shared__lib_sources_platform_posix_socket.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 412412)
>+++ pkg-plist	(copie de travail)
>@@ -1,11 +1,13 @@
>+bin/megaglest
> %%EDITOR%%bin/megaglest_editor
>-bin/megaglest
>+%%VIEWER%%bin/megaglest_g3dviewer
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
>+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.txt
>+%%EDITOR%%share/pixmaps/editor.ico
>+%%VIEWER%%share/pixmaps/g3dviewer.ico
>+share/pixmaps/megaglest.ico
> %%DATADIR%%/glest.ini
> %%DATADIR%%/glestkeys.ini
> %%DATADIR%%/servers.ini
>-%%PORTDOCS%%%%DOCSDIR%%/README.txt
>-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
>-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
>-share/applications/megaglest.desktop
>-share/icons/megaglest.png

Actions: View | Diff

Attachments on bug 205485: 164451 | 164452 | 164453 | 164599 | 164600 | 164601 | 164625 | 164662 | 164669 | 164696 | 164699 | 164759 | 164824 | 168653 | 168665 | 168666 | 168681 | 168704 | 168890 | 168892 | 168893 | 168901 | 168918 | 168919