From owner-svn-ports-head@freebsd.org Sun Jul 3 15:53:04 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D28BCB8FED1; Sun, 3 Jul 2016 15:53:04 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD9B22B4A; Sun, 3 Jul 2016 15:53:04 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u63Fr3aC022205; Sun, 3 Jul 2016 15:53:03 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u63Fr3lC022200; Sun, 3 Jul 2016 15:53:03 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201607031553.u63Fr3lC022200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 3 Jul 2016 15:53:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417975 - in head/games/openmw: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jul 2016 15:53:04 -0000 Author: pawel Date: Sun Jul 3 15:53:03 2016 New Revision: 417975 URL: https://svnweb.freebsd.org/changeset/ports/417975 Log: Update to version 0.39.0 Changelog: https://github.com/OpenMW/openmw/releases/tag/openmw-0.39.0 PR: 210729 Submitted by: Tobias Kortkamp (maintainer) Deleted: head/games/openmw/files/patch-apps_essimporter_converter.hpp head/games/openmw/files/patch-apps_essimporter_convertinventory.cpp head/games/openmw/files/patch-apps_openmw_crashcatcher.cpp head/games/openmw/files/patch-apps_openmw_mwmechanics_spells.cpp head/games/openmw/files/patch-apps_openmw_mwmechanics_spells.hpp head/games/openmw/files/patch-apps_openmw_mwworld_projectilemanager.hpp head/games/openmw/files/patch-apps_openmw_mwworld_refdata.hpp head/games/openmw/files/patch-apps_openmw_mwworld_worldimp.cpp head/games/openmw/files/patch-components_esm_spellstate.cpp head/games/openmw/files/patch-components_esm_spellstate.hpp head/games/openmw/files/patch-components_resource_bulletshape.cpp head/games/openmw/files/patch-components_sceneutil_lightcontroller.cpp Modified: head/games/openmw/Makefile head/games/openmw/distinfo head/games/openmw/files/patch-CMakeLists.txt head/games/openmw/files/patch-apps_wizard_CMakeLists.txt head/games/openmw/pkg-plist Modified: head/games/openmw/Makefile ============================================================================== --- head/games/openmw/Makefile Sun Jul 3 15:17:01 2016 (r417974) +++ head/games/openmw/Makefile Sun Jul 3 15:53:03 2016 (r417975) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openmw -PORTVERSION= 0.38.0 +PORTVERSION= 0.39.0 DISTVERSIONPREFIX= openmw- CATEGORIES= games @@ -24,10 +24,12 @@ BROKEN_FreeBSD_9= does not build USE_GITHUB= yes GH_ACCOUNT= OpenMW -USES= cmake:outsource compiler:c++11-lib ninja openal pkgconfig +USES= cmake:outsource compiler:c++14-lang ninja openal pkgconfig USE_GL= gl -USE_QT5= qmake_build buildtools_build core widgets network opengl +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 \ @@ -37,7 +39,7 @@ CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \ -DBUILD_LAUNCHER=ON \ -DBUILD_MWINIIMPORTER=ON \ -DBUILD_ESSIMPORTER=ON \ - -DBUILD_OPENCS=OFF \ + -DBUILD_OPENCS=ON \ -DBUILD_WIZARD=ON \ -DBUILD_WITH_CODE_COVERAGE=OFF \ -DBUILD_UNITTEST=OFF \ Modified: head/games/openmw/distinfo ============================================================================== --- head/games/openmw/distinfo Sun Jul 3 15:17:01 2016 (r417974) +++ head/games/openmw/distinfo Sun Jul 3 15:53:03 2016 (r417975) @@ -1,2 +1,2 @@ -SHA256 (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = c16a44ee9a787dcae61a373625d39733868d213fd6e8ccd86ab9e7ac00ecb85a -SIZE (OpenMW-openmw-openmw-0.38.0_GH0.tar.gz) = 4137263 +SHA256 (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = b0d294b0814099bd93326f7b86dd84fb727d38dd536bf104272112e6d70ae720 +SIZE (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = 4764754 Modified: head/games/openmw/files/patch-CMakeLists.txt ============================================================================== --- head/games/openmw/files/patch-CMakeLists.txt Sun Jul 3 15:17:01 2016 (r417974) +++ head/games/openmw/files/patch-CMakeLists.txt Sun Jul 3 15:53:03 2016 (r417975) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2016-01-12 16:11:28 UTC +--- CMakeLists.txt.orig 2016-06-30 21:09:52 UTC +++ CMakeLists.txt -@@ -224,7 +224,7 @@ if (USE_QT) - set (OSG_QT osgQt) +@@ -296,7 +296,7 @@ find_package(Boost REQUIRED COMPONENTS $ + find_package(SDL2 REQUIRED) + find_package(OpenAL REQUIRED) + find_package(Bullet REQUIRED) +-if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283) ++if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 282) + message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later") endif() --find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX) -+find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX) - - include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}) - Modified: head/games/openmw/files/patch-apps_wizard_CMakeLists.txt ============================================================================== --- head/games/openmw/files/patch-apps_wizard_CMakeLists.txt Sun Jul 3 15:17:01 2016 (r417974) +++ head/games/openmw/files/patch-apps_wizard_CMakeLists.txt Sun Jul 3 15:53:03 2016 (r417975) @@ -1,6 +1,6 @@ ---- apps/wizard/CMakeLists.txt.orig 2016-01-12 16:11:28 UTC +--- apps/wizard/CMakeLists.txt.orig 2016-04-06 11:40:42 UTC +++ apps/wizard/CMakeLists.txt -@@ -150,6 +150,7 @@ endif() +@@ -147,6 +147,7 @@ endif() # Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream if (UNIX AND NOT APPLE) Modified: head/games/openmw/pkg-plist ============================================================================== --- head/games/openmw/pkg-plist Sun Jul 3 15:17:01 2016 (r417974) +++ head/games/openmw/pkg-plist Sun Jul 3 15:53:03 2016 (r417975) @@ -1,15 +1,18 @@ 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%%/openmw-cs.cfg %%ETCDIR%%/openmw.cfg %%ETCDIR%%/settings-default.cfg %%ETCDIR%%/version share/appdata/openmw.appdata.xml +share/applications/openmw-cs.desktop share/applications/openmw.desktop %%DATADIR%%/resources/defaultfilters %%DATADIR%%/resources/mygui/DejaVuLGCSansMono.ttf @@ -97,9 +100,16 @@ share/applications/openmw.desktop %%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/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