Date: Tue, 14 Dec 2021 18:07:16 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cbbbda598bdf - main - games/openmw: update to 0.47 release Message-ID: <202112141807.1BEI7GXB002219@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbbbda598bdf500fe9fe495b339633da7e0a6fba commit cbbbda598bdf500fe9fe495b339633da7e0a6fba Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2021-12-14 18:05:01 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2021-12-14 18:07:01 +0000 games/openmw: update to 0.47 release Sponsored by: Netzkommune GmbH --- games/openmw/Makefile | 22 +++++++++++++++----- games/openmw/distinfo | 8 +++++--- .../patch-apps_openmw_mwinput_inputmanagerimp.cpp | 17 --------------- games/openmw/files/patch-extern_CMakeLists.txt | 24 ++++++++++++++++++++++ games/openmw/pkg-plist | 13 ++++++++++-- 5 files changed, 57 insertions(+), 27 deletions(-) diff --git a/games/openmw/Makefile b/games/openmw/Makefile index fde42a065405..0d4809c98d90 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -1,7 +1,6 @@ PORTNAME= openmw DISTVERSIONPREFIX= openmw- -DISTVERSION= 0.46.0 -PORTREVISION= 1 +DISTVERSION= 0.47.0 CATEGORIES= games MAINTAINER= fluffy@FreeBSD.org @@ -12,12 +11,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libboost_thread.so:devel/boost-libs \ - libBulletCollision.so:devel/bullet \ libMyGUIEngine.so:x11-toolkits/mygui \ + libBulletCollision.so:devel/bullet \ libosg.so:graphics/osg \ - libunshield.so:archivers/unshield + libRecast.so:graphics/recastnavigation \ + libunshield.so:archivers/unshield \ + liblz4.so:archivers/liblz4 -USES= cmake compiler:c++14-lang gl openal pkgconfig qt:5 sdl xorg +USES= cmake compiler:c++17-lang gl openal pkgconfig qt:5 sdl xorg USE_GITHUB= yes GH_ACCOUNT= OpenMW USE_GL= gl @@ -26,10 +27,21 @@ USE_QT= core gui network opengl printsupport widgets buildtools_build \ USE_SDL= sdl2 CMAKE_ARGS= -DDESIRED_QT_VERSION=5 \ + -DOPENMW_USE_SYSTEM_BULLET=ON \ + -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON \ -DGLOBAL_DATA_PATH="${PREFIX}/share" \ -DMORROWIND_DATA_FILES="${DATADIR}/data" \ -DOPENMW_RESOURCE_FILES="${DATADIR}/resources" +OPTIONS_DEFINE= DOCS + +DOCS_CMAKE_BOOL= BUILD_DOCS +DOCS_BUILD_DEPENDS= doxygen>0:devel/doxygen \ + sphinx-build:textproc/py-sphinx@${PY_FLAVOR} +DOCS_USES= python:build + +PORTDOCS= * + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* diff --git a/games/openmw/distinfo b/games/openmw/distinfo index 7aefa917081e..11db8e44b399 100644 --- a/games/openmw/distinfo +++ b/games/openmw/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1591668250 -SHA256 (OpenMW-openmw-openmw-0.46.0_GH0.tar.gz) = 07a35a8f15f67f5aa7210c2a307a6db5660a9b61fe34983c35b172c8671afd58 -SIZE (OpenMW-openmw-openmw-0.46.0_GH0.tar.gz) = 5155004 +TIMESTAMP = 1639405346 +SHA256 (OpenMW-openmw-openmw-0.47.0_GH0.tar.gz) = bd7f77e1527c2180e9b0dfcbe401d6fb48f24dbb37701dac7747697873d6edb4 +SIZE (OpenMW-openmw-openmw-0.47.0_GH0.tar.gz) = 5156857 +SHA256 (recastnavigation-recastnavigation-e75adf86f91eb3082220085e42dda62679f9a3ea_GH0.tar.gz) = c647e307d6cc62ba00bfd888e82da83844bf1e72f2c98bed2f1d95bac229b950 +SIZE (recastnavigation-recastnavigation-e75adf86f91eb3082220085e42dda62679f9a3ea_GH0.tar.gz) = 1542425 diff --git a/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp b/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp deleted file mode 100644 index f05a416dc186..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2019-03-10 10:50:29 UTC -+++ apps/openmw/mwinput/inputmanagerimp.cpp -@@ -121,11 +121,12 @@ namespace MWInput - SDL_ControllerDeviceEvent evt; - evt.which = i; - controllerAdded(mFakeDeviceID, evt); -- Log(Debug::Info) << "Detected game controller: " << SDL_GameControllerNameForIndex(i); -+ //Bug in FreeBSD's SDL? SDL_GameControllerNameForIndex returns NULL -+ Log(Debug::Info) << "Detected game controller: " << i; - } - else - { -- Log(Debug::Info) << "Detected unusable controller: " << SDL_JoystickNameForIndex(i); -+ Log(Debug::Info) << "Detected unusable controller: " << i; - } - } - diff --git a/games/openmw/files/patch-extern_CMakeLists.txt b/games/openmw/files/patch-extern_CMakeLists.txt new file mode 100644 index 000000000000..113ff8d49ee5 --- /dev/null +++ b/games/openmw/files/patch-extern_CMakeLists.txt @@ -0,0 +1,24 @@ +--- extern/CMakeLists.txt.orig 2021-10-10 16:17:03 UTC ++++ extern/CMakeLists.txt +@@ -178,11 +178,14 @@ if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION) + set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "") + + # master on 15 Feb 2021 +- include(FetchContent) +- FetchContent_Declare(recastnavigation +- URL https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip +- URL_HASH MD5=af905d121ef9d1cdfa979b0495cba059 +- SOURCE_DIR fetched/recastnavigation +- ) +- FetchContent_MakeAvailableExcludeFromAll(recastnavigation) ++# include(FetchContent) ++# FetchContent_Declare(recastnavigation ++# URL https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip ++# URL_HASH MD5=af905d121ef9d1cdfa979b0495cba059 ++# SOURCE_DIR fetched/recastnavigation ++# ) ++# FetchContent_MakeAvailableExcludeFromAll(recastnavigation) ++ ++ add_subdirectory("fetched/recastnavigation") ++ + endif() diff --git a/games/openmw/pkg-plist b/games/openmw/pkg-plist index 48cacf098b56..95e1944497ed 100644 --- a/games/openmw/pkg-plist +++ b/games/openmw/pkg-plist @@ -7,10 +7,10 @@ bin/openmw-essimporter bin/openmw-iniimporter bin/openmw-launcher bin/openmw-wizard +%%ETCDIR%%/defaults-cs.bin +%%ETCDIR%%/defaults.bin %%ETCDIR%%/gamecontrollerdb.txt -%%ETCDIR%%/openmw-cs.cfg %%ETCDIR%%/openmw.cfg -%%ETCDIR%%/settings-default.cfg %%ETCDIR%%/version share/applications/org.openmw.cs.desktop share/applications/org.openmw.launcher.desktop @@ -102,7 +102,15 @@ share/metainfo/openmw.appdata.xml %%DATADIR%%/resources/mygui/openmw_wait_dialog_progressbar.layout %%DATADIR%%/resources/mygui/openmw_windows.skin.xml %%DATADIR%%/resources/mygui/skins.xml +%%DATADIR%%/resources/shaders/alpha.glsl +%%DATADIR%%/resources/shaders/groundcover_fragment.glsl +%%DATADIR%%/resources/shaders/groundcover_vertex.glsl +%%DATADIR%%/resources/shaders/lighting_util.glsl %%DATADIR%%/resources/shaders/lighting.glsl +%%DATADIR%%/resources/shaders/nv_default_fragment.glsl +%%DATADIR%%/resources/shaders/nv_default_vertex.glsl +%%DATADIR%%/resources/shaders/nv_nolighting_fragment.glsl +%%DATADIR%%/resources/shaders/nv_nolighting_vertex.glsl %%DATADIR%%/resources/shaders/objects_fragment.glsl %%DATADIR%%/resources/shaders/objects_vertex.glsl %%DATADIR%%/resources/shaders/parallax.glsl @@ -114,6 +122,7 @@ share/metainfo/openmw.appdata.xml %%DATADIR%%/resources/shaders/shadows_vertex.glsl %%DATADIR%%/resources/shaders/terrain_fragment.glsl %%DATADIR%%/resources/shaders/terrain_vertex.glsl +%%DATADIR%%/resources/shaders/vertexcolors.glsl %%DATADIR%%/resources/shaders/water_fragment.glsl %%DATADIR%%/resources/shaders/water_nm.png %%DATADIR%%/resources/shaders/water_vertex.glsl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112141807.1BEI7GXB002219>