From nobody Tue Dec 14 18:07:16 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5EA2718D1472; Tue, 14 Dec 2021 18:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JD5tr4yThz4ZDx; Tue, 14 Dec 2021 18:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F5DF4EDD; Tue, 14 Dec 2021 18:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEI7GIL002220; Tue, 14 Dec 2021 18:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEI7GXB002219; Tue, 14 Dec 2021 18:07:16 GMT (envelope-from git) Date: Tue, 14 Dec 2021 18:07:16 GMT Message-Id: <202112141807.1BEI7GXB002219@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: cbbbda598bdf - main - games/openmw: update to 0.47 release List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbbbda598bdf500fe9fe495b339633da7e0a6fba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639505237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GapEkZVHjrFW/kFmQEJWOUDbGnAff/cJiwe4IMdEr64=; b=WGSNsLmY+fkrxGPhYMRKWlVP7HB8pgz6Cnb0Fnq8SgLz548W3r5XlRURApNWbor/xj/fb5 gz6sOQkiN+LWFVFZOwrpMTk9h2v3PGw7spEothAowbuxd2l0UC2VMOCvEt9iMTlrBdXiRz WaCFqQmNd1y/UwItB7X9T7Cb0WMhGCF02SMbahbvGkEaYA+le5ot6Kpl0wV8jD5uNIQON4 OY2BNopWVNRuJAlQ+lm6ylcI/QaeU1N7OdgU7vs7YzGOeSGgMAGos79d5xIfrqwJ3ytSbV vJPDkXKLXsay8yQenD8KvuEYG+wTPV4eyOTFhVhF1ogRnG2NKBp/S0salrTK5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639505237; a=rsa-sha256; cv=none; b=Gj5rULrCtCL0IiLRYwYt+BZy2pX29/qWP4WAha/+PS65yG39l7CtSqx9tmFTV7rhvI07LW 0A3a0KZ7H75sZItin+DNNG+QeQkb7TMXVKO/hn6Yqm8AdfELhCVoWZj0/OkZfJFlOEK82T wO0+VvQ57kewKzgyO+Qs+U6QaNhVjLVTobWtcu90T1I8nbo0/gkCm/3zA266CG7KjACbds Ze67C64mc0DdyoMyvEU3HU1EOPPG9U9r1se1jKMAgm5arN12+9l2VAQzpFb098MoUGB+iD Xtc6npU5nOSKjFxSLwRWwzb175c0tGLKUAsQc+b9v32QNyQjxntRyXk06RlxmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbbbda598bdf500fe9fe495b339633da7e0a6fba commit cbbbda598bdf500fe9fe495b339633da7e0a6fba Author: Dima Panov AuthorDate: 2021-12-14 18:05:01 +0000 Commit: Dima Panov 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