pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/vcmi
Module Name: pkgsrc
Committed By: adam
Date: Thu Oct 16 20:21:55 UTC 2025
Modified Files:
pkgsrc/games/vcmi: Makefile PLIST distinfo
pkgsrc/games/vcmi/patches:
patch-launcher_lib_innoextract_CMakeLists.txt
Added Files:
pkgsrc/games/vcmi/patches: patch-CMakeLists.txt
Log Message:
vcmi: updated to 1.6.8
1.6.8
Stability
Fixed crash when visiting Cannon Yard from HotA mod that was occuring on some systems
Fixed crash when moving through an event that gives enough experience to level up if the player is using instant movement speed
Fixed crash when trying to sort maps in reverse order that was occurring on some systems when there were multiple folders containing maps
Fixed crash when using one-click upgrade when unit upgrade cost is zero
Fixed crash on opening town screen with invisible buildings from mods
Fixed crash when a player changes their starting hero in multiplayer game while another player has town or starting bonus right-click popup open
Fixed crash when merging two units located in town garrison without a hero if both units are equipped with artifacts (WoG feature)
General
Fixed not working check for hypnotize spell effect presence
Fixed calculation of the total cost of the hero's movement path when the hero has spent some of his movement points today.
Fixed Launcher not closing after game start on Mac OS.
Launcher will no longer tracks clipboard state on mobile systems to prevent OS notifications
Automatic selection of xbrz2 upscaler now only happens on systems with 4GB of RAM
Game will now detect broken internal mod left over from VCMI 0.99 installations and notify player on startup instead of crashing
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/vcmi/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/vcmi/PLIST pkgsrc/games/vcmi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/vcmi/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/games/vcmi/patches/patch-launcher_lib_innoextract_CMakeLists.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/vcmi/Makefile
diff -u pkgsrc/games/vcmi/Makefile:1.16 pkgsrc/games/vcmi/Makefile:1.17
--- pkgsrc/games/vcmi/Makefile:1.16 Sat Sep 27 09:57:18 2025
+++ pkgsrc/games/vcmi/Makefile Thu Oct 16 20:21:55 2025
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2025/09/27 09:57:18 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2025/10/16 20:21:55 adam Exp $
-DISTNAME= vcmi-1.6.7
-PKGREVISION= 4
+DISTNAME= vcmi-1.6.8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=vcmi/}
GITHUB_SUBMODULES+= vcmi innoextract \
- 9977089412ebafe9f79936aa65a2edf16a84ae3e \
+ 98bb55798a77c0346b12a1dbb53fe4d3e0379d66 \
launcher/lib/innoextract
GITHUB_SUBMODULES+= fuzzylite fuzzylite \
- 7aee562d6ca17f3cf42588ffb5116e03017c3c50 \
+ 13b3122f5c353c0389ed4e66041d548c44ec9df6 \
AI/FuzzyLite
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -18,12 +17,15 @@ HOMEPAGE= https://vcmi.eu/
COMMENT= Open-source engine for Heroes of Might and Magic III
LICENSE= gnu-gpl-v2
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config bash:run
+USE_CXX_FEATURES= c++17
+USE_LANGUAGES= c c++
+USE_TOOLS+= bash:run pkg-config
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/vcmi
-USE_CXX_FEATURES+= c++17
+CMAKE_CONFIGURE_ARGS+= -DFORCE_BUNDLED_FL=ON
+
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
# lie to the compiler
CXXFLAGS+= -DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
@@ -40,10 +42,8 @@ SUBST_STAGE.ffmpeg= pre-configure
.if ${CC_VERSION:Mgcc-*}
CMAKE_CONFIGURE_ARGS+= -DENABLE_PCH=OFF
.endif
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
.include "../../mk/bsd.fast.prefs.mk"
-
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/vcmi
REPLACE_BASH+= vcmibuilder
@@ -52,20 +52,25 @@ PYTHON_FOR_BUILD_ONLY= tool
CHECK_PORTABILITY_SKIP+= CI/get_package_name.sh
+PLIST_VARS+= desktop
+.if ${OPSYS} != "Darwin"
+PLIST.desktop= yes
+.endif
+
.include "options.mk"
-.include "../../devel/cmake/build.mk"
+
.include "../../archivers/minizip/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../audio/SDL2_mixer/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../fonts/SDL2_ttf/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/SDL2_image/buildlink3.mk"
.include "../../lang/python/tool.mk"
-.include "../../lang/python/pyversion.mk"
.include "../../multimedia/ffmpeg7/buildlink3.mk"
.include "../../parallel/threadingbuildingblocks/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/buildlink3.mk"
Index: pkgsrc/games/vcmi/PLIST
diff -u pkgsrc/games/vcmi/PLIST:1.3 pkgsrc/games/vcmi/PLIST:1.4
--- pkgsrc/games/vcmi/PLIST:1.3 Tue Mar 18 09:43:00 2025
+++ pkgsrc/games/vcmi/PLIST Thu Oct 16 20:21:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/03/18 09:43:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/10/16 20:21:55 adam Exp $
bin/vcmibuilder
bin/vcmiclient
${PLIST.qt}bin/vcmieditor
@@ -11,26 +11,26 @@ lib/vcmi/AI/libStupidAI.so
lib/vcmi/AI/libVCAI.so
lib/vcmi/libvcmi.so
lib/vcmi/libvcmiqt.so
-share/applications/vcmiclient.desktop
-${PLIST.qt}share/applications/vcmieditor.desktop
-${PLIST.qt}share/applications/vcmilauncher.desktop
-share/icons/hicolor/1024x1024/apps/vcmiclient.png
-share/icons/hicolor/128x128/apps/vcmiclient.png
-${PLIST.qt}share/icons/hicolor/128x128/apps/vcmieditor.png
-share/icons/hicolor/16x16/apps/vcmiclient.png
-share/icons/hicolor/2048x2048/apps/vcmiclient.png
-share/icons/hicolor/22x22/apps/vcmiclient.png
-share/icons/hicolor/256x256/apps/vcmiclient.png
-${PLIST.qt}share/icons/hicolor/256x256/apps/vcmieditor.png
-share/icons/hicolor/32x32/apps/vcmiclient.png
-${PLIST.qt}share/icons/hicolor/32x32/apps/vcmieditor.png
-share/icons/hicolor/48x48/apps/vcmiclient.png
-${PLIST.qt}share/icons/hicolor/48x48/apps/vcmieditor.png
-share/icons/hicolor/512x512/apps/vcmiclient.png
-share/icons/hicolor/64x64/apps/vcmiclient.png
-${PLIST.qt}share/icons/hicolor/64x64/apps/vcmieditor.png
-share/icons/hicolor/scalable/apps/vcmiclient.svg
-${PLIST.qt}share/metainfo/eu.vcmi.VCMI.metainfo.xml
+${PLIST.desktop}share/applications/vcmiclient.desktop
+${PLIST.desktop}${PLIST.qt}share/applications/vcmieditor.desktop
+${PLIST.desktop}${PLIST.qt}share/applications/vcmilauncher.desktop
+${PLIST.desktop}share/icons/hicolor/1024x1024/apps/vcmiclient.png
+${PLIST.desktop}share/icons/hicolor/128x128/apps/vcmiclient.png
+${PLIST.desktop}${PLIST.qt}share/icons/hicolor/128x128/apps/vcmieditor.png
+${PLIST.desktop}share/icons/hicolor/16x16/apps/vcmiclient.png
+${PLIST.desktop}share/icons/hicolor/2048x2048/apps/vcmiclient.png
+${PLIST.desktop}share/icons/hicolor/22x22/apps/vcmiclient.png
+${PLIST.desktop}share/icons/hicolor/256x256/apps/vcmiclient.png
+${PLIST.desktop}${PLIST.qt}share/icons/hicolor/256x256/apps/vcmieditor.png
+${PLIST.desktop}share/icons/hicolor/32x32/apps/vcmiclient.png
+${PLIST.desktop}${PLIST.qt}share/icons/hicolor/32x32/apps/vcmieditor.png
+${PLIST.desktop}share/icons/hicolor/48x48/apps/vcmiclient.png
+${PLIST.desktop}${PLIST.qt}share/icons/hicolor/48x48/apps/vcmieditor.png
+${PLIST.desktop}share/icons/hicolor/512x512/apps/vcmiclient.png
+${PLIST.desktop}share/icons/hicolor/64x64/apps/vcmiclient.png
+${PLIST.desktop}${PLIST.qt}share/icons/hicolor/64x64/apps/vcmieditor.png
+${PLIST.desktop}share/icons/hicolor/scalable/apps/vcmiclient.svg
+${PLIST.desktop}${PLIST.qt}share/metainfo/eu.vcmi.VCMI.metainfo.xml
share/vcmi/Mods/vcmi/Content/Data/NotoSans-Medium.ttf
share/vcmi/Mods/vcmi/Content/Data/NotoSerif-Black.ttf
share/vcmi/Mods/vcmi/Content/Data/NotoSerif-Bold.ttf
Index: pkgsrc/games/vcmi/distinfo
diff -u pkgsrc/games/vcmi/distinfo:1.3 pkgsrc/games/vcmi/distinfo:1.4
--- pkgsrc/games/vcmi/distinfo:1.3 Tue Mar 18 09:43:00 2025
+++ pkgsrc/games/vcmi/distinfo Thu Oct 16 20:21:55 2025
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.3 2025/03/18 09:43:00 wiz Exp $
+$NetBSD: distinfo,v 1.4 2025/10/16 20:21:55 adam Exp $
-BLAKE2s (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = 752aabdf207e52c191d90ca89dcd8f6ff637faee89531b59deac5fe8040c0490
-SHA512 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) =
f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
-Size (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = 2194254 bytes
-BLAKE2s (vcmi-1.6.7.tar.gz) = 4b959af6e2a5468feb163d5c86a3057f83e40b3b5bce48b53bb100796388d1ee
-SHA512 (vcmi-1.6.7.tar.gz) = c7231a53a18884a483f888de3327014c12d8fa1d49142e41adacff7e852e3aa884f78f2a167c164a9e6cdf1d4ce9421d90385561b7f6f7737afd5f213342729b
-Size (vcmi-1.6.7.tar.gz) = 12106442 bytes
-BLAKE2s (vcmi-innoextract-9977089412ebafe9f79936aa65a2edf16a84ae3e.tar.gz) = 3fd52b79fd6378c52f00ff3043cff6401dbd832e16977d8645ab6ea8843fe81f
-SHA512 (vcmi-innoextract-9977089412ebafe9f79936aa65a2edf16a84ae3e.tar.gz) =
d78d70268afcc99badc62e1ac53f7c90add2af8818c34685e6ae505af8c4141024050fc6c861972cb51a696b62e9d368b77572b3c58ec8eddd1d04d5153a010e
-Size (vcmi-innoextract-9977089412ebafe9f79936aa65a2edf16a84ae3e.tar.gz) = 205354 bytes
+BLAKE2s (fuzzylite-fuzzylite-13b3122f5c353c0389ed4e66041d548c44ec9df6.tar.gz) = 18e7168f6ebeb87875d4009c28ca853c7d6c131e1c404de8672c294ddefc7925
+SHA512 (fuzzylite-fuzzylite-13b3122f5c353c0389ed4e66041d548c44ec9df6.tar.gz) =
b0f052a4b55605c4f49b9f6b85c84e8c58e3861ce57b8d99b8426f6a952541650469415fd6baff0218eb54858b9bee6989deddd72a4f85538b5b051f7cbec891
+Size (fuzzylite-fuzzylite-13b3122f5c353c0389ed4e66041d548c44ec9df6.tar.gz) = 3957398 bytes
+BLAKE2s (vcmi-1.6.8.tar.gz) = 1e3c69071f9c35a4eccd38f8aca8338660ee4433142d84488d3814166db074fd
+SHA512 (vcmi-1.6.8.tar.gz) = a9e9a458d10aeb3094792bd21c4c73a7a4861af9a7df29e7870ca1a7e82839a7f7a05cecfa6c1139aa91cffba0be93035a27a485d4d687dbe88b6440a48746c2
+Size (vcmi-1.6.8.tar.gz) = 12109092 bytes
+BLAKE2s (vcmi-innoextract-98bb55798a77c0346b12a1dbb53fe4d3e0379d66.tar.gz) = f6e76d60f988d1ba4fcb2036d77c8ede815f401a84d4518099cf14071384fcf1
+SHA512 (vcmi-innoextract-98bb55798a77c0346b12a1dbb53fe4d3e0379d66.tar.gz) =
f1d87d464622d77dbeea76a4731f9126f339b2d15e36cc87b8495f7dc6a1d0b971d5d28dc5b9e0c40e898fbc0c2399e631e4ed723ecf6b5cb731a8fdbffbe412
+Size (vcmi-innoextract-98bb55798a77c0346b12a1dbb53fe4d3e0379d66.tar.gz) = 205383 bytes
+SHA1 (patch-CMakeLists.txt) = 4e1a01e5d9fa04263cf3e3c03636ea1c8a9acb0b
SHA1 (patch-Global.h) = 7a587fa006fb4cb2ab3c9a48c303027a8baa6ed3
-SHA1 (patch-launcher_lib_innoextract_CMakeLists.txt) = 7899d3de73425ac91586dd97ddd73607def89eaa
+SHA1 (patch-launcher_lib_innoextract_CMakeLists.txt) = 1df24702ad1de1a4360d5d889d794c3818af161f
SHA1 (patch-lib_CStopWatch.h) = a5c75887c1fed973a46478de19b9c4f85838cb21
SHA1 (patch-lib_CThreadHelper.cpp) = bcbbf7c6cedaea3e5a763882618d71e7849289f9
SHA1 (patch-lib_modding_CModVersion.h) = 470f65e441bb8627e5b0bb53442015fa2cb91bd2
Index: pkgsrc/games/vcmi/patches/patch-launcher_lib_innoextract_CMakeLists.txt
diff -u pkgsrc/games/vcmi/patches/patch-launcher_lib_innoextract_CMakeLists.txt:1.1 pkgsrc/games/vcmi/patches/patch-launcher_lib_innoextract_CMakeLists.txt:1.2
--- pkgsrc/games/vcmi/patches/patch-launcher_lib_innoextract_CMakeLists.txt:1.1 Fri Jan 31 08:49:39 2025
+++ pkgsrc/games/vcmi/patches/patch-launcher_lib_innoextract_CMakeLists.txt Thu Oct 16 20:21:55 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-launcher_lib_innoextract_CMakeLists.txt,v 1.1 2025/01/31 08:49:39 wiz Exp $
+$NetBSD: patch-launcher_lib_innoextract_CMakeLists.txt,v 1.2 2025/10/16 20:21:55 adam Exp $
Fix typo.
---- launcher/lib/innoextract/CMakeLists.txt.orig 2025-01-31 08:12:08.158202957 +0000
+--- launcher/lib/innoextract/CMakeLists.txt.orig 2025-08-17 14:23:54.000000000 +0000
+++ launcher/lib/innoextract/CMakeLists.txt
-@@ -169,7 +169,7 @@ find_package(Boost REQUIRED COMPONENTS
- )
+@@ -173,7 +173,7 @@ if(Boost_MAJOR_VERSION EQUAL 1 AND Boost
+ endif()
list(APPEND LIBRARIES ${Boost_LIBRARIES})
link_directories(${Boost_LIBRARY_DIRS})
-include_directories(SYSTEM ${Boost_INCLUDE_DIR})
Added files:
Index: pkgsrc/games/vcmi/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/vcmi/patches/patch-CMakeLists.txt:1.1
--- /dev/null Thu Oct 16 20:21:55 2025
+++ pkgsrc/games/vcmi/patches/patch-CMakeLists.txt Thu Oct 16 20:21:55 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/10/16 20:21:55 adam Exp $
+
+Don't look for boost_system library.
+On Dawrin, don't make application bundle.
+
+--- CMakeLists.txt.orig 2025-04-24 19:50:03.000000000 +0000
++++ CMakeLists.txt
+@@ -462,7 +462,7 @@ endif()
+ # Finding packages #
+ ############################################
+
+-set(BOOST_COMPONENTS date_time filesystem locale program_options system thread)
++set(BOOST_COMPONENTS date_time filesystem locale program_options thread)
+ if(ENABLE_INNOEXTRACT)
+ list(APPEND BOOST_COMPONENTS iostreams)
+ endif()
+@@ -557,7 +557,7 @@ if(WIN32) # on Win everything goes into
+ set(BIN_DIR "." CACHE STRING "Where to install binaries")
+ set(LIB_DIR "." CACHE STRING "Where to install main library")
+ set(DATA_DIR "." CACHE STRING "Where to install data files")
+-elseif(APPLE)
++elseif(FALSE)
+ # includes lib path which determines where to install shared libraries (either /lib or /lib64)
+ include(GNUInstallDirs)
+
+@@ -876,7 +876,7 @@ if(WIN32)
+ if(NOT (${CMAKE_CROSSCOMPILING}))
+ add_subdirectory(win)
+ endif()
+-elseif(APPLE_MACOS AND NOT ENABLE_MONOLITHIC_INSTALL)
++elseif(FALSE)
+ set(CPACK_MONOLITHIC_INSTALL 1)
+ set(CPACK_GENERATOR "DragNDrop")
+ set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/osx/dmg_background.png")
Home |
Main Index |
Thread Index |
Old Index