diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 1122810f8a3f..636d15e370bc 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -1,52 +1,52 @@ # Created by: Travis Poppe PORTNAME= stratagus -PORTVERSION= 3.1.2 +PORTVERSION= 3.2.0 DISTVERSIONPREFIX= v CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free cross-platform real-time strategy gaming engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libtolua++-${LUA_VER}.so:lang/tolua++ RUN_DEPENDS= zenity:x11/zenity USE_GITHUB= yes GH_ACCOUNT= Wargus USES= cmake compiler:c++17-lang lua:51 pkgconfig sdl USE_SDL= sdl2 mixer2 image2 CMAKE_ARGS= -DGAMEDIR:STRING="bin" \ -DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \ -DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \ -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" CMAKE_ON= ENABLE_DEV CMAKE_OFF= WITH_STACKTRACE # not in ports PORTDOCS= * OPTIONS_DEFINE= MNG THEORA VORBIS DOCS OPTIONS_DEFAULT=MNG THEORA VORBIS MNG_DESC= MNG image library support MNG_LIB_DEPENDS= libmng.so:graphics/libmng MNG_CMAKE_BOOL= WITH_MNG THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CMAKE_BOOL= WITH_THEORA VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_CMAKE_BOOL= WITH_OGGVORBIS .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-register # incompatible code included from lcms .endif .include diff --git a/games/stratagus/distinfo b/games/stratagus/distinfo index f4b2a048d3a9..4d274b5e6812 100644 --- a/games/stratagus/distinfo +++ b/games/stratagus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640017839 -SHA256 (Wargus-stratagus-v3.1.2_GH0.tar.gz) = e88dbf5e9136329d5fbba403224465633c0b06c307dd1abef4073d58f34464e5 -SIZE (Wargus-stratagus-v3.1.2_GH0.tar.gz) = 1190124 +TIMESTAMP = 1640690292 +SHA256 (Wargus-stratagus-v3.2.0_GH0.tar.gz) = 6fef6934714b80fabd61fde97cff5f0918a20ca490fcff7adbcebc3e899a8bee +SIZE (Wargus-stratagus-v3.2.0_GH0.tar.gz) = 1537172 diff --git a/games/stratagus/files/patch-CMakeLists.txt b/games/stratagus/files/patch-CMakeLists.txt index 19cda636d2ba..0c1bc6f73b2f 100644 --- a/games/stratagus/files/patch-CMakeLists.txt +++ b/games/stratagus/files/patch-CMakeLists.txt @@ -1,56 +1,20 @@ ---- CMakeLists.txt.orig 2021-07-17 05:26:07 UTC +--- CMakeLists.txt.orig 2021-12-24 20:26:54 UTC +++ CMakeLists.txt -@@ -814,15 +814,7 @@ endif() - - # Stratagus needs to have char by default signed - # No idea how to tell this to other compilers --if(CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Werror") --endif() --if(CMAKE_COMPILER_IS_GNUC) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char") --endif() --if(WIN32 AND MSVC) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") --endif() -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char") - - if(CMAKE_BUILD_TYPE STREQUAL "Profile") - find_package(coz-profiler) -@@ -1195,22 +1187,20 @@ endif() +@@ -1238,7 +1238,6 @@ endif() install(TARGETS stratagus DESTINATION ${GAMEDIR}) install(TARGETS png2stratagus DESTINATION ${BINDIR}) -if(ENABLE_DOC AND DOXYGEN_FOUND) -- install(FILES doc/stratagus.6 DESTINATION ${MANDIR}) -- install(FILES -- doc/development.html -- doc/faq.html -- doc/gpl.html -- doc/guichan-copyright.txt -- doc/changelog.html -- doc/index.html -- doc/install.html -- doc/media.html -- doc/README-SDL.txt -- DESTINATION share/doc/stratagus -- ) + install(FILES doc/stratagus.6 DESTINATION ${MANDIR}) + install(FILES + doc/development.html +@@ -1252,8 +1251,7 @@ if(ENABLE_DOC AND DOXYGEN_FOUND) + doc/README-SDL.txt + DESTINATION share/doc/stratagus + ) - install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR}) -endif(ENABLE_DOC AND DOXYGEN_FOUND) -+install(FILES doc/stratagus.6 DESTINATION ${MANDIR}) -+install(FILES -+ doc/development.html -+ doc/faq.html -+ doc/gpl.html -+ doc/guichan-copyright.txt -+ doc/changelog.html -+ doc/index.html -+ doc/install.html -+ doc/media.html -+ doc/README-SDL.txt -+ DESTINATION share/doc/stratagus -+) -+install(DIRECTORY doc/graphics doc/scripts DESTINATION ${DOCDIR}) ++ install(DIRECTORY doc/graphics doc/scripts DESTINATION ${DOCDIR}) if(ENABLE_DEV) install(FILES ${gameheaders_HDRS} DESTINATION ${STRATAGUS_HEADERS}) diff --git a/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h b/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h index a70acf33aa2d..89b6319d565e 100644 --- a/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h +++ b/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h @@ -1,13 +1,30 @@ -We don't currently have osascript in ports, but for the case when -we actually do, make sure it's not suddenly called and prefer zenity. +Break overly clever and inconsistent logic of detecting a tool to +display a dialog box, always stick to zenity. Don't try to beep +too. --- gameheaders/stratagus-tinyfiledialogs.h.orig 2021-07-17 05:26:07 UTC +++ gameheaders/stratagus-tinyfiledialogs.h -@@ -2350,6 +2350,7 @@ static int gdialogPresent ( ) +@@ -3676,6 +3676,7 @@ static int gdialogPresent(void) - static int osascriptPresent ( ) + static int osascriptPresent(void) { + return 0; - static int lOsascriptPresent = -1 ; - if ( lOsascriptPresent < 0 ) - { + static int lOsascriptPresent = -1 ; + if (lOsascriptPresent < 0) { + gWarningDisplayed |= !!getenv("SSH_TTY"); +@@ -3779,6 +3780,7 @@ int tfd_zenity3Present(void) + + int tfd_kdialogPresent(void) + { ++ return 0; + static int lKdialogPresent = -1 ; + char lBuff[MAX_PATH_OR_CMD] ; + FILE *lIn ; +@@ -3974,6 +3976,7 @@ static void sigHandler(int signum) + + void tinyfd_beep(void) + { ++ return; + char lDialogString[256] ; + FILE *lIn ; +