From nobody Thu Feb 24 19:05:57 2022 X-Original-To: dev-commits-ports-all@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 53A4B19D804F; Thu, 24 Feb 2022 19:05:58 +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 4K4MnK70NWz4TRC; Thu, 24 Feb 2022 19:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645729558; 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=dB/LhHxn3ihDElNvAd+62yQH00nXm+oa3fJ3aqmwfds=; b=fHr5Vb0/AEqPAP35cMoSB2RdsS/YIQP3hXtKcKTAoDwtbwiUh814G5EYjIBK9vP0buFyZQ AZaQMvG79pbKlym5Px/cxrhY9BLk4lar5ERMLUN8dB4TRfIYFjMBOYQmdlopmOEPYCH5rE csSTfkWmajMzS6wTQP2NK54/e/1I+U8UpZUVj0cf3kUrbQo6D1CcxZjPmtnsshBSUhoZOv 7iNyRypJGa6FaTzegi9KazI0nror0aNgH03C/IpdZCQdv4WD86236AVVKFVi23GRFLlaNk kqBb1i75b+ffQMLV/iKn+4pot9EQS+OOUKHOaPAkH+jnrTDQUnk5vh8Y6x/f3g== 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 7DDBA11BCC; Thu, 24 Feb 2022 19:05:57 +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 21OJ5vMV028453; Thu, 24 Feb 2022 19:05:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21OJ5vYf028452; Thu, 24 Feb 2022 19:05:57 GMT (envelope-from git) Date: Thu, 24 Feb 2022 19:05:57 GMT Message-Id: <202202241905.21OJ5vYf028452@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: c15f801dad29 - main - =?utf-8?Q?games/DDNet: update 15.8.1 =E2=86=92 15.9?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: c15f801dad29dd908c8df3e0d0dbb114f1214558 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645729558; 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=dB/LhHxn3ihDElNvAd+62yQH00nXm+oa3fJ3aqmwfds=; b=KtiZGYM8UgNcS92dD7t6o8SSdWGNONxJIDazfXWOeWe24rKDe3tY7uFpaGRbyvXnh6jqn9 XUhohJjFMoNIW6qSZhXXdXn0b4du4tRKT4dHPPt5KZPCo0tCM7JBNHaFWMXFy4IveBqbcA L55lu32nwkP0KPMX4vUu9gqopq3NGAz49yUhFo+x5y3kebf8zdMehHivSdQSg4tPG7ebLw 7OS/BgKZ4S5tqfUUH9DgkloyYU5M6/IcBQiX6NN7TgPAZBfT9DEtC9LQYa1/9uGmk6EN0B Djn4PHNx6VkUxrTqJIYLufXCCsRkLZ+pjHS8xTPSrclvPotNtneHdptRGa5fsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645729558; a=rsa-sha256; cv=none; b=yGX3sk9rYD0648jRj65FhPJZgMGY17l+p6QhiO07+lEXemHmFczetEU3M/T21K/LeMvlGW bOOIBOb68LNolw02GT8p9V0VQfeZCZqMEPPSblzbYZGXfY40sPAwYXZY9oXHPIxYO7df7p yo8yjRujI0ptWLQKwoowPg4Jh/CXm5BzSFrSzESMgHLjJMGrIfesENDmiyuv9gppvggx7B pikkyPh8Fxd70qC0eCfHgssVtd+GeHEWsfohMooAnLK5prazbJWPZmN5jRwMd4ac8r/dxp BHNo8N808BVWZ/iUZOWEbYNsMoRdYXq2qo8JIqs5XnvOzv+LXqCB+HBsFOj7Jw== 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=c15f801dad29dd908c8df3e0d0dbb114f1214558 commit c15f801dad29dd908c8df3e0d0dbb114f1214558 Author: Dmitry Marakasov AuthorDate: 2022-02-24 18:59:26 +0000 Commit: Dmitry Marakasov CommitDate: 2022-02-24 19:05:33 +0000 games/DDNet: update 15.8.1 → 15.9 --- games/DDNet/Makefile | 19 +++++++++++++++---- games/DDNet/distinfo | 6 +++--- games/DDNet/files/patch-CMakeLists.txt | 24 ++++++++++++++++++++++++ games/DDNet/pkg-plist | 8 +++++--- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile index 87a1262f1e02..957d4c117a50 100644 --- a/games/DDNet/Makefile +++ b/games/DDNet/Makefile @@ -1,5 +1,5 @@ PORTNAME= DDNet -PORTVERSION= 15.8.1 +PORTVERSION= 15.9 CATEGORIES= games MASTER_SITES= https://ddnet.tw/downloads/ @@ -9,6 +9,8 @@ COMMENT= DDraceNetwork, a cooperative racing mod of Teeworlds LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.txt +LIB_DEPENDS= libpnglite.so:graphics/pnglite + USES= cmake compiler:c++11-lang pkgconfig python sqlite:3 ssl tar:xz CMAKE_ARGS= -DPYTHON_EXECUTABLE="${PYTHON_CMD}" CMAKE_OFF= AUTOUPDATE DOWNLOAD_GTEST PREFER_BUNDLED_LIBS @@ -18,8 +20,10 @@ CXXFLAGS+= -DBINARY_DIR="\\\"${PREFIX}/bin\\\"" PORTDATA= * DATADIR= ${PREFIX}/share/ddnet -OPTIONS_DEFINE= CLIENT TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP -OPTIONS_DEFAULT= CLIENT TEST VIDEORECORDER UPNP +OPTIONS_DEFINE= TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP +OPTIONS_MULTI= COMPONENTS +OPTIONS_MULTI_COMPONENTS=CLIENT SERVER +OPTIONS_DEFAULT= CLIENT SERVER TEST VIDEORECORDER UPNP OPTIONS_SUB= yes CLIENT_DESC= Build game client @@ -28,13 +32,19 @@ CLIENT_USES= gettext gl sdl xorg desktop-file-utils CLIENT_USE= GL=gl,glew SDL=sdl2 CLIENT_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libwavpack.so:audio/wavpack \ - libpnglite.so:graphics/pnglite \ libopusfile.so:audio/opusfile \ libopus.so:audio/opus \ libogg.so:audio/libogg \ libnotify.so:devel/libnotify \ libcurl.so:ftp/curl +SERVER_DESC= Build game server +SERVER_CMAKE_BOOL= SERVER +# does not build without these libs, but does not need them in +# runtime either +SERVER_BUILD_DEPENDS= glew>=0:graphics/glew \ + wavpack>=0:audio/wavpack + TEST_BUILD_DEPENDS= googletest>=0:devel/googletest TEST_TEST_TARGET= run_tests @@ -54,6 +64,7 @@ VIDEORECORDER_LIB_DEPENDS=libavcodec.so:multimedia/ffmpeg UPNP_DESC= UPnP support for the server UPNP_CMAKE_BOOL= UPNP UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc +UPNP_IMPLIES= SERVER post-extract: # json-parser and md5 are left intact diff --git a/games/DDNet/distinfo b/games/DDNet/distinfo index d36430724746..58f4348f5d66 100644 --- a/games/DDNet/distinfo +++ b/games/DDNet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640797431 -SHA256 (DDNet-15.8.1.tar.xz) = c95665d7618d9c2d494c942cd6fcf4a511cc59dfa61a7b48fcc3944dae8d661b -SIZE (DDNet-15.8.1.tar.xz) = 27092832 +TIMESTAMP = 1644795339 +SHA256 (DDNet-15.9.tar.xz) = dfd0409719a1ca11087323a13df915b58b02b0ec67bd7f99af62aeb833b17acf +SIZE (DDNet-15.9.tar.xz) = 26690820 diff --git a/games/DDNet/files/patch-CMakeLists.txt b/games/DDNet/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d87f98845d88 --- /dev/null +++ b/games/DDNet/files/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +--- CMakeLists.txt.orig 2022-02-12 22:26:38 UTC ++++ CMakeLists.txt +@@ -2566,11 +2566,17 @@ if(NOT DEV) + install(TARGETS ${TARGET_ANTIBOT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT server) + endif() + install(TARGETS ${TARGETS_TOOLS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT tools) +- install(FILES other/ddnet.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications COMPONENT client) +- install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client) ++ if(CLIENT) ++ install(FILES other/ddnet.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications COMPONENT client) ++ install(FILES other/ddnet.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo COMPONENT client) ++ endif() + foreach(SIZE 16 32 48 256) +- install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client) +- install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server) ++ if(CLIENT) ++ install(FILES other/icons/DDNet_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet.png COMPONENT client) ++ endif() ++ if(SERVER) ++ install(FILES other/icons/DDNet-Server_${SIZE}x${SIZE}x32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME ddnet-server.png COMPONENT server) ++ endif() + endforeach() + endif() + diff --git a/games/DDNet/pkg-plist b/games/DDNet/pkg-plist index 9d2ad8e54570..5be0080002ca 100644 --- a/games/DDNet/pkg-plist +++ b/games/DDNet/pkg-plist @@ -1,5 +1,5 @@ %%CLIENT%%bin/DDNet -bin/DDNet-Server +%%SERVER%%bin/DDNet-Server lib/ddnet/config_retrieve lib/ddnet/config_store lib/ddnet/crapnet @@ -16,10 +16,12 @@ lib/ddnet/packetgen lib/ddnet/unicode_confusables lib/ddnet/uuid %%CLIENT%%share/applications/ddnet.desktop -%%CLIENT%%share/icons/hicolor/128x128/apps/ddnet.png %%CLIENT%%share/icons/hicolor/16x16/apps/ddnet.png +%%SERVER%%share/icons/hicolor/16x16/apps/ddnet-server.png %%CLIENT%%share/icons/hicolor/256x256/apps/ddnet.png +%%SERVER%%share/icons/hicolor/256x256/apps/ddnet-server.png %%CLIENT%%share/icons/hicolor/32x32/apps/ddnet.png +%%SERVER%%share/icons/hicolor/32x32/apps/ddnet-server.png %%CLIENT%%share/icons/hicolor/48x48/apps/ddnet.png -%%CLIENT%%share/icons/hicolor/512x512/apps/ddnet.png +%%SERVER%%share/icons/hicolor/48x48/apps/ddnet-server.png %%CLIENT%%share/metainfo/ddnet.appdata.xml