Index: head/games/doomsday/Makefile =================================================================== --- head/games/doomsday/Makefile (revision 461273) +++ head/games/doomsday/Makefile (revision 461274) @@ -1,40 +1,41 @@ # Created by: Igor Pokrovsky # $FreeBSD$ PORTNAME= doomsday PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION} MAINTAINER= danilo@FreeBSD.org COMMENT= Enhanced Doom, Heretic, and Hexen source port LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:ftp/curl \ libassimp.so:multimedia/assimp \ libfluidsynth.so:audio/fluidsynth RUN_DEPENDS= timidity:audio/timidity USES= cmake:outsource compiler:c++11-lib ninja openal pkgconfig python:build USE_GL= gl glu USE_LDCONFIG= yes USE_SDL= sdl2 mixer2 USE_XORG= x11 sm ice xext xrandr xxf86vm USE_QT5= buildtools_build core gui network widgets qmake opengl x11extras LDFLAGS+= -L${LOCALBASE}/lib CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DDENG_ENABLE_COTIRE=OFF -DDENG_ASSIMP_EMBEDDED=OFF WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} PORTSCOUT= limit:^\d+\.\d+\.\d+$$ post-patch: # Removing (three) non-ascii bytes from the beginning of the file @${REINPLACE_CMD} '1s,^...,,' \ ${WRKSRC}/apps/client/src/client/cl_sound.cpp @${REINPLACE_CMD} -E 's|(DENG_DISTRIB_DIR /usr)|\1/local|' \ ${WRKSRC}/cmake/Config.cmake .include Index: head/games/pioneer/Makefile =================================================================== --- head/games/pioneer/Makefile (revision 461273) +++ head/games/pioneer/Makefile (revision 461274) @@ -1,117 +1,118 @@ # Created by: lightside # $FreeBSD$ PORTNAME= pioneer PORTVERSION= 0.0.${GH_TAGNAME} +PORTREVISION= 1 CATEGORIES= games MAINTAINER= lightside@gmx.com COMMENT= Space adventure game set in the Milky Way galaxy LICENSE= APACHE20 GPLv3 MIT ZLIB CC-BY-SA-3.0 DejaVu GLEW IUP SIL LICENSE_COMB= multi LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license LICENSE_NAME_GLEW= The OpenGL Extension Wrangler Library license LICENSE_NAME_IUP= Galaxy colour image use policy LICENSE_NAME_SIL= SIL open font license version 1.1 LICENSE_FILE_APACHE20= ${WRKSRC}/licenses/Apache-2.0.txt LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt LICENSE_FILE_DejaVu= ${WRKSRC}/licenses/DejaVu-license.txt LICENSE_FILE_GLEW= ${WRKSRC}/licenses/GLEW.txt LICENSE_FILE_GPLv3= ${WRKSRC}/licenses/GPL-3.txt LICENSE_FILE_IUP= ${WRKSRC}/licenses/Image\ Use\ Policy\ -\ NASA\ Spitzer\ Space\ Telescope.html LICENSE_FILE_SIL= ${WRKSRC}/licenses/SIL-1.1.txt LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_GLEW= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IUP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_SIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/include/GL/glu.h:graphics/libGLU LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ libfreetype.so:print/freetype2 \ libvorbisfile.so:audio/libvorbis \ libpng.so:graphics/png \ libassimp.so:multimedia/assimp USES= autoreconf compiler:c++11-lib gmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= pioneerspacesim GH_TAGNAME= 20171001 USE_GL= gl USE_SDL= image2 sdl2 GNU_CONFIGURE= yes CONFIGURE_ENV= PIONEER_DATA_DIR="${DATADIR}/data" CONFIGURE_ARGS= --with-version="${GH_TAGNAME}" EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions --exclude .gitignore PORTDATA= data PORTDOCS= AUTHORS.txt Changelog.txt Modelviewer.txt Quickstart.txt README.md PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.png DESKTOP_ENTRIES="Pioneer" "${COMMENT}" \ "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;" false SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS MODELCOMPILER NOGPUJOBS PROFILER SERVERAGENT OPTIONS_DEFAULT= MODELCOMPILER DOCS_SUB_LIST= QUICKSTART_PATH="${DOCSDIR}" DOCS_SUB_LIST_OFF= \ QUICKSTART_PATH="https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${GH_TAGNAME}" MODELCOMPILER_DESC= Build/install modelcompiler tool MODELCOMPILER_PLIST_FILES= bin/${PORTNAME}-modelcompiler NOGPUJOBS_DESC= Disable EnableGPUJobs for config.ini by default PROFILER_DESC= Build with internal profiler PROFILER_CONFIGURE_ON= --enable-profiler SERVERAGENT_DESC= Build with server agent SERVERAGENT_CONFIGURE_WITH= server-agent SERVERAGENT_LIB_DEPENDS= libcurl.so:ftp/curl .include .if ${CHOSEN_COMPILER_TYPE} == gcc # Unhide std::to_string() for GCC (ports/193528) CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: .SILENT ${REINPLACE_CMD} -e '/^OPTIMISE=/d' \ ${WRKSRC}/configure.ac post-patch-MODELCOMPILER-off: .SILENT ${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \ ${WRKSRC}/src/Makefile.am post-patch-NOGPUJOBS-on: .SILENT # Revert 41272a856d9072404efbfdb10f0e3c9e4f96bb4d commit, in case of # GL_OUT_OF_MEMORY OpenGL error, when turning to gas giant planet ${REINPLACE_CMD} -e '/EnableGPUJobs/s|1|0|' \ ${WRKSRC}/src/GameConfig.cpp post-patch-PROFILER-off: .SILENT ${REINPLACE_CMD} -e '/^SUBDIRS/s/ profiler//' \ ${WRKSRC}/contrib/Makefile.am ${REINPLACE_CMD} -i '.p.bak' -e \ '/libprofiler.a/d; $$!N; /libprofiler.a$$/s| \\||; P; D' \ ${WRKSRC}/src/Makefile.am ${REINPLACE_CMD} -i '.p.bak' -e '/contrib\/profiler/d' \ ${WRKSRC}/configure.ac post-install: ${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) post-install-MODELCOMPILER-on: ${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler .include Index: head/graphics/qt5-3d/Makefile =================================================================== --- head/graphics/qt5-3d/Makefile (revision 461273) +++ head/graphics/qt5-3d/Makefile (revision 461274) @@ -1,19 +1,20 @@ # $FreeBSD$ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt3D module LIB_DEPENDS= libassimp.so:multimedia/assimp USES= pkgconfig qmake:norecursive USE_QT5= concurrent core gui qml quick buildtools_build QT_DIST= ${PORTNAME} USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/multimedia/assimp/Makefile =================================================================== --- head/multimedia/assimp/Makefile (revision 461273) +++ head/multimedia/assimp/Makefile (revision 461274) @@ -1,34 +1,29 @@ # $FreeBSD$ PORTNAME= assimp DISTVERSIONPREFIX= v -DISTVERSION= 4.0.1 +DISTVERSION= 4.1.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libminizip.so:archivers/minizip BROKEN_powerpc64= Does not build: error: ByteSwap has not been declared USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes -# CMAKE_ARGS instructs cmake to skip runtime path removal during install -CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON -DASSIMP_BUILD_TESTS:BOOL=OFF +CMAKE_OFF= ASSIMP_BUILD_TESTS -PLIST_SUB= SHLIB_VER=${DISTVERSION} +PLIST_SUB= SHL3=${DISTVERSION} VER2=${DISTVERSION:R} SHL1=${DISTVERSION:R:R} -.include +post-install: # rm the third-party lib installed by mistake: https://github.com/assimp/assimp/issues/1650 + @${RM} ${STAGEDIR}${PREFIX}/lib/libIrrXML.a -.if ${CHOSEN_COMPILER_TYPE} == gcc -# GCC C++11 support is broken on FreeBSD (see PR 193528 for details) -CXXFLAGS+= -D_GLIBCXX_USE_C99 -.endif - -.include +.include Index: head/multimedia/assimp/distinfo =================================================================== --- head/multimedia/assimp/distinfo (revision 461273) +++ head/multimedia/assimp/distinfo (revision 461274) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509810769 -SHA256 (assimp-assimp-v4.0.1_GH0.tar.gz) = 60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e -SIZE (assimp-assimp-v4.0.1_GH0.tar.gz) = 44625148 +TIMESTAMP = 1513844771 +SHA256 (assimp-assimp-v4.1.0_GH0.tar.gz) = 3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 +SIZE (assimp-assimp-v4.1.0_GH0.tar.gz) = 45417293 Index: head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp =================================================================== --- head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp (revision 461273) +++ head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp (revision 461274) @@ -1,11 +1,10 @@ ---- code/D3MFOpcPackage.cpp.orig 2017-07-18 17:03:26 UTC +--- code/D3MFOpcPackage.cpp.orig 2017-12-11 13:22:45 UTC +++ code/D3MFOpcPackage.cpp -@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O +@@ -55,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #include #include #include - +#include -+ #include + #include "3MFXmlTags.h" - namespace Assimp { Index: head/multimedia/assimp/files/patch-git_096056 =================================================================== --- head/multimedia/assimp/files/patch-git_096056 (nonexistent) +++ head/multimedia/assimp/files/patch-git_096056 (revision 461274) @@ -0,0 +1,21 @@ +From 096056b899d9c423cdcad527849126e3e3e17a34 Mon Sep 17 00:00:00 2001 +From: Turo Lamminen +Date: Sun, 24 Dec 2017 22:17:45 +0200 +Subject: [PATCH] Q3BSP: Fix build with clang libc++ + +--- + code/Q3BSPZipArchive.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git code/Q3BSPZipArchive.cpp code/Q3BSPZipArchive.cpp +index 86c966d8e..1c8b18ad3 100644 +--- code/Q3BSPZipArchive.cpp ++++ code/Q3BSPZipArchive.cpp +@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include "Q3BSPZipArchive.h" + #include ++#include + #include + + namespace Assimp { Property changes on: head/multimedia/assimp/files/patch-git_096056 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/assimp/pkg-plist =================================================================== --- head/multimedia/assimp/pkg-plist (revision 461273) +++ head/multimedia/assimp/pkg-plist (revision 461274) @@ -1,53 +1,54 @@ bin/assimp include/assimp/Compiler/poppack1.h include/assimp/Compiler/pstdint.h include/assimp/Compiler/pushpack1.h include/assimp/DefaultIOStream.h include/assimp/DefaultIOSystem.h include/assimp/DefaultLogger.hpp +include/assimp/Defines.h include/assimp/Exporter.hpp include/assimp/IOStream.hpp include/assimp/IOSystem.hpp include/assimp/Importer.hpp include/assimp/LogStream.hpp include/assimp/Logger.hpp include/assimp/NullLogger.hpp include/assimp/ProgressHandler.hpp include/assimp/SceneCombiner.h include/assimp/ai_assert.h include/assimp/anim.h include/assimp/camera.h include/assimp/cexport.h include/assimp/cfileio.h include/assimp/cimport.h include/assimp/color4.h include/assimp/color4.inl include/assimp/config.h include/assimp/defs.h include/assimp/importerdesc.h include/assimp/light.h include/assimp/material.h include/assimp/material.inl include/assimp/matrix3x3.h include/assimp/matrix3x3.inl include/assimp/matrix4x4.h include/assimp/matrix4x4.inl include/assimp/mesh.h include/assimp/metadata.h include/assimp/postprocess.h include/assimp/quaternion.h include/assimp/quaternion.inl include/assimp/scene.h include/assimp/texture.h include/assimp/types.h include/assimp/vector2.h include/assimp/vector2.inl include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h -lib/cmake/assimp-4.0/assimp-config-version.cmake -lib/cmake/assimp-4.0/assimp-config.cmake +lib/cmake/assimp-%%VER2%%/assimp-config-version.cmake +lib/cmake/assimp-%%VER2%%/assimp-config.cmake lib/libassimp.so -lib/libassimp.so.4 -lib/libassimp.so.%%SHLIB_VER%% +lib/libassimp.so.%%SHL1%% +lib/libassimp.so.%%SHL3%% libdata/pkgconfig/assimp.pc