svn commit: r397703 - in head/games/wxlauncher: . files
Jan Beich
jbeich at FreeBSD.org
Thu Sep 24 18:10:06 UTC 2015
Author: jbeich
Date: Thu Sep 24 18:10:04 2015
New Revision: 397703
URL: https://svnweb.freebsd.org/changeset/ports/397703
Log:
games/wxlauncher: update to 0.10.0
- Change GH_ACCOUNT, GH_PROJECT and WWW to new GitHub address
- Add pkgconfig to USES
- Change USE_SDL value to sdl2, because of new dependency
- Explicitly define used wxWidgets version through WXVER CMake's define
- Adapt patches for new version
- Remove WX_UNICODE define, after ports r397085 changes
Changes: https://github.com/scp-fs2open/wxLauncher/compare/release-0.9.6...release-0.10.0
PR: 202939
Submitted by: lightside <lightside at gmx.com> (maintainer)
Modified:
head/games/wxlauncher/Makefile (contents, props changed)
head/games/wxlauncher/distinfo (contents, props changed)
head/games/wxlauncher/files/patch-code_apis_JoystickManager.cpp (contents, props changed)
head/games/wxlauncher/pkg-descr (contents, props changed)
Modified: head/games/wxlauncher/Makefile
==============================================================================
--- head/games/wxlauncher/Makefile Thu Sep 24 18:09:31 2015 (r397702)
+++ head/games/wxlauncher/Makefile Thu Sep 24 18:10:04 2015 (r397703)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= wxlauncher
-PORTVERSION= 0.9.6
+PORTVERSION= 0.10.0
DISTVERSIONPREFIX= release-
-PORTREVISION= 2
CATEGORIES= games
MAINTAINER= lightside at gmx.com
@@ -17,11 +16,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ma
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
USE_GITHUB= yes
-GH_ACCOUNT= wxLauncher
+GH_ACCOUNT= scp-fs2open
+GH_PROJECT= wxLauncher
-USES= cmake:outsource openal python:2,build
-USE_SDL= sdl
-WX_UNICODE= yes
+USES= cmake:outsource openal pkgconfig python:2,build
+USE_SDL= sdl2
CMAKE_ARGS+= -DRESOURCES_PATH:STRING="${DATADIR}"
PORTDATA= *
@@ -45,20 +44,13 @@ WX3_CXXFLAGS= -std=c++11
WX3_USES= compiler:c++11-lib
WX3_USE= WX=3.0+
WX3_USE_OFF= WX=2.8
-
-.include <bsd.port.options.mk>
-
-# Allow to build with using concrete wxWidgets version
-.if ${PORT_OPTIONS:MWX3}
-SED_RE_WX3= wxWidgets 2\./,+1d
-.else
-SED_RE_WX3= NOT wxWidgets_FOUND/,+3d
-.endif
+WX3_CMAKE_ON= -DWXVER:STRING="3.0"
+WX3_CMAKE_OFF= -DWXVER:STRING="2.8"
post-patch: .SILENT
# Change version_strings.cpp.in file, based on GH_TAGNAME, without using git
${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \
- /version_strings.cpp will be generated/d ; /${SED_RE_WX3}' \
+ /version_strings.cpp will be generated/d' \
${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \
${WRKSRC}/code/global/version_strings.cpp.in
Modified: head/games/wxlauncher/distinfo
==============================================================================
--- head/games/wxlauncher/distinfo Thu Sep 24 18:09:31 2015 (r397702)
+++ head/games/wxlauncher/distinfo Thu Sep 24 18:10:04 2015 (r397703)
@@ -1,2 +1,2 @@
-SHA256 (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 24a90722a63ee8a711e268bd78535bbb1ec99a2b27fd7c3750517d07424b6979
-SIZE (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 893799
+SHA256 (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = b47c88be4d7cc6582a7b7816cf8dc9fe1502947f3bdd509bc0b4b6fcf06a8bc0
+SIZE (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = 2434207
Modified: head/games/wxlauncher/files/patch-code_apis_JoystickManager.cpp
==============================================================================
--- head/games/wxlauncher/files/patch-code_apis_JoystickManager.cpp Thu Sep 24 18:09:31 2015 (r397702)
+++ head/games/wxlauncher/files/patch-code_apis_JoystickManager.cpp Thu Sep 24 18:10:04 2015 (r397703)
@@ -1,13 +1,13 @@
---- code/apis/JoystickManager.cpp.orig 2015-04-11 22:15:55 UTC
+--- code/apis/JoystickManager.cpp.orig 2015-08-26 04:54:06 UTC
+++ code/apis/JoystickManager.cpp
-@@ -65,8 +65,10 @@ bool JoyMan::IsInitialized() {
+@@ -84,9 +84,9 @@ bool JoyMan::IsInitialized() {
+ \sa JoyMan::WasCompiledIn()
*/
- bool JoyMan::Initialize() {
- if ( JoyMan::IsInitialized() ) {
+ bool JoyMan::Initialize(ApiType apiType) {
+#if USE_JOYSTICK
- wxLogDebug(_T("JoyMan already initialized with %d joysticks"),
- joysticks.Count());
-+#endif
- return true;
- }
+ currentApi = apiType;
+-#if USE_JOYSTICK
+ if ( JoyMan::IsInitialized() ) {
+ wxLogDebug(_T("JoyMan already initialized"));
+ return true;
Modified: head/games/wxlauncher/pkg-descr
==============================================================================
--- head/games/wxlauncher/pkg-descr Thu Sep 24 18:09:31 2015 (r397702)
+++ head/games/wxlauncher/pkg-descr Thu Sep 24 18:10:04 2015 (r397703)
@@ -5,4 +5,4 @@ community looking for an easy way to con
to those looking for an easy way to find and get updates to their Freespace 2
MODs and TCs.
-WWW: http://github.com/wxLauncher/wxlauncher
+WWW: http://github.com/scp-fs2open/wxLauncher
More information about the svn-ports-all
mailing list