Index: head/games/openmw/Makefile =================================================================== --- head/games/openmw/Makefile (revision 496555) +++ head/games/openmw/Makefile (revision 496556) @@ -1,54 +1,41 @@ # Created by: Tobias Kortkamp # $FreeBSD$ 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@FreeBSD.org COMMENT= Unofficial open source engine reimplementation of the game Morrowind 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/* .include Index: head/games/openmw/distinfo =================================================================== --- head/games/openmw/distinfo (revision 496555) +++ head/games/openmw/distinfo (revision 496556) @@ -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 Index: head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp =================================================================== --- head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp (revision 496555) +++ head/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp (revision 496556) @@ -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; } } Index: head/games/openmw/pkg-plist =================================================================== --- head/games/openmw/pkg-plist (revision 496555) +++ head/games/openmw/pkg-plist (revision 496556) @@ -1,118 +1,120 @@ bin/bsatool bin/esmtool bin/openmw bin/openmw-cs bin/openmw-essimporter bin/openmw-iniimporter bin/openmw-launcher bin/openmw-wizard %%ETCDIR%%/gamecontrollerdb.txt %%ETCDIR%%/gamecontrollerdb_204.txt %%ETCDIR%%/gamecontrollerdb_205.txt %%ETCDIR%%/openmw-cs.cfg %%ETCDIR%%/openmw.cfg %%ETCDIR%%/settings-default.cfg %%ETCDIR%%/version share/applications/openmw-cs.desktop share/applications/openmw.desktop share/metainfo/openmw.appdata.xml %%DATADIR%%/resources/defaultfilters %%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf %%DATADIR%%/resources/mygui/OpenMWResourcePlugin.xml %%DATADIR%%/resources/mygui/core.skin %%DATADIR%%/resources/mygui/core.xml %%DATADIR%%/resources/mygui/core_layouteditor.xml %%DATADIR%%/resources/mygui/openmw.png %%DATADIR%%/resources/mygui/openmw_alchemy_window.layout %%DATADIR%%/resources/mygui/openmw_book.layout %%DATADIR%%/resources/mygui/openmw_box.skin.xml %%DATADIR%%/resources/mygui/openmw_button.skin.xml %%DATADIR%%/resources/mygui/openmw_chargen_birth.layout %%DATADIR%%/resources/mygui/openmw_chargen_class.layout %%DATADIR%%/resources/mygui/openmw_chargen_class_description.layout %%DATADIR%%/resources/mygui/openmw_chargen_create_class.layout %%DATADIR%%/resources/mygui/openmw_chargen_generate_class_result.layout %%DATADIR%%/resources/mygui/openmw_chargen_race.layout %%DATADIR%%/resources/mygui/openmw_chargen_review.layout %%DATADIR%%/resources/mygui/openmw_chargen_select_attribute.layout %%DATADIR%%/resources/mygui/openmw_chargen_select_skill.layout %%DATADIR%%/resources/mygui/openmw_chargen_select_specialization.layout %%DATADIR%%/resources/mygui/openmw_companion_window.layout %%DATADIR%%/resources/mygui/openmw_confirmation_dialog.layout %%DATADIR%%/resources/mygui/openmw_console.layout %%DATADIR%%/resources/mygui/openmw_console.skin.xml %%DATADIR%%/resources/mygui/openmw_container_window.layout %%DATADIR%%/resources/mygui/openmw_count_window.layout %%DATADIR%%/resources/mygui/openmw_debug_window.layout %%DATADIR%%/resources/mygui/openmw_debug_window.skin.xml %%DATADIR%%/resources/mygui/openmw_dialogue_window.layout %%DATADIR%%/resources/mygui/openmw_dialogue_window.skin.xml %%DATADIR%%/resources/mygui/openmw_edit.skin.xml %%DATADIR%%/resources/mygui/openmw_edit_effect.layout %%DATADIR%%/resources/mygui/openmw_edit_note.layout %%DATADIR%%/resources/mygui/openmw_enchanting_dialog.layout %%DATADIR%%/resources/mygui/openmw_font.xml %%DATADIR%%/resources/mygui/openmw_hud.layout %%DATADIR%%/resources/mygui/openmw_hud_box.skin.xml %%DATADIR%%/resources/mygui/openmw_hud_energybar.skin.xml %%DATADIR%%/resources/mygui/openmw_infobox.layout %%DATADIR%%/resources/mygui/openmw_interactive_messagebox.layout %%DATADIR%%/resources/mygui/openmw_interactive_messagebox_notransp.layout %%DATADIR%%/resources/mygui/openmw_inventory_window.layout %%DATADIR%%/resources/mygui/openmw_itemselection_dialog.layout %%DATADIR%%/resources/mygui/openmw_jail_screen.layout %%DATADIR%%/resources/mygui/openmw_journal.layout %%DATADIR%%/resources/mygui/openmw_journal.skin.xml %%DATADIR%%/resources/mygui/openmw_layers.xml %%DATADIR%%/resources/mygui/openmw_levelup_dialog.layout %%DATADIR%%/resources/mygui/openmw_list.skin.xml %%DATADIR%%/resources/mygui/openmw_loading_screen.layout %%DATADIR%%/resources/mygui/openmw_magicselection_dialog.layout %%DATADIR%%/resources/mygui/openmw_mainmenu.layout %%DATADIR%%/resources/mygui/openmw_mainmenu.skin.xml %%DATADIR%%/resources/mygui/openmw_map_window.layout %%DATADIR%%/resources/mygui/openmw_map_window.skin.xml %%DATADIR%%/resources/mygui/openmw_merchantrepair.layout %%DATADIR%%/resources/mygui/openmw_messagebox.layout %%DATADIR%%/resources/mygui/openmw_persuasion_dialog.layout %%DATADIR%%/resources/mygui/openmw_pointer.xml %%DATADIR%%/resources/mygui/openmw_progress.skin.xml %%DATADIR%%/resources/mygui/openmw_quickkeys_menu.layout %%DATADIR%%/resources/mygui/openmw_quickkeys_menu_assign.layout %%DATADIR%%/resources/mygui/openmw_recharge_dialog.layout %%DATADIR%%/resources/mygui/openmw_repair.layout %%DATADIR%%/resources/mygui/openmw_resources.xml %%DATADIR%%/resources/mygui/openmw_savegame_dialog.layout %%DATADIR%%/resources/mygui/openmw_screen_fader.layout %%DATADIR%%/resources/mygui/openmw_screen_fader_hit.layout %%DATADIR%%/resources/mygui/openmw_scroll.layout %%DATADIR%%/resources/mygui/openmw_scroll.skin.xml %%DATADIR%%/resources/mygui/openmw_settings.xml %%DATADIR%%/resources/mygui/openmw_settings_window.layout %%DATADIR%%/resources/mygui/openmw_spell_buying_window.layout %%DATADIR%%/resources/mygui/openmw_spell_window.layout %%DATADIR%%/resources/mygui/openmw_spellcreation_dialog.layout %%DATADIR%%/resources/mygui/openmw_stats_window.layout %%DATADIR%%/resources/mygui/openmw_text.skin.xml %%DATADIR%%/resources/mygui/openmw_text_input.layout %%DATADIR%%/resources/mygui/openmw_tooltips.layout %%DATADIR%%/resources/mygui/openmw_trade_window.layout %%DATADIR%%/resources/mygui/openmw_trainingwindow.layout %%DATADIR%%/resources/mygui/openmw_travel_window.layout %%DATADIR%%/resources/mygui/openmw_wait_dialog.layout %%DATADIR%%/resources/mygui/openmw_wait_dialog_progressbar.layout %%DATADIR%%/resources/mygui/openmw_windows.skin.xml %%DATADIR%%/resources/mygui/skins.xml %%DATADIR%%/resources/shaders/lighting.glsl %%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 %%DATADIR%%/resources/shaders/water_nm.png %%DATADIR%%/resources/shaders/water_vertex.glsl %%DATADIR%%/resources/version share/pixmaps/openmw-cs.png share/pixmaps/openmw.png @dir %%DATADIR%%/data