Date: Tue, 12 Jan 2021 21:40:24 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561387 - in head/games/wyrmgus: . files Message-ID: <202101122140.10CLeOI8009014@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jan 12 21:40:23 2021 New Revision: 561387 URL: https://svnweb.freebsd.org/changeset/ports/561387 Log: - Update to 4.1.1 Added: head/games/wyrmgus/files/ head/games/wyrmgus/files/patch-src_database_data__type.h (contents, props changed) Modified: head/games/wyrmgus/Makefile head/games/wyrmgus/distinfo Modified: head/games/wyrmgus/Makefile ============================================================================== --- head/games/wyrmgus/Makefile Tue Jan 12 21:39:50 2021 (r561386) +++ head/games/wyrmgus/Makefile Tue Jan 12 21:40:23 2021 (r561387) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= wyrmgus -PORTVERSION= 3.5.4 +PORTVERSION= 4.1.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 CATEGORIES= games devel MAINTAINER= amdmi3@FreeBSD.org @@ -13,25 +12,23 @@ COMMENT= Modified Stratagus engine for Wyrmsun LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png \ - libtolua++-${LUA_VER}.so:lang/tolua++ \ - libogg.so:audio/libogg \ - liboaml.so:audio/oaml +LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++ BUILD_DEPENDS= ${LOCALBASE}/include/boost/tokenizer.hpp:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= Andrettin GH_PROJECT= Wyrmgus -USES= cmake compiler:c++11-lib lua:51 pkgconfig sdl sqlite -USE_SDL= sdl +USES= cmake compiler:c++17-lang lua:51 pkgconfig sdl sqlite qt:5 xorg +USE_QT= core gui widgets multimedia location declarative network \ + qmake_build buildtools_build +USE_XORG= x11 +USE_SDL= sdl mixer CMAKE_ARGS= -DGAMEDIR:STRING="bin" \ -DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \ -DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \ -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" \ - -DENABLE_USEGAMEDIR:BOOL=OFF \ - -DWITH_MIKMOD:BOOL=OFF \ - -DWITH_THEORA:BOOL=OFF + -DENABLE_USEGAMEDIR:BOOL=OFF PORTDOCS= * @@ -46,13 +43,7 @@ OPENGL_USE= GL=gl,glu OPENGL_CMAKE_ON= -DWITH_RENDERER="OpenGL" OPENGL_CMAKE_OFF= -DWITH_RENDERER="NativeSDL" -post-patch: -# fix debug build - @${REINPLACE_CMD} -e 's|OAML_LIBRARIES_SHARED_DEBUG|OAML_LIBRARIES_SHARED|' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e '/stratagus-dbg/ d' ${WRKSRC}/CMakeLists.txt - -do-install: - ${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/stratagus ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-install: ${INSTALL_DATA} ${WRKSRC}/src/win32/wyrmsun.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ .include <bsd.port.mk> Modified: head/games/wyrmgus/distinfo ============================================================================== --- head/games/wyrmgus/distinfo Tue Jan 12 21:39:50 2021 (r561386) +++ head/games/wyrmgus/distinfo Tue Jan 12 21:40:23 2021 (r561387) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547559385 -SHA256 (Andrettin-Wyrmgus-v3.5.4_GH0.tar.gz) = 34218e69d758a0bf75e2ba1ab8b3557fcb7304922fc88c2d5e5b0f5e5ac8f187 -SIZE (Andrettin-Wyrmgus-v3.5.4_GH0.tar.gz) = 1490425 +TIMESTAMP = 1610282165 +SHA256 (Andrettin-Wyrmgus-v4.1.1_GH0.tar.gz) = 97950652a6b9ab2f94d7b794e0ef1f5932f0479682dac30d7d10108a1f1dd990 +SIZE (Andrettin-Wyrmgus-v4.1.1_GH0.tar.gz) = 1536309 Added: head/games/wyrmgus/files/patch-src_database_data__type.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wyrmgus/files/patch-src_database_data__type.h Tue Jan 12 21:40:23 2021 (r561387) @@ -0,0 +1,33 @@ +diff --git a/src/database/data_type.h b/src/database/data_type.h +index 1e9aa40ce..645cb217e 100644 +--- src/database/data_type.h ++++ src/database/data_type.h +@@ -52,6 +52,15 @@ template <typename T> + class data_type : public data_type_base + { + public: ++ data_type() { ++ // this check is required for class_initialized variable and, ++ // correspondingly, data_type::initialize_class() call not to ++ // be initialized away ++ if (!class_initialized) { ++ throw std::runtime_error("Never reached"); ++ } ++ } ++ + static T *get(const std::string &identifier) + { + if (identifier == "none") { +@@ -308,12 +317,7 @@ class data_type : public data_type_base + static inline std::map<std::string, qunique_ptr<T>> instances_by_identifier; + static inline std::map<std::string, T *> instances_by_alias; + static inline data_module_map<std::vector<sml_data>> sml_data_to_process; +-#ifdef __GNUC__ +- //the "used" attribute is needed under GCC, or else this variable will be optimized away (even in debug builds) +- static inline bool class_initialized [[gnu::used]] = data_type::initialize_class(); +-#else + static inline bool class_initialized = data_type::initialize_class(); +-#endif + }; + + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101122140.10CLeOI8009014>