Attachment 163732 Details for Bug 204948 – openmw.shar

openmw.shar

openmw.shar (text/plain), 22.54 KB, created by Tobias Kortkamp on 2015-12-01 23:58:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2015-12-01 23:58:30 UTC

Size: 22.54 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	openmw
>#	openmw/Makefile
>#	openmw/distinfo
>#	openmw/pkg-plist
>#	openmw/files
>#	openmw/files/patch-components_esm_spellstate.hpp
>#	openmw/files/patch-apps_openmw_crashcatcher.cpp
>#	openmw/files/patch-CMakeLists.txt
>#	openmw/files/patch-components_esm_spellstate.cpp
>#	openmw/files/patch-apps_openmw_engine.cpp
>#	openmw/files/patch-apps_openmw_mwworld_refdata.hpp
>#	openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
>#	openmw/files/patch-components_sceneutil_lightcontroller.cpp
>#	openmw/files/patch-apps_wizard_CMakeLists.txt
>#	openmw/files/patch-apps_openmw_mwworld_worldimp.cpp
>#	openmw/files/patch-files_gamecontrollerdb.txt
>#	openmw/files/patch-apps_openmw_mwworld_weather.cpp
>#	openmw/files/patch-components_files_configurationmanager.hpp
>#	openmw/files/patch-apps_openmw_mwmechanics_spells.hpp
>#	openmw/files/patch-apps_essimporter_converter.hpp
>#	openmw/files/patch-apps_openmw_mwmechanics_spells.cpp
>#	openmw/pkg-message
>#	openmw/pkg-descr
>#
>echo c - openmw
>mkdir -p openmw > /dev/null 2>&1
>echo x - openmw/Makefile
>sed 's/^X//' >openmw/Makefile << '217332b46063e6243c9e9d0300e1164a'
>X# Created by: Tobias Kortkamp <t@tobik.me>
>X# $FreeBSD$
>X
>XPORTNAME=	openmw
>XPORTVERSION=	0.37.0
>XDISTVERSIONPREFIX=	openmw-
>XCATEGORIES=	games
>X
>XMAINTAINER=	t@tobik.me
>XCOMMENT=	Unofficial open source engine reimplementation of the game Morrowind
>X
>XLICENSE=	GPLv3
>XLICENSE_FILE=	${WRKSRC}/docs/license/GPL3.txt
>X
>XLIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
>X		libBulletCollision.so:${PORTSDIR}/devel/bullet \
>X		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
>X		libMyGUIEngine.so:${PORTSDIR}/x11-toolkits/mygui \
>X		libosg.so:${PORTSDIR}/graphics/osg \
>X		libunshield.so:${PORTSDIR}/archivers/unshield
>X
>XBROKEN_FreeBSD_9=	does not build
>X
>XUSE_GITHUB=	yes
>XGH_ACCOUNT=	OpenMW
>X
>XUSES=		cmake:outsource compiler:c++11-lib ninja pkgconfig openal
>XUSE_GL=		gl
>XUSE_QT5=	qmake_build buildtools_build core widgets network opengl
>XUSE_SDL=	sdl2
>X
>XCMAKE_ARGS=	-DCMAKE_BUILD_TYPE=Release \
>X		-DDESIRED_QT_VERSION=5 \
>X		-DBUILD_OPENMW=ON \
>X		-DBUILD_BSATOOL=ON \
>X		-DBUILD_ESMTOOL=ON \
>X		-DBUILD_LAUNCHER=ON \
>X		-DBUILD_MWINIIMPORTER=ON \
>X		-DBUILD_ESSIMPORTER=ON \
>X		-DBUILD_OPENCS=OFF \
>X		-DBUILD_WIZARD=ON \
>X		-DBUILD_WITH_CODE_COVERAGE=OFF \
>X		-DBUILD_UNITTEST=OFF \
>X		-DBUILD_NIFTEST=OFF \
>X		-DBUILD_MYGUI_PLUGIN=OFF \
>X		-DMORROWIND_DATA_FILES=${DATADIR}/data/ \
>X		-DOPENMW_RESOURCE_FILES=${DATADIR}/resources/ \
>X		-DDATADIR=${DATADIR} \
>X		-DGLOBAL_DATA_PATH=${DATADIR}
>X
>Xpost-install:
>X	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
>X
>X.include <bsd.port.mk>
>217332b46063e6243c9e9d0300e1164a
>echo x - openmw/distinfo
>sed 's/^X//' >openmw/distinfo << 'ce5196bf3cc146fd6439a073cbbefa9d'
>XSHA256 (OpenMW-openmw-openmw-0.37.0_GH0.tar.gz) = a2c4dd7926cf156d993e20a3914c1708c9c43d3fb8aae4c17ccf03d50beffc27
>XSIZE (OpenMW-openmw-openmw-0.37.0_GH0.tar.gz) = 4118094
>ce5196bf3cc146fd6439a073cbbefa9d
>echo x - openmw/pkg-plist
>sed 's/^X//' >openmw/pkg-plist << '28a9abe5fb7ff97efe81f6cbd2cb2e06'
>Xbin/bsatool
>Xbin/esmtool
>Xbin/openmw
>Xbin/openmw-essimporter
>Xbin/openmw-iniimporter
>Xbin/openmw-launcher
>Xbin/openmw-wizard
>X%%ETCDIR%%/gamecontrollerdb.txt
>X%%ETCDIR%%/openmw.cfg
>X%%ETCDIR%%/settings-default.cfg
>X%%ETCDIR%%/version
>Xshare/appdata/openmw.appdata.xml
>Xshare/applications/openmw.desktop
>X%%DATADIR%%/resources/defaultfilters
>X%%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf
>X%%DATADIR%%/resources/mygui/OpenMWResourcePlugin.xml
>X%%DATADIR%%/resources/mygui/core.skin
>X%%DATADIR%%/resources/mygui/core.xml
>X%%DATADIR%%/resources/mygui/core_layouteditor.xml
>X%%DATADIR%%/resources/mygui/openmw.png
>X%%DATADIR%%/resources/mygui/openmw_alchemy_window.layout
>X%%DATADIR%%/resources/mygui/openmw_book.layout
>X%%DATADIR%%/resources/mygui/openmw_box.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_button.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_chargen_birth.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_class.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_class_description.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_create_class.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_generate_class_result.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_race.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_review.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_select_attribute.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_select_skill.layout
>X%%DATADIR%%/resources/mygui/openmw_chargen_select_specialization.layout
>X%%DATADIR%%/resources/mygui/openmw_companion_window.layout
>X%%DATADIR%%/resources/mygui/openmw_confirmation_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_console.layout
>X%%DATADIR%%/resources/mygui/openmw_console.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_container_window.layout
>X%%DATADIR%%/resources/mygui/openmw_count_window.layout
>X%%DATADIR%%/resources/mygui/openmw_debug_window.layout
>X%%DATADIR%%/resources/mygui/openmw_debug_window.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_dialogue_window.layout
>X%%DATADIR%%/resources/mygui/openmw_dialogue_window.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_edit.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_edit_effect.layout
>X%%DATADIR%%/resources/mygui/openmw_edit_note.layout
>X%%DATADIR%%/resources/mygui/openmw_enchanting_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_font.xml
>X%%DATADIR%%/resources/mygui/openmw_hud.layout
>X%%DATADIR%%/resources/mygui/openmw_hud_box.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_hud_energybar.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_infobox.layout
>X%%DATADIR%%/resources/mygui/openmw_interactive_messagebox.layout
>X%%DATADIR%%/resources/mygui/openmw_inventory_window.layout
>X%%DATADIR%%/resources/mygui/openmw_itemselection_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_jail_screen.layout
>X%%DATADIR%%/resources/mygui/openmw_journal.layout
>X%%DATADIR%%/resources/mygui/openmw_journal.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_layers.xml
>X%%DATADIR%%/resources/mygui/openmw_levelup_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_list.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_loading_screen.layout
>X%%DATADIR%%/resources/mygui/openmw_magicselection_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_mainmenu.layout
>X%%DATADIR%%/resources/mygui/openmw_mainmenu.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_map_window.layout
>X%%DATADIR%%/resources/mygui/openmw_map_window.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_merchantrepair.layout
>X%%DATADIR%%/resources/mygui/openmw_messagebox.layout
>X%%DATADIR%%/resources/mygui/openmw_persuasion_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_pointer.xml
>X%%DATADIR%%/resources/mygui/openmw_progress.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_quickkeys_menu.layout
>X%%DATADIR%%/resources/mygui/openmw_quickkeys_menu_assign.layout
>X%%DATADIR%%/resources/mygui/openmw_recharge_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_repair.layout
>X%%DATADIR%%/resources/mygui/openmw_resources.xml
>X%%DATADIR%%/resources/mygui/openmw_savegame_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_screen_fader.layout
>X%%DATADIR%%/resources/mygui/openmw_screen_fader_hit.layout
>X%%DATADIR%%/resources/mygui/openmw_scroll.layout
>X%%DATADIR%%/resources/mygui/openmw_scroll.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_settings.xml
>X%%DATADIR%%/resources/mygui/openmw_settings_window.layout
>X%%DATADIR%%/resources/mygui/openmw_spell_buying_window.layout
>X%%DATADIR%%/resources/mygui/openmw_spell_window.layout
>X%%DATADIR%%/resources/mygui/openmw_spellcreation_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_stats_window.layout
>X%%DATADIR%%/resources/mygui/openmw_text.skin.xml
>X%%DATADIR%%/resources/mygui/openmw_text_input.layout
>X%%DATADIR%%/resources/mygui/openmw_tooltips.layout
>X%%DATADIR%%/resources/mygui/openmw_trade_window.layout
>X%%DATADIR%%/resources/mygui/openmw_trainingwindow.layout
>X%%DATADIR%%/resources/mygui/openmw_travel_window.layout
>X%%DATADIR%%/resources/mygui/openmw_wait_dialog.layout
>X%%DATADIR%%/resources/mygui/openmw_wait_dialog_progressbar.layout
>X%%DATADIR%%/resources/mygui/openmw_windows.skin.xml
>X%%DATADIR%%/resources/mygui/skins.xml
>X%%DATADIR%%/resources/shaders/water_fragment.glsl
>X%%DATADIR%%/resources/shaders/water_nm.png
>X%%DATADIR%%/resources/shaders/water_vertex.glsl
>X%%DATADIR%%/resources/version
>Xshare/pixmaps/openmw.png
>X@dir %%DATADIR%%/data
>28a9abe5fb7ff97efe81f6cbd2cb2e06
>echo c - openmw/files
>mkdir -p openmw/files > /dev/null 2>&1
>echo x - openmw/files/patch-components_esm_spellstate.hpp
>sed 's/^X//' >openmw/files/patch-components_esm_spellstate.hpp << 'a1438a2d2049b75500226f3628acdeb9'
>X--- components/esm/spellstate.hpp.orig	2015-11-24 02:42:35 UTC
>X+++ components/esm/spellstate.hpp
>X@@ -28,7 +28,7 @@ namespace ESM
>X             float mMagnitude;
>X         };
>X 
>X-        typedef std::map<std::string, std::map<const int, float> > TContainer;
>X+        typedef std::map<std::string, std::map<int, float> > TContainer;
>X         TContainer mSpells;
>X 
>X         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;
>a1438a2d2049b75500226f3628acdeb9
>echo x - openmw/files/patch-apps_openmw_crashcatcher.cpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_crashcatcher.cpp << '0a1fcf9bbbcc355e8fff6db7428dd2d1'
>X--- apps/openmw/crashcatcher.cpp.orig	2015-11-24 02:42:35 UTC
>X+++ apps/openmw/crashcatcher.cpp
>X@@ -24,7 +24,7 @@
>X #ifndef PR_SET_PTRACER
>X #define PR_SET_PTRACER 0x59616d61
>X #endif
>X-#elif defined (__APPLE__)
>X+#elif defined (__APPLE__) || defined (__FreeBSD__)
>X #include <signal.h>
>X #endif
>X 
>0a1fcf9bbbcc355e8fff6db7428dd2d1
>echo x - openmw/files/patch-CMakeLists.txt
>sed 's/^X//' >openmw/files/patch-CMakeLists.txt << '3c5ac08141f481d9b4de9b9bdae262fe'
>X--- CMakeLists.txt.orig	2015-11-22 18:54:17 UTC
>X+++ CMakeLists.txt
>X@@ -191,7 +191,7 @@ IF(BOOST_STATIC)
>X     set(Boost_USE_STATIC_LIBS   ON)
>X endif()
>X 
>X-find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgQt osgUtil osgFX)
>X+find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX)
>X include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
>X 
>X if(OSG_STATIC)
>3c5ac08141f481d9b4de9b9bdae262fe
>echo x - openmw/files/patch-components_esm_spellstate.cpp
>sed 's/^X//' >openmw/files/patch-components_esm_spellstate.cpp << '9fc169ab91ca4497854594d215a0bf1f'
>X--- components/esm/spellstate.cpp.orig	2015-11-24 02:42:35 UTC
>X+++ components/esm/spellstate.cpp
>X@@ -12,7 +12,7 @@ namespace ESM
>X         {
>X             std::string id = esm.getHString();
>X 
>X-            std::map<const int, float> random;
>X+            std::map<int, float> random;
>X             while (esm.isNextSub("INDX"))
>X             {
>X                 int index;
>X@@ -73,8 +73,8 @@ namespace ESM
>X         {
>X             esm.writeHNString("SPEL", it->first);
>X 
>X-            const std::map<const int, float>& random = it->second;
>X-            for (std::map<const int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
>X+            const std::map<int, float>& random = it->second;
>X+            for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
>X             {
>X                 esm.writeHNT("INDX", rIt->first);
>X                 esm.writeHNT("RAND", rIt->second);
>9fc169ab91ca4497854594d215a0bf1f
>echo x - openmw/files/patch-apps_openmw_engine.cpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_engine.cpp << 'a51b98ed723445f5fad7b6a086e71ee2'
>X--- apps/openmw/engine.cpp.orig	2015-11-24 02:42:35 UTC
>X+++ apps/openmw/engine.cpp
>X@@ -473,8 +473,9 @@ void OMW::Engine::prepareEngine (Setting
>X     }
>X 
>X     // find correct path to the game controller bindings
>X-    const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.cfg";
>X-    const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.cfg";
>X+    const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.txt";
>X+    const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt";
>X+
>X     std::string gameControllerdb;
>X     if (boost::filesystem::exists(localdefault))
>X         gameControllerdb = localdefault;
>a51b98ed723445f5fad7b6a086e71ee2
>echo x - openmw/files/patch-apps_openmw_mwworld_refdata.hpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_mwworld_refdata.hpp << '4ca5a4e562e2cdfa35d0e764bb69368b'
>X--- apps/openmw/mwworld/refdata.hpp.orig	2015-11-22 18:54:17 UTC
>X+++ apps/openmw/mwworld/refdata.hpp
>X@@ -5,6 +5,7 @@
>X 
>X #include "../mwscript/locals.hpp"
>X 
>X+#include <string>
>X #include <osg/Vec3f>
>X 
>X namespace osg
>4ca5a4e562e2cdfa35d0e764bb69368b
>echo x - openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp << '4ad309a6d2abe813bab2213e2cc82b4c'
>X--- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2015-11-22 18:54:17 UTC
>X+++ apps/openmw/mwinput/inputmanagerimp.cpp
>X@@ -374,6 +374,8 @@ namespace MWInput
>X             {
>X                 float xAxis = mInputBinder->getChannel(A_MoveLeftRight)->getValue()*2.0f-1.0f;
>X                 float yAxis = mInputBinder->getChannel(A_MoveForwardBackward)->getValue()*2.0f-1.0f;
>X+                if (mInvertY)
>X+                    yAxis *= -1;
>X                 float zAxis = mInputBinder->getChannel(A_LookUpDown)->getValue()*2.0f-1.0f;
>X                 const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
>X 
>X@@ -441,13 +443,13 @@ namespace MWInput
>X                     {
>X                         triedToMove = true;
>X                         mPlayer->setAutoMove (false);
>X-                        mPlayer->setForwardBackward (1);
>X+                        mPlayer->setForwardBackward (mInvertY ? -1 : 1);
>X                     }
>X                     else if (yAxis > .5)
>X                     {
>X                         triedToMove = true;
>X                         mPlayer->setAutoMove (false);
>X-                        mPlayer->setForwardBackward (-1);
>X+                        mPlayer->setForwardBackward (mInvertY ? 1 : -1);
>X                     }
>X 
>X                     else if(mPlayer->getAutoMove())
>4ad309a6d2abe813bab2213e2cc82b4c
>echo x - openmw/files/patch-components_sceneutil_lightcontroller.cpp
>sed 's/^X//' >openmw/files/patch-components_sceneutil_lightcontroller.cpp << '6a4740fe7475211b51338c568049ad5a'
>X--- components/sceneutil/lightcontroller.cpp.orig	2015-11-24 02:42:35 UTC
>X+++ components/sceneutil/lightcontroller.cpp
>X@@ -2,6 +2,7 @@
>X 
>X #include <cmath>
>X 
>X+#include <osg/observer_ptr>
>X #include <osg/NodeVisitor>
>X 
>X #include <components/sceneutil/lightmanager.hpp>
>6a4740fe7475211b51338c568049ad5a
>echo x - openmw/files/patch-apps_wizard_CMakeLists.txt
>sed 's/^X//' >openmw/files/patch-apps_wizard_CMakeLists.txt << 'b0f73f995a87c83a03713c50ec768883'
>X--- apps/wizard/CMakeLists.txt.orig	2015-11-24 02:42:35 UTC
>X+++ apps/wizard/CMakeLists.txt
>X@@ -150,6 +150,7 @@ endif()
>X 
>X # Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
>X if (UNIX AND NOT APPLE)
>X-target_link_libraries(openmw-wizard dl Xt)
>X+target_link_libraries(openmw-wizard Xt)
>X endif()
>X 
>X+target_link_libraries(openmw-wizard boost_program_options)
>b0f73f995a87c83a03713c50ec768883
>echo x - openmw/files/patch-apps_openmw_mwworld_worldimp.cpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_mwworld_worldimp.cpp << 'cd3e2268e247bb3e62d8504e4fb04281'
>X--- apps/openmw/mwworld/worldimp.cpp.orig	2015-11-22 18:54:17 UTC
>X+++ apps/openmw/mwworld/worldimp.cpp
>X@@ -108,7 +108,7 @@ namespace MWWorld
>X         }
>X 
>X         private:
>X-          typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
>X+          typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
>X           LoadersContainer mLoaders;
>X     };
>X 
>cd3e2268e247bb3e62d8504e4fb04281
>echo x - openmw/files/patch-files_gamecontrollerdb.txt
>sed 's/^X//' >openmw/files/patch-files_gamecontrollerdb.txt << '0d63969dcbd0a970abfdfc163312af29'
>X--- files/gamecontrollerdb.txt.orig	2015-11-24 02:42:35 UTC
>X+++ files/gamecontrollerdb.txt
>X@@ -99,3 +99,7 @@ ff113133000000000000504944564944,SVEN X-
>X 05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,
>X 05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,
>X 030000008916000001fd000024010000,Razer Onza Classic Edition,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8tart:b7,dpleft:b11,dpdown:b14,dpright:b12,dpup:b13,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
>X+
>X+# FreeBSD
>X+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,
>X+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,
>0d63969dcbd0a970abfdfc163312af29
>echo x - openmw/files/patch-apps_openmw_mwworld_weather.cpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_mwworld_weather.cpp << '424d088fbd9e7b5021a723ad146594ff'
>X--- apps/openmw/mwworld/weather.cpp.orig	2015-11-22 18:54:17 UTC
>X+++ apps/openmw/mwworld/weather.cpp
>X@@ -95,9 +95,10 @@ T TimeOfDayInterpolator<T>::getValue(con
>X }
>X 
>X 
>X-
>X-template class TimeOfDayInterpolator<float>;
>X-template class TimeOfDayInterpolator<osg::Vec4f>;
>X+namespace MWWorld {
>X+    template class TimeOfDayInterpolator<float>;
>X+    template class TimeOfDayInterpolator<osg::Vec4f>;
>X+};
>X 
>X Weather::Weather(const std::string& name,
>X                  const MWWorld::Fallback& fallback,
>X@@ -1133,4 +1134,3 @@ inline void WeatherManager::calculateTra
>X         mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
>X     }
>X }
>X-
>424d088fbd9e7b5021a723ad146594ff
>echo x - openmw/files/patch-components_files_configurationmanager.hpp
>sed 's/^X//' >openmw/files/patch-components_files_configurationmanager.hpp << '57a8d70eff513a64c1c6af18084258e5'
>X--- components/files/configurationmanager.hpp.orig	2015-11-24 02:42:35 UTC
>X+++ components/files/configurationmanager.hpp
>X@@ -52,11 +52,7 @@ struct ConfigurationManager
>X         typedef Files::FixedPath<> FixedPathType;
>X 
>X         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
>X-    #if defined HAVE_UNORDERED_MAP
>X         typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
>X-    #else
>X-        typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
>X-    #endif
>X 
>X         void loadConfig(const boost::filesystem::path& path,
>X             boost::program_options::variables_map& variables,
>57a8d70eff513a64c1c6af18084258e5
>echo x - openmw/files/patch-apps_openmw_mwmechanics_spells.hpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_mwmechanics_spells.hpp << '01de23cf6e5db748822bb1d0387e93c2'
>X--- apps/openmw/mwmechanics/spells.hpp.orig	2015-11-24 02:42:35 UTC
>X+++ apps/openmw/mwmechanics/spells.hpp
>X@@ -31,7 +31,7 @@ namespace MWMechanics
>X     {
>X         public:
>X 
>X-            typedef std::map<std::string, std::map<const int, float> > TContainer; // ID, <effect index, normalised random magnitude>
>X+            typedef std::map<std::string, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
>X             typedef TContainer::const_iterator TIterator;
>X 
>X             struct CorprusStats
>01de23cf6e5db748822bb1d0387e93c2
>echo x - openmw/files/patch-apps_essimporter_converter.hpp
>sed 's/^X//' >openmw/files/patch-apps_essimporter_converter.hpp << 'a8473583cf3789c17b33d72c52603692'
>X--- apps/essimporter/converter.hpp.orig	2015-11-22 18:54:17 UTC
>X+++ apps/essimporter/converter.hpp
>X@@ -118,7 +118,7 @@ public:
>X         {
>X             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
>X             mContext->mPlayerBase = npc;
>X-            std::map<const int, float> empty;
>X+            std::map<int, float> empty;
>X             // FIXME: player start spells and birthsign spells aren't listed here,
>X             // need to fix openmw to account for this
>X             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
>a8473583cf3789c17b33d72c52603692
>echo x - openmw/files/patch-apps_openmw_mwmechanics_spells.cpp
>sed 's/^X//' >openmw/files/patch-apps_openmw_mwmechanics_spells.cpp << 'ecbdbb447c1f9a34edddfa5aca536a64'
>X--- apps/openmw/mwmechanics/spells.cpp.orig	2015-11-24 02:42:35 UTC
>X+++ apps/openmw/mwmechanics/spells.cpp
>X@@ -29,7 +29,7 @@ namespace MWMechanics
>X     {
>X         if (mSpells.find (spell->mId)==mSpells.end())
>X         {
>X-            std::map<const int, float> random;
>X+            std::map<int, float> random;
>X 
>X             // Determine the random magnitudes (unless this is a castable spell, in which case
>X             // they will be determined when the spell is cast)
>ecbdbb447c1f9a34edddfa5aca536a64
>echo x - openmw/pkg-message
>sed 's/^X//' >openmw/pkg-message << '0f9a7650d153de9e12bc73eab68461d8'
>XOpenMW requires a set of Morrowind data files.  If you don't own a
>Xcopy of Morrowind, you can buy and download one on e.g. Steam or GOG.
>XSteam can be installed on FreeBSD/amd64 via emulators/i386-wine or on
>XFreeBSD/i386 via emulators/wine.  GOG is completely accessible via your
>Xweb browser and you can simply download your purchase (making this the
>Xeasiest of the two options).
>X
>XOnce you have a set of Morrowind data files run openmw-launcher next.
>XAnswer YES to the question if you want to run the installation wizard.
>XFollow the wizard's instruction to select your Morrowind data files.
>0f9a7650d153de9e12bc73eab68461d8
>echo x - openmw/pkg-descr
>sed 's/^X//' >openmw/pkg-descr << 'da6de197679c6001e9d318c538157668'
>XOpenMW is a recreation of the engine for the popular role-playing game
>XMorrowind by Bethesda Softworks.  You need to own and install the
>Xoriginal game for OpenMW to work.
>X
>XWWW: https://openmw.org/
>da6de197679c6001e9d318c538157668
>exit
>

Actions: View

Attachments on bug 204948: 163727 | 163728 | 163731 | 163732