Index: head/games/openmw/Makefile =================================================================== --- head/games/openmw/Makefile (revision 446701) +++ head/games/openmw/Makefile (revision 446702) @@ -1,54 +1,53 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= openmw -PORTVERSION= 0.41.0 +PORTVERSION= 0.42.0 DISTVERSIONPREFIX= openmw- -PORTREVISION= 7 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org COMMENT= Unofficial open source engine reimplementation of the game Morrowind LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/docs/license/GPL3.txt LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libBulletCollision.so:devel/bullet \ libboost_thread.so:devel/boost-libs \ libMyGUIEngine.so:x11-toolkits/mygui \ libosg.so:graphics/osg \ libunshield.so:archivers/unshield USE_GITHUB= yes GH_ACCOUNT= OpenMW USES= cmake:outsource compiler:c++14-lang openal pkgconfig USE_GL= gl USE_QT5= qmake_build buildtools_build core gui network opengl \ printsupport widgets USE_SDL= sdl2 USE_XORG= xt 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 \ -DMORROWIND_DATA_FILES="${DATADIR}/data" \ -DOPENMW_RESOURCE_FILES="${DATADIR}/resources" \ -DGLOBAL_DATA_PATH="${PREFIX}/share" post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include Index: head/games/openmw/distinfo =================================================================== --- head/games/openmw/distinfo (revision 446701) +++ head/games/openmw/distinfo (revision 446702) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482715659 -SHA256 (OpenMW-openmw-openmw-0.41.0_GH0.tar.gz) = a3e1c7d060dc461b9b63ceb5d9ec56b90c1bdcbfd37f0c7c7310c38ec7e3e21d -SIZE (OpenMW-openmw-openmw-0.41.0_GH0.tar.gz) = 4884093 +TIMESTAMP = 1501104139 +SHA256 (OpenMW-openmw-openmw-0.42.0_GH0.tar.gz) = f133f7494182cc379cb77f0fb663d2f2d95560a199af8e78d58324da29d6c71a +SIZE (OpenMW-openmw-openmw-0.42.0_GH0.tar.gz) = 4961643 Index: head/games/openmw/files/patch-files_gamecontrollerdb.txt =================================================================== --- head/games/openmw/files/patch-files_gamecontrollerdb.txt (revision 446701) +++ head/games/openmw/files/patch-files_gamecontrollerdb.txt (nonexistent) @@ -1,10 +0,0 @@ ---- files/gamecontrollerdb.txt.orig 2016-08-15 09:27:54 UTC -+++ files/gamecontrollerdb.txt -@@ -150,3 +150,7 @@ AD1B00000000000001F9000000000000,Gamesto - 03000000380700001647000010040000,Mad Catz Wired Xbox 360 Controller,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4, - 030000006f0e00003901000020060000,Afterglow Wired Controller for Xbox One,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,platform:Linux, - 030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,platform:Linux,a:b0,b:b2,x:b1,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7, -+ -+# FreeBSD -+30783030303520283229000000000000,X360 Controller,platform:FreeBSD,x:b13,a:b11,b:b12,y:b14,back:b5,guide:b4,guide:b10,start:b4,dpleft:b2,dpdown:b1,dpright:b3,dpup:b0,leftshoulder:b8,lefttrigger:b9,lefttrigger:a2,rightshoulder:b9,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4, -+30783030303520283029000000000000,X360 Controller,platform:FreeBSD,x:b13,a:b11,b:b12,y:b14,back:b5,guide:b4,guide:b10,start:b4,dpleft:b2,dpdown:b1,dpright:b3,dpup:b0,leftshoulder:b8,lefttrigger:b9,lefttrigger:a2,rightshoulder:b9,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4, Property changes on: head/games/openmw/files/patch-files_gamecontrollerdb.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: head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp =================================================================== --- head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp (revision 446701) +++ head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp (revision 446702) @@ -1,42 +1,17 @@ ---- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2016-08-15 09:27:54 UTC +--- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2017-06-29 22:52:28 UTC +++ apps/openmw/mwinput/inputmanagerimp.cpp -@@ -119,11 +119,12 @@ namespace MWInput +@@ -122,11 +122,12 @@ namespace MWInput SDL_ControllerDeviceEvent evt; evt.which = i; controllerAdded(mFakeDeviceID, evt); - std::cout << "Detected game controller: " << SDL_GameControllerNameForIndex(i) << std::endl; + //Bug in FreeBSD's SDL? SDL_GameControllerNameForIndex returns NULL + std::cout << "Detected game controller" << std::endl; } else { - std::cout << "Detected unusable controller: " << SDL_JoystickNameForIndex(i) << std::endl; + //std::cout << "Detected unusable controller: " << SDL_JoystickNameForIndex(i) << std::endl; } } -@@ -389,6 +390,8 @@ namespace MWInput - { - float xAxis = mInputBinder->getChannel(A_MoveLeftRight)->getValue()*2.0f-1.0f; - float yAxis = mInputBinder->getChannel(A_MoveForwardBackward)->getValue()*2.0f-1.0f; -+ if (mInvertY) -+ yAxis *= -1; - float zAxis = mInputBinder->getChannel(A_LookUpDown)->getValue()*2.0f-1.0f; - const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize(); - -@@ -456,13 +459,13 @@ namespace MWInput - { - triedToMove = true; - mPlayer->setAutoMove (false); -- mPlayer->setForwardBackward (1); -+ mPlayer->setForwardBackward (mInvertY ? -1 : 1); - } - else if (yAxis > .5) - { - triedToMove = true; - mPlayer->setAutoMove (false); -- mPlayer->setForwardBackward (-1); -+ mPlayer->setForwardBackward (mInvertY ? 1 : -1); - } - - else if(mPlayer->getAutoMove())