Index: head/games/pioneer/Makefile =================================================================== --- head/games/pioneer/Makefile (revision 451386) +++ head/games/pioneer/Makefile (revision 451387) @@ -1,118 +1,117 @@ # Created by: lightside # $FreeBSD$ PORTNAME= pioneer PORTVERSION= 0.0.${GH_TAGNAME} -PORTREVISION= 4 CATEGORIES= games -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= a53fdbe8b046.patch:-p1 - 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= libcurl.so:ftp/curl \ - libsigc-2.0.so:devel/libsigc++20 \ +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= 20170304 +GH_TAGNAME= 20171001 -USES= autoreconf compiler:c++11-lib gmake pkgconfig 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 +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/games/pioneer/distinfo =================================================================== --- head/games/pioneer/distinfo (revision 451386) +++ head/games/pioneer/distinfo (revision 451387) @@ -1,5 +1,3 @@ -TIMESTAMP = 1488555232 -SHA256 (pioneerspacesim-pioneer-0.0.20170304-20170304_GH0.tar.gz) = 45d448a5ac53c9e230522600f03dad7abc70788367d09c3edcb4ae4285050004 -SIZE (pioneerspacesim-pioneer-0.0.20170304-20170304_GH0.tar.gz) = 194776151 -SHA256 (a53fdbe8b046.patch) = f9b438480642ad4a9a71cd976c007bc9c5a0fa82d3dc2d4d0892c1d6e00b78d7 -SIZE (a53fdbe8b046.patch) = 1109 +TIMESTAMP = 1506816107 +SHA256 (pioneerspacesim-pioneer-0.0.20171001-20171001_GH0.tar.gz) = 154118bd3dac2f9b8ea43a837bcb967abcc8c3a8ee5ab61d35183bae85e8b0db +SIZE (pioneerspacesim-pioneer-0.0.20171001-20171001_GH0.tar.gz) = 210900753 Index: head/games/pioneer/files/patch-data_modules_SearchRescue_SearchRescue.lua =================================================================== --- head/games/pioneer/files/patch-data_modules_SearchRescue_SearchRescue.lua (nonexistent) +++ head/games/pioneer/files/patch-data_modules_SearchRescue_SearchRescue.lua (revision 451387) @@ -0,0 +1,83 @@ +Fix SAR selection of ship sizes for missions +https://github.com/pioneerspacesim/pioneer/commit/008e30a857036a8cc40c42bf89ef68e65b47a41e + +--- data/modules/SearchRescue/SearchRescue.lua.orig 2017-10-01 00:01:47 UTC ++++ data/modules/SearchRescue/SearchRescue.lua +@@ -613,7 +613,20 @@ local createTargetShipParameters = funct + ---- loading drive, weapons etc. + if flavour.id == 1 or flavour.id == 6 then + for i,shipdef in pairs(shipdefs) do +- if shipdef.capacity / 10 < 1 then shipdefs[i] = nil end ++ ++ -- get mass of hyperdrive if this ship has a default drive ++ -- if no default drive assume lowest mass drive ++ -- higher mass drives will only be fitted later at ship creation if capacity is huge ++ local drive = Equipment.hyperspace['hyperdrive_'..tostring(shipdef.hyperdriveClass)] ++ if not drive then ++ local drives = {} ++ for i = 9, 1, -1 do ++ table.insert(drives, Equipment.hyperspace['hyperdrive_'..tostring(i)]) ++ end ++ table.sort(drives, function (a,b) return a.capabilities.mass < b.capabilities.mass end) ++ drive = drives[1] ++ end ++ if (shipdef.capacity-drive.capabilities.mass) / 10 < 1 then shipdefs[i] = nil end + end + elseif flavour.pickup_pass > 0 then + for i,shipdef in pairs(shipdefs) do +@@ -661,7 +674,16 @@ local createTargetShipParameters = funct + if flavour.id == 1 or flavour.id == 6 then + local any_pass = rand:Integer(0,1) + if any_pass > 0 then +- pickup_pass = rand:Integer(1, math.min((shipdef.capacity / 10)+1, max_pass)) ++ local drive = Equipment.hyperspace['hyperdrive_'..tostring(shipdef.hyperdriveClass)] ++ if not drive then ++ local drives = {} ++ for i = 9, 1, -1 do ++ table.insert(drives, Equipment.hyperspace['hyperdrive_'..tostring(i)]) ++ end ++ table.sort(drives, function (a,b) return a.capabilities.mass < b.capabilities.mass end) ++ drive = drives[1] ++ end ++ pickup_pass = rand:Integer(1, math.min(((shipdef.capacity-drive.capabilities.mass) / 10)+1, max_pass)) + else + pickup_pass = 0 + end +@@ -709,22 +731,25 @@ local createTargetShip = function (missi + ship:SetPattern(pattern) + + -- load a hyperdrive +- local default_drive = Equipment.hyperspace['hyperdrive_'..tostring(shipdef.hyperdriveClass)] +- if default_drive then +- ship:AddEquip(default_drive) +- else +- local drive ++ -- 1st try: default drive for this ship class ++ -- 2nd try: largest drive possible that doesn't take more than a 10th of available room ++ -- fallback: smallest drive ++ local drives = {} ++ local drive = Equipment.hyperspace['hyperdrive_'..tostring(shipdef.hyperdriveClass)] ++ if not drive then + for i = 9, 1, -1 do +- drive = Equipment.hyperspace['hyperdrive_'..tostring(i)] +- if shipdef.capacity / 10 > drive.capabilities.mass then +- ship:AddEquip(drive) +- break +- end ++ table.insert(drives, Equipment.hyperspace['hyperdrive_'..tostring(i)]) + end +- if not drive then +- ship:AddEquip(Equipment.hyperspace['hyperdrive_1']) ++ table.sort(drives, function (a,b) return a.capabilities.mass < b.capabilities.mass end) ++ for i = #drives, 1, -1 do ++ local test_drive = drives[i] ++ if shipdef.capacity / 10 > test_drive.capabilities.mass then ++ drive = test_drive ++ end + end + end ++ if not drive then drive = drives[1] end ++ ship:AddEquip(drive) + + -- add thruster fuel + if mission.flavour.id == 2 or mission.flavour.id == 4 or mission.flavour.id == 5 then Property changes on: head/games/pioneer/files/patch-data_modules_SearchRescue_SearchRescue.lua ___________________________________________________________________ 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