From nobody Tue Dec 21 19:59:30 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 553E9191018C; Tue, 21 Dec 2021 19:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJS3738Qpz3C45; Tue, 21 Dec 2021 19:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1354F7F9F; Tue, 21 Dec 2021 19:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLJxU09055507; Tue, 21 Dec 2021 19:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLJxUNr055506; Tue, 21 Dec 2021 19:59:30 GMT (envelope-from git) Date: Tue, 21 Dec 2021 19:59:30 GMT Message-Id: <202112211959.1BLJxUNr055506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: e3b57880cd79 - main - games/stratagus: update to 3.1.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3b57880cd79ef4483f3b83fe5d4e930799e7986 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640116771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxJk7pPWKbKoRfRmRWiOEMDynBrDvlZozOIm2dUA1Ms=; b=Qq4GPysMWFvJodNsO7bU7uhsBcWnCtEVrQVDe3PdPSCq4CBYpRel8djpo9DybvjPLDlj2e 5tHGbo6KncGciFj76idTuUNzvEbHHhzZJM4oQCXfqXELCWshVF/hyBUHPdBxkQ7UoC7yjK pskEXu51zPuFbf/Fl0MuhQjaAFV+1SJcG6x5NOXVxZRniSCvqA3qnWT6u1TpnuIvs7s2xN 5htdxQD2+FR2+vKhKwutXTudbZl+m96Heac4Sk2EuHc9D6xuzCuxprKOPRo8g8kOdMllfO nKpPFeXbYDqLjviNqp+NaqFqTpUTG22pnrGwC+eVGHe4DM0fU66hFz2GjbdwVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640116771; a=rsa-sha256; cv=none; b=h8+ImUuWBRLtiEAoV/c7A9frm7WXOLDDJuEFue8HQVbFkdXxI1iOS2uD2kSJ3D/MbgtqK7 GKBqKU3ShMa5DMorqeFPzV8VeOZfjN1w2qseTItRvN0MroqliryLs/b7TyymR+h58rL7EW m9GFt0bcP6NmRP+QM+cGG46Cq5udysmnBloIoR8riuqwmJikGlxwjVaEoohGTHriQoyjE4 g/Ihy2j3w3JRFDfNB+FRPdk4jd+v0tcj8EL3iSYExwpLQe84wajywgXqdeshRTGheCdbuA GyDetNtz+6twmeSN28ldGr6SFUF919xXjmexgwJRoMMLDRVu123wpBR7Q4AXAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3b57880cd79ef4483f3b83fe5d4e930799e7986 commit e3b57880cd79ef4483f3b83fe5d4e930799e7986 Author: Dmitry Marakasov AuthorDate: 2021-12-20 17:41:10 +0000 Commit: Dmitry Marakasov CommitDate: 2021-12-21 19:57:54 +0000 games/stratagus: update to 3.1.2 PR: 260562 Submitted by: agh@riseup.net --- games/stratagus/Makefile | 40 ++++------------ games/stratagus/distinfo | 6 +-- games/stratagus/files/patch-CMakeLists.txt | 56 ++++++++++++++++++++++ .../patch-gameheaders_stratagus-tinyfiledialogs.h | 13 +++++ games/stratagus/pkg-descr | 5 +- games/stratagus/pkg-message | 13 +++-- games/stratagus/pkg-plist | 4 +- 7 files changed, 90 insertions(+), 47 deletions(-) diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 7908620c9c26..1122810f8a3f 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -1,9 +1,8 @@ # Created by: Travis Poppe PORTNAME= stratagus -PORTVERSION= 2.4.2 +PORTVERSION= 3.1.2 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -14,26 +13,24 @@ 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++11-lang gl lua:51 pkgconfig sdl sqlite python:run -USE_GL= gl glu -USE_SDL= sdl +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= MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS -OPTIONS_DEFAULT=MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH - -MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod -MIKMOD_CMAKE_BOOL= WITH_MIKMOD +OPTIONS_DEFINE= MNG THEORA VORBIS DOCS +OPTIONS_DEFAULT=MNG THEORA VORBIS MNG_DESC= MNG image library support MNG_LIB_DEPENDS= libmng.so:graphics/libmng @@ -46,31 +43,10 @@ VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_CMAKE_BOOL= WITH_OGGVORBIS -X11_DESC= X11 clipboard pasting support -X11_USES= xorg -X11_USE= XORG=x11 -X11_CMAKE_BOOL= WITH_X11 - -FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -FLUIDSYNTH_CMAKE_BOOL= WITH_FLUIDSYNTH - -post-patch: - @${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|' \ - ${WRKSRC}/gameheaders/stratagus-tinyfiledialogs.h - -post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/stratagus.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 - -post-install-DOCS-on: - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[a-z]*.html *.txt graphics scripts" \ - ${STAGEDIR}${DOCSDIR} - .include .if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS+= -Wno-c++11-narrowing -.else -CXXFLAGS+= -Wno-error +CXXFLAGS+= -Wno-register # incompatible code included from lcms .endif .include diff --git a/games/stratagus/distinfo b/games/stratagus/distinfo index 037e96ccb24b..f4b2a048d3a9 100644 --- a/games/stratagus/distinfo +++ b/games/stratagus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538587339 -SHA256 (Wargus-stratagus-v2.4.2_GH0.tar.gz) = 366be8255c7e7cb694661b5db08b81908885a8ff89007d6e24769bf619235b89 -SIZE (Wargus-stratagus-v2.4.2_GH0.tar.gz) = 1114717 +TIMESTAMP = 1640017839 +SHA256 (Wargus-stratagus-v3.1.2_GH0.tar.gz) = e88dbf5e9136329d5fbba403224465633c0b06c307dd1abef4073d58f34464e5 +SIZE (Wargus-stratagus-v3.1.2_GH0.tar.gz) = 1190124 diff --git a/games/stratagus/files/patch-CMakeLists.txt b/games/stratagus/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..19cda636d2ba --- /dev/null +++ b/games/stratagus/files/patch-CMakeLists.txt @@ -0,0 +1,56 @@ +--- CMakeLists.txt.orig 2021-07-17 05:26:07 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() + 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(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}) + + 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 new file mode 100644 index 000000000000..a70acf33aa2d --- /dev/null +++ b/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h @@ -0,0 +1,13 @@ +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. + +--- gameheaders/stratagus-tinyfiledialogs.h.orig 2021-07-17 05:26:07 UTC ++++ gameheaders/stratagus-tinyfiledialogs.h +@@ -2350,6 +2350,7 @@ static int gdialogPresent ( ) + + static int osascriptPresent ( ) + { ++ return 0; + static int lOsascriptPresent = -1 ; + if ( lOsascriptPresent < 0 ) + { diff --git a/games/stratagus/pkg-descr b/games/stratagus/pkg-descr index 8a86c3e7d9af..f1f8faaa46b2 100644 --- a/games/stratagus/pkg-descr +++ b/games/stratagus/pkg-descr @@ -2,6 +2,7 @@ Stratagus is a free cross-platform real-time strategy gaming engine. It includes support for playing over the internet/LAN, or playing a computer opponent. The engine is configurable and can be used to create games with a wide-range of features specific to your needs. See the data sets page -for a list of current games using the stratagus engine. +for a list of current games using the Stratagus engine. -WWW: https://launchpad.net/stratagus +WWW: https://stratagus.com/stratagus.html +WWW: https://github.com/Wargus/stratagus diff --git a/games/stratagus/pkg-message b/games/stratagus/pkg-message index 24330fad15cf..feba75931ffd 100644 --- a/games/stratagus/pkg-message +++ b/games/stratagus/pkg-message @@ -1,16 +1,15 @@ [ { type: install message: <