diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile index 47ee932dfe58..1c083d5a6a09 100644 --- a/games/vcmi/Makefile +++ b/games/vcmi/Makefile @@ -1,48 +1,48 @@ PORTNAME= vcmi -PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTVERSION= 1.1.0 CATEGORIES= games MAINTAINER= danfe@FreeBSD.org COMMENT= Open-source engine for Heroes of Might and Magic III WWW= https://vcmi.eu/ LICENSE= GPLv2+ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libboost_atomic.so:devel/boost-libs \ libfuzzylite.so:devel/fuzzylite \ - libluajit-5.1.so:lang/luajit \ libminizip.so:archivers/minizip \ libtbb.so:devel/onetbb RUN_DEPENDS= bash:shells/bash -USES= cmake sdl shebangfix +USES= cmake pkgconfig sdl shebangfix USE_GITHUB= yes USE_SDL= image2 mixer2 sdl2 ttf2 SHEBANG_FILES= vcmibuilder CMAKE_ARGS= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \ -DCMAKE_INSTALL_RPATH:PATH=${PREFIX}/lib/${PORTNAME} \ -DENABLE_GITVERSION:BOOL=OFF -DENABLE_TEST:BOOL=OFF \ -DFORCE_BUNDLED_FL:BOOL=OFF PORTDOCS= AUTHORS ChangeLog README.md -OPTIONS_DEFINE= DOCS LAUNCHER -OPTIONS_DEFAULT=LAUNCHER +OPTIONS_DEFINE= DOCS QT +OPTIONS_DEFAULT= QT OPTIONS_SUB= yes -LAUNCHER_DESC= Build Qt-based game launcher -LAUNCHER_USES= qt:5 -LAUNCHER_USE= QT=buildtools:build,qmake:build,core,gui,network,widgets -LAUNCHER_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF +QT_DESC= Build Qt-based game launcher and map editor +QT_USES= qt:5 +QT_USE= QT=buildtools:build,qmake:build,core,gui,network,widgets +QT_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF -DENABLE_EDITOR:BOOL=OFF post-configure: - ${SED} -e 's,@GIT_SHA1@,cedc9a9,' ${WRKSRC}/Version.cpp.in \ + ${SED} -e 's,@GIT_SHA1@,5278271,' ${WRKSRC}/Version.cpp.in \ > ${BUILD_WRKSRC}/Version.cpp post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include + +PATCH_ARGS+= -l diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo index 70c12c46bbd7..dea8d6a9dc6d 100644 --- a/games/vcmi/distinfo +++ b/games/vcmi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662892941 -SHA256 (vcmi-vcmi-1.0.0_GH0.tar.gz) = 1033f69c55f2f7d071ea5f278f41d5f97abe9087e339718569681a3f46a0e7d0 -SIZE (vcmi-vcmi-1.0.0_GH0.tar.gz) = 5885358 +TIMESTAMP = 1671792720 +SHA256 (vcmi-vcmi-1.1.0_GH0.tar.gz) = 39db3ac7a2d1e386be1982957c0746e4e47f0d6a57268a57e65df9c95c967474 +SIZE (vcmi-vcmi-1.1.0_GH0.tar.gz) = 6412813 diff --git a/games/vcmi/files/patch-lib_CModHandler.h b/games/vcmi/files/patch-lib_CModHandler.h new file mode 100644 index 000000000000..ba043fb9066f --- /dev/null +++ b/games/vcmi/files/patch-lib_CModHandler.h @@ -0,0 +1,11 @@ +--- lib/CModHandler.h.orig 2022-12-23 10:52:00 UTC ++++ lib/CModHandler.h +@@ -182,6 +182,8 @@ class DLL_LINKAGE CModInfo (public) + + struct Version + { ++#undef major ++#undef minor + int major = 0; + int minor = 0; + int patch = 0; diff --git a/games/vcmi/pkg-descr b/games/vcmi/pkg-descr index d7e5bf7527c2..894795e89c6c 100644 --- a/games/vcmi/pkg-descr +++ b/games/vcmi/pkg-descr @@ -1,14 +1,14 @@ VCMI is an open-source project aiming to reimplement HoMM3:WoG and SoD game engines, giving it new and extended possibilities. Among current features are: - Complete gameplay mechanics - Almost all objects, abilities, spells, and other content - Basic battle AI and adventure AI - Many GUI improvements: high resolutions, stack queue, creature window - Advanced and easy modding support -- add new towns, creatures, - heroes, artifacts and spells without limits or conflicts + heroes, artifacts, and spells without limits or conflicts - Launcher for easy configuration -- download mods from our server and install them immediately! - Random map generator that supports objects added by mods diff --git a/games/vcmi/pkg-message b/games/vcmi/pkg-message index 9eaa0c437db2..0baf387eb861 100644 --- a/games/vcmi/pkg-message +++ b/games/vcmi/pkg-message @@ -1,13 +1,13 @@ [ { type: install message: <