svn commit: r496556 - in head/games/openmw: . files

[Tobias Kortkamp]

Author: tobik
Date: Fri Mar 22 11:56:26 2019
New Revision: 496556
URL: https://svnweb.freebsd.org/changeset/ports/496556

Log:
  games/openmw: Update to 0.45.0
  
  - Pet portlint and clean up port a bit while here
  
  Changes:	https://github.com/OpenMW/openmw/releases/tag/openmw-0.45.0

Modified:
  head/games/openmw/Makefile
  head/games/openmw/distinfo
  head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
  head/games/openmw/pkg-plist

Modified: head/games/openmw/Makefile
==============================================================================
--- head/games/openmw/Makefile	Fri Mar 22 10:09:18 2019	(r496555)
+++ head/games/openmw/Makefile	Fri Mar 22 11:56:26 2019	(r496556)
@@ -3,10 +3,12 @@
 
 PORTNAME=	openmw
 DISTVERSIONPREFIX=	openmw-
-DISTVERSION=	0.44.0
-PORTREVISION=	6
+DISTVERSION=	0.45.0
 CATEGORIES=	games
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	a78d98df273e266c05c73837a5961fbf6a875ccf.patch:-p1
+
 MAINTAINER=	tobik at FreeBSD.org
 COMMENT=	Unofficial open source engine reimplementation of the game Morrowind
 
@@ -14,39 +16,24 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
-		libBulletCollision.so:devel/bullet \
 		libboost_thread.so:devel/boost-libs \
+		libBulletCollision.so:devel/bullet \
 		libMyGUIEngine.so:x11-toolkits/mygui \
 		libosg.so:graphics/osg \
 		libunshield.so:archivers/unshield
 
+USES=		cmake compiler:c++14-lang gl openal pkgconfig qt:5 sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenMW
-
-USES=		cmake compiler:c++14-lang openal pkgconfig qt:5
 USE_GL=		gl
-USE_QT=		qmake_build buildtools_build core gui network opengl \
-		printsupport widgets
 USE_SDL=	sdl2
-USE_XORG=	xt
+USE_QT=		core gui network opengl printsupport widgets buildtools_build \
+		qmake_build
 
-CMAKE_ARGS=	-DCMAKE_BUILD_TYPE=Release \
-		-DDESIRED_QT_VERSION=5 \
-		-DBUILD_OPENMW=ON \
-		-DBUILD_BSATOOL=ON \
-		-DBUILD_ESMTOOL=ON \
-		-DBUILD_LAUNCHER=ON \
-		-DBUILD_MWINIIMPORTER=ON \
-		-DBUILD_ESSIMPORTER=ON \
-		-DBUILD_OPENCS=ON \
-		-DBUILD_WIZARD=ON \
-		-DBUILD_WITH_CODE_COVERAGE=OFF \
-		-DBUILD_UNITTEST=OFF \
-		-DBUILD_NIFTEST=OFF \
-		-DBUILD_MYGUI_PLUGIN=OFF \
+CMAKE_ARGS=	-DDESIRED_QT_VERSION=5 \
+		-DGLOBAL_DATA_PATH="${PREFIX}/share" \
 		-DMORROWIND_DATA_FILES="${DATADIR}/data" \
-		-DOPENMW_RESOURCE_FILES="${DATADIR}/resources" \
-		-DGLOBAL_DATA_PATH="${PREFIX}/share"
+		-DOPENMW_RESOURCE_FILES="${DATADIR}/resources"
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

Modified: head/games/openmw/distinfo
==============================================================================
--- head/games/openmw/distinfo	Fri Mar 22 10:09:18 2019	(r496555)
+++ head/games/openmw/distinfo	Fri Mar 22 11:56:26 2019	(r496556)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1532423346
-SHA256 (OpenMW-openmw-openmw-0.44.0_GH0.tar.gz) = 9e7db99dd3e1434b2e32e9e61ae5a8fb516a69bb6880fb2856c09f2c9ca8cf0d
-SIZE (OpenMW-openmw-openmw-0.44.0_GH0.tar.gz) = 4976422
+TIMESTAMP = 1553179501
+SHA256 (OpenMW-openmw-openmw-0.45.0_GH0.tar.gz) = b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64
+SIZE (OpenMW-openmw-openmw-0.45.0_GH0.tar.gz) = 4711103
+SHA256 (a78d98df273e266c05c73837a5961fbf6a875ccf.patch) = 8699417cfc00b305dccaba11f97e8462b57323990001a0409d4c5f8b44d15f86
+SIZE (a78d98df273e266c05c73837a5961fbf6a875ccf.patch) = 4879

Modified: head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
==============================================================================
--- head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp	Fri Mar 22 10:09:18 2019	(r496555)
+++ head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp	Fri Mar 22 11:56:26 2019	(r496556)
@@ -1,17 +1,17 @@
---- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2017-06-29 22:52:28 UTC
+--- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2019-03-10 10:50:29 UTC
 +++ apps/openmw/mwinput/inputmanagerimp.cpp
-@@ -122,11 +122,12 @@ namespace MWInput
+@@ -121,11 +121,12 @@ namespace MWInput
                  SDL_ControllerDeviceEvent evt;
                  evt.which = i;
                  controllerAdded(mFakeDeviceID, evt);
--                std::cout << "Detected game controller: " << SDL_GameControllerNameForIndex(i) << std::endl;
+-                Log(Debug::Info) << "Detected game controller: " << SDL_GameControllerNameForIndex(i);
 +                //Bug in FreeBSD's SDL? SDL_GameControllerNameForIndex returns NULL
-+                std::cout << "Detected game controller" << std::endl;
++                Log(Debug::Info) << "Detected game controller: " << i;
              }
              else
              {
--                std::cout << "Detected unusable controller: " << SDL_JoystickNameForIndex(i) << std::endl;
-+                //std::cout << "Detected unusable controller: " << SDL_JoystickNameForIndex(i) << std::endl;
+-                Log(Debug::Info) << "Detected unusable controller: " << SDL_JoystickNameForIndex(i);
++                Log(Debug::Info) << "Detected unusable controller: " << i;
              }
          }
  

Modified: head/games/openmw/pkg-plist
==============================================================================
--- head/games/openmw/pkg-plist	Fri Mar 22 10:09:18 2019	(r496555)
+++ head/games/openmw/pkg-plist	Fri Mar 22 11:56:26 2019	(r496556)
@@ -107,6 +107,8 @@ share/metainfo/openmw.appdata.xml
 %%DATADIR%%/resources/shaders/objects_fragment.glsl
 %%DATADIR%%/resources/shaders/objects_vertex.glsl
 %%DATADIR%%/resources/shaders/parallax.glsl
+%%DATADIR%%/resources/shaders/s360_fragment.glsl
+%%DATADIR%%/resources/shaders/s360_vertex.glsl
 %%DATADIR%%/resources/shaders/terrain_fragment.glsl
 %%DATADIR%%/resources/shaders/terrain_vertex.glsl
 %%DATADIR%%/resources/shaders/water_fragment.glsl