From nobody Fri Jan 13 19:13:10 2023 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 4Ntrfb2Dz9z2shTr; Fri, 13 Jan 2023 19:13:11 +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 4Ntrfb1QrZz3kYR; Fri, 13 Jan 2023 19:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673637191; 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=03Yh87kWPANr4zuv6r5CPAzNmmS/Gg3tRCzKZwTToIo=; b=VnuU+ysIDyidacZVmhijTvSHfjh1A7lXA6/TscZFEjOueEztVPsg1jxr1uUtJuXm6Lvli8 ErOWnfl2EMFoFjm8krXJyRYpd0PuiUMScqC4KiXaCO2PkR43B4JT31QTtxuwOqLcqif+80 wIi0Qiw40Ofg/S7O7kvKL4wrCLWtP5REYaXAtGnIRTTlHT7KM2AdDsA2KTqaKhefO0syfG 28rJ3WaHX+derOJPLxGPjf1oIXgKj/0pLiWeJIRkX3SruqmGdXEN9nmyTx+feWU+ZkUdPu bctEnpB8VurT5Xvcu9od0yA9dEzKWbHtGXuz/NzTJN4ayIzT5aLvwAwhCKU6Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673637191; 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=03Yh87kWPANr4zuv6r5CPAzNmmS/Gg3tRCzKZwTToIo=; b=YMP/KX0bkDytvitYGAqA5ezXsY470jCcvYNf0WHv/29YmONdsJeatLg2MPAhOGe7z+YAXv QZh/F5QqAq4kopd64OQPRjlOiGeEcq3Fx7CSayVKUTIvmUMYHSNcaGOnjlSJ/0h0tfGYuz ooLfmPWyrc8vhpKUIYgLk61OjYZRNlxe6sGwd8sd2+KT/6NBBUTH8Diziu4gn95IXZwy37 IJh/B/gOAwuc85nb4VFGRV3Vjf3BbyTB13MnmMfYR2mns+eydWQNZ6SY+aCEfK+e+bW8Qr gbkcVMGBlRriy+5znnLAcTSKvpGSxK9JyuUzRk9p4H6BXpirIPJqFTlOplXiNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673637191; a=rsa-sha256; cv=none; b=oX95cGTWLHH5RxD+fQRxG/NXkzGkkQdkIotE4QlpfNOrFU+3Nctu4+8fvSLz4C0eWNSVQQ YFFywAFuPk7xg1UFtDG1SXLmkbqIVrEL11eTWZJl54bGpOAgqpt4szDkURtD1ZTsh5t0mQ DbCDC6ZZp1VAo6BQf+RbhGuwlVEa6KRok3IbJjBuQQZRT0BCWdD+XrQX+UEL6ncWTSrNHk BqTrwBasvr5QeNOni+LO7NYsnrDaYJIIGoIFbYEF/r7rBeN73E0mYhxurNw/rNpJZnaQ03 D4US/VaJscDBTz3hwugvM4QU79kSzfRFlDFGwSEhqPdJoNzNHrFZlHQ3GZ1EZw== 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 4Ntrfb0TbnzJZt; Fri, 13 Jan 2023 19:13:11 +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 30DJDAp9052777; Fri, 13 Jan 2023 19:13:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DJDA7T052776; Fri, 13 Jan 2023 19:13:10 GMT (envelope-from git) Date: Fri, 13 Jan 2023 19:13:10 GMT Message-Id: <202301131913.30DJDA7T052776@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: 1e70e1e8bedb - main - =?utf-8?Q?games/DDNet:=20update=2016.5=20=E2=86=92=2016.7.1?= 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: 1e70e1e8bedb7463c4fdf80386093b5abf86084b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e70e1e8bedb7463c4fdf80386093b5abf86084b commit 1e70e1e8bedb7463c4fdf80386093b5abf86084b Author: Dmitry Marakasov AuthorDate: 2023-01-13 13:00:33 +0000 Commit: Dmitry Marakasov CommitDate: 2023-01-13 19:12:46 +0000 games/DDNet: update 16.5 → 16.7.1 --- games/DDNet/Makefile | 28 ++++++++++++++++++++++++---- games/DDNet/distinfo | 24 +++++++++++++++++++++--- games/DDNet/files/patch-CMakeLists.txt | 22 ++++++++++++++++++---- 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile index b299fbda262b..c54df00e8418 100644 --- a/games/DDNet/Makefile +++ b/games/DDNet/Makefile @@ -1,7 +1,8 @@ PORTNAME= DDNet -PORTVERSION= 16.5 +PORTVERSION= 16.7.1 CATEGORIES= games MASTER_SITES= https://ddnet.tw/downloads/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= amdmi3@FreeBSD.org COMMENT= DDraceNetwork, a cooperative racing mod of Teeworlds @@ -12,12 +13,26 @@ LICENSE_FILE= ${WRKSRC}/license.txt LIB_DEPENDS= libpng.so:graphics/png -USES= cmake compiler:c++17-lang pkgconfig python sqlite:3 ssl tar:xz +USES= cargo cmake compiler:c++17-lang pkgconfig python sqlite:3 ssl tar:xz CMAKE_ARGS= -DPYTHON_EXECUTABLE="${PYTHON_CMD}" CMAKE_OFF= AUTOUPDATE DOWNLOAD_GTEST PREFER_BUNDLED_LIBS CXXFLAGS+= -DBINARY_DIR="\\\"${PREFIX}/bin\\\"" +CARGO_INSTALL= no +CARGO_TEST= no +CARGO_CRATES= cc-1.0.73 \ + cxx-1.0.71 \ + cxxbridge-flags-1.0.71 \ + cxxbridge-macro-1.0.71 \ + link-cplusplus-1.0.6 \ + proc-macro2-1.0.40 \ + quote-1.0.20 \ + syn-1.0.98 \ + unicode-ident-1.0.1 +CARGO_TARGET_DIR=${BUILD_WRKSRC} +CARGO_ENV+= DDNET_TEST_NO_LINK=1 + PORTDATA= * DATADIR= ${PREFIX}/share/ddnet @@ -26,7 +41,7 @@ TEST_ENV= ${MAKE_ENV} GTEST_FILTER=-Io.CurrentExe:Jobs.LookupHost:Io.CurrentExe: OPTIONS_DEFINE= TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP VULKAN OPTIONS_MULTI= COMPONENTS OPTIONS_MULTI_COMPONENTS=CLIENT SERVER -OPTIONS_DEFAULT= CLIENT SERVER TEST VIDEORECORDER UPNP VULKAN +OPTIONS_DEFAULT= CLIENT SERVER VIDEORECORDER UPNP VULKAN OPTIONS_SUB= yes CLIENT_DESC= Build game client @@ -49,7 +64,7 @@ SERVER_BUILD_DEPENDS= glew>=0:graphics/glew \ wavpack>=0:audio/wavpack TEST_BUILD_DEPENDS= googletest>=0:devel/googletest -TEST_TEST_TARGET= run_tests +TEST_TEST_TARGET= run_tests # tests are broken WEBSOCKETS_DESC= Enable WebSocket support for server WEBSOCKETS_CMAKE_BOOL= WEBSOCKETS @@ -82,6 +97,11 @@ post-extract: @${RM} -r ${WRKSRC}/src/engine/external/${dep} .endfor +post-build: + @${ECHO_MSG} "===> Returning from cargo build to cmake build" + @${FIND} ${BUILD_WRKSRC} -name libddnet_engine_shared.a -exec ${CP} -p {} ${BUILD_WRKSRC}/release/ \; + @cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET} + post-patch: @${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt diff --git a/games/DDNet/distinfo b/games/DDNet/distinfo index 0b4fcd28a8ae..6666480f0c29 100644 --- a/games/DDNet/distinfo +++ b/games/DDNet/distinfo @@ -1,3 +1,21 @@ -TIMESTAMP = 1666797498 -SHA256 (DDNet-16.5.tar.xz) = 40393ca0c760bd256ef1b7f62f537dbad5593ba8e208170954ea4844ab66a066 -SIZE (DDNet-16.5.tar.xz) = 28656532 +TIMESTAMP = 1673548691 +SHA256 (DDNet-16.7.1.tar.xz) = a7042620123eccc209534da2d98cb5aa17b63303565dc1aca6b57f3fcd713f9d +SIZE (DDNet-16.7.1.tar.xz) = 28692288 +SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11 +SIZE (rust/crates/cc-1.0.73.crate) = 57880 +SHA256 (rust/crates/cxx-1.0.71.crate) = 5469a6f42296f4fd40789b397383718f9a0bd75d2f9b7cedbb249996811fba27 +SIZE (rust/crates/cxx-1.0.71.crate) = 195479 +SHA256 (rust/crates/cxxbridge-flags-1.0.71.crate) = 0fef2b4ffdc935c973bc7817d541fc936fdc8a85194cfdd9c761aca8387edd48 +SIZE (rust/crates/cxxbridge-flags-1.0.71.crate) = 5593 +SHA256 (rust/crates/cxxbridge-macro-1.0.71.crate) = 9d3a240a54f5526967ffae81fdcda1fc80564964220d90816960b2eae2eab7f4 +SIZE (rust/crates/cxxbridge-macro-1.0.71.crate) = 59620 +SHA256 (rust/crates/link-cplusplus-1.0.6.crate) = f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8 +SIZE (rust/crates/link-cplusplus-1.0.6.crate) = 8150 +SHA256 (rust/crates/proc-macro2-1.0.40.crate) = dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7 +SIZE (rust/crates/proc-macro2-1.0.40.crate) = 40559 +SHA256 (rust/crates/quote-1.0.20.crate) = 3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804 +SIZE (rust/crates/quote-1.0.20.crate) = 28160 +SHA256 (rust/crates/syn-1.0.98.crate) = c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd +SIZE (rust/crates/syn-1.0.98.crate) = 235451 +SHA256 (rust/crates/unicode-ident-1.0.1.crate) = 5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c +SIZE (rust/crates/unicode-ident-1.0.1.crate) = 33770 diff --git a/games/DDNet/files/patch-CMakeLists.txt b/games/DDNet/files/patch-CMakeLists.txt index d87f98845d88..042f61282d11 100644 --- a/games/DDNet/files/patch-CMakeLists.txt +++ b/games/DDNet/files/patch-CMakeLists.txt @@ -1,6 +1,20 @@ ---- CMakeLists.txt.orig 2022-02-12 22:26:38 UTC +--- CMakeLists.txt.orig 2023-01-12 00:16:06 UTC +++ CMakeLists.txt -@@ -2566,11 +2566,17 @@ if(NOT DEV) +@@ -963,13 +963,6 @@ if(NOT CMAKE_OSX_ARCHITECTURES) + ) + list(APPEND RUST_OUTPUTS "${PROJECT_BINARY_DIR}/${CARGO_BUILD_DIR}/${LIBRARY_NAME}") + endforeach() +- add_custom_command( +- OUTPUT ${RUST_OUTPUTS} +- COMMAND ${CARGO_BUILD} +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} +- USES_TERMINAL +- DEPENDS ${RUST_SRC} +- ) + else() + foreach(rust_target ${RUST_TARGETS}) + set(LIBRARY_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}ddnet_${rust_target}${CMAKE_STATIC_LIBRARY_SUFFIX}") +@@ -3004,11 +2997,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) @@ -20,5 +34,5 @@ + 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() - + foreach(file ${VULKAN_SHADER_FILE_LIST}) + install(FILES ${PROJECT_BINARY_DIR}/${file} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ddnet/data/shader/vulkan COMPONENT client)