From nobody Fri Mar 22 12:50:46 2024 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 4V1Md32Bv1z5Drc3; Fri, 22 Mar 2024 12:50:47 +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 4V1Md26CmPz3x7h; Fri, 22 Mar 2024 12:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711111846; 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=QkH4noukqZDuqIoAOtmgHnm8LN8c6bWbqctWgTwF5Ak=; b=VsjIGx6Z1FNIFjDq45958dL/WNKE63vorEGHJaWAajK2xCJqa7927FZ8IQv/uMac4ILOjq 0hX3iHXeDlDtTEQxzg8MQaTdn7PAmgerDrc0BiHuBrBOqQqiZ36XUjNXS4j9V2mSCbIY/G /1DRH1Ai2pdAkyNFsbgiyX8+mfTWf/+rUy7cytAmz0bWIPiWkRxJG+CDipA0Hp6qGMHoPy 6iGTDEGr/PtHATsC720rzGc+TliOKv1ahh8hlOcNi3uPUe0wsWoJCtD+l9rHL27CqrqioS VsMC6FnNZXPX+bPaSunm9D02RlG4VUarLshpzXFX+Eq8ZH37xnqM4ZT7hHrxHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711111846; a=rsa-sha256; cv=none; b=hrQd6/cWaVFGiWzXjauXKCLTyIRsgNRPP5QzQA5xDklRjJPP4knkEZcjIvMMdgIDB/dGZ3 joKQ80hgdNZ06EXfvvcu/kfbEigGFI8xoJtiTZPDVijWaY0l1cmqaEh05dsMR3sYNePilz Lxay2XhBnU8m1NEavdivo9QHnjUgn3z1zMP31upGtbyOlpTrSWNUCEbRkzvJSKml5xXOTg ROfTKVzcsf3fZZeUlkGzNy+st9BPcqAp1xjlYL0Sjv8Av1NDlXNTJCR98TWLpd+3K8HZdr 1HDG3ZqkqzBQDnF01svELt5xzHsyUHINyVAevwlKPoi5c74WtN+Agw1XQYXwgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711111846; 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=QkH4noukqZDuqIoAOtmgHnm8LN8c6bWbqctWgTwF5Ak=; b=iAdEafOcmesp1miOfDVv5y0sGc2qm0ew7u+Bt0f5eqnt+kRbORxpyN5W/e3VDoBHkoLTcO 24JZ03GhvksXEMmrR4705gdwdpUqLivRlUK29p8Cbv8tWN5FGO1nKCaovosWlVE9uHjkAF 08xSHz0Ng473AMnUZ40Ys9dXtDkxFrZ6i3w7n1zRgMEhFGiRh3WqyIguwpffZnJvwvygEv gydTQ8qASxXYv2QMkfnrLbHI1GInz8PoEN6lJBpli2n9FpQHapAFbD/HHre14BSOZxPm9u HJgCqgYbeWo2X5ZMiMziXxCdKajCaWRcNhk3ZDaHN30LfNYAbwDAVF/tl8enTQ== 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 4V1Md25qxQz1JwD; Fri, 22 Mar 2024 12:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MCok73027434; Fri, 22 Mar 2024 12:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MCokmG027431; Fri, 22 Mar 2024 12:50:46 GMT (envelope-from git) Date: Fri, 22 Mar 2024 12:50:46 GMT Message-Id: <202403221250.42MCokmG027431@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: e77537638d8e - main - games/devilutionX: restore build with update to 1.5.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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e77537638d8e6d36d7069ed3aebf44a290245acb Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=e77537638d8e6d36d7069ed3aebf44a290245acb commit e77537638d8e6d36d7069ed3aebf44a290245acb Author: Sergey A. Osokin AuthorDate: 2024-03-22 12:48:36 +0000 Commit: Sergey A. Osokin CommitDate: 2024-03-22 12:48:36 +0000 games/devilutionX: restore build with update to 1.5.2 (+) Approved by: amdmi3 (maintainer, timeout > 2 weeks) PR: 273883 --- games/devilutionX/Makefile | 26 +++++++++++----------- games/devilutionX/distinfo | 26 +++++++++++----------- .../files/patch-3rdParty_asio_CMakeLists.txt | 10 +++++++++ .../files/patch-CMake_Dependencies.cmake | 13 ----------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/games/devilutionX/Makefile b/games/devilutionX/Makefile index 11965ae45756..648e1c127e18 100644 --- a/games/devilutionX/Makefile +++ b/games/devilutionX/Makefile @@ -1,6 +1,5 @@ PORTNAME= devilutionX -DISTVERSION= 1.4.1 -PORTREVISION= 2 +DISTVERSION= 1.5.2 CATEGORIES= games MASTER_SITES= https://github.com/diasurgical/devilutionx-assets/releases/download/${DATA_VERSION}/:data DISTFILES= devilutionx.mpq?tag=${DATA_VERSION}:data @@ -10,28 +9,29 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Diablo I engine for modern operating systems WWW= https://github.com/diasurgical/devilutionX -LICENSE= UNLICENSE CC-BY-NC-SA-4.0 OFL11 +LICENSE= CC-BY-NC-SA-4.0 OFL11 SUL LICENSE_COMB= multi -LICENSE_FILE_UNLICENSE= ${WRKSRC}/LICENSE +LICENSE_NAME_SUL= Sustainable Use License +LICENSE_FILE_SUL= ${WRKSRC}/LICENSE.md +LICENSE_PERMS_SUL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN= does not build with libfmt 10+. See https://github.com/diasurgical/devilutionX/issues/6098 - -LIB_DEPENDS= libfmt.so:devel/libfmt BUILD_DEPENDS= ${LOCALBASE}/include/SimpleIni.h:devel/simpleini +LIB_DEPENDS= libfmt.so:devel/libfmt USES= cmake compiler:c++11-lang dos2unix gettext-tools pkgconfig sdl DOS2UNIX_GLOB= *.cpp *.h CMakeLists.txt Dependencies.cmake USE_GITHUB= yes GH_ACCOUNT= diasurgical -GH_TUPLE= diasurgical:libsmackerdec:2997ee0e41e91bb723003bc09234be553b190e38:libsmackerdec/_deps/libsmackerdec-src \ - diasurgical:libmpq:0f10bd1600f406b13932bf5351ba713361262184:libmpq/_deps/libmpq-src +GH_TUPLE= diasurgical:libsmackerdec:91e732bb6953489077430572f43fc802bf2c75b2:libsmackerdec/_deps/libsmackerdec-src \ + diasurgical:libmpq:b78d66c6fee6a501cc9b95d8556a129c68841b05:libmpq/_deps/libmpq-src USE_SDL= sdl2 image2 CMAKE_ARGS= -DCMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \ -DVERSION_NUM="${PORTVERSION}.0" -CMAKE_ON= FETCHCONTENT_FULLY_DISCONNECTED +CMAKE_ON= DDEVILUTIONX_SYSTEM_LIBFMT \ + FETCHCONTENT_FULLY_DISCONNECTED -DATA_VERSION= v2 +DATA_VERSION= v4 DATADIR= ${PREFIX}/share/diasurgical/devilutionx OPTIONS_DEFINE= TEST SOUND LTO DEBUG @@ -48,13 +48,13 @@ NETWORK_CMAKE_BOOL_OFF= NONET TCP_DESC= TCP multiplayer option TCP_CMAKE_BOOL_OFF= DISABLE_TCP TCP_IMPLIES= NETWORK -TCP_GH_TUPLE= diasurgical:asio:ebeff99f539da23d27c2e8d4bdbc1ee011968644:asio/_deps/asio-src +TCP_GH_TUPLE= diasurgical:asio:cfbe961e2d6e2978d5e081231e4f798df46437c:asio/_deps/asio-src ZEROTIER_DESC= ZeroTier multiplayer option (broken) ZEROTIER_BROKEN= does not build: fatal error: 'sys/appleapiopts.h' file not found ZEROTIER_CMAKE_BOOL_OFF=DISABLE_ZERO_TIER ZEROTIER_IMPLIES= NETWORK -ZEROTIER_GH_TUPLE= diasurgical:libzt:37a2efb0b925df632299ef07dc78c0af5f6b4756:libzt/_deps/libzt-src \ +ZEROTIER_GH_TUPLE= diasurgical:libzt:d6c6a069a5041a3e89594c447ced3f15d77618b8:libzt/_deps/libzt-src \ diasurgical:ZeroTierOne:b1350ac91118d1bd6bb71c0c41be5f4a30196838:ZeroTierOne/_deps/libzt-src/ext/ZeroTierOne \ diasurgical:lwip:1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b:lwip/_deps/libzt-src/ext/lwip \ diasurgical:lwip-contrib:1f9e26e221a41542563834222c4ec8399be1908f:lwipcontrib/_deps/libzt-src/ext/lwip-contrib diff --git a/games/devilutionX/distinfo b/games/devilutionX/distinfo index 1d5c6081d1c6..420944cad389 100644 --- a/games/devilutionX/distinfo +++ b/games/devilutionX/distinfo @@ -1,16 +1,16 @@ -TIMESTAMP = 1659554836 -SHA256 (devilutionx.mpq?tag=v2) = 90467c15f5e0ac902b2b8ac916f63a1fe2dd4b554ca36ab218bcd27f5121e988 -SIZE (devilutionx.mpq?tag=v2) = 4959860 -SHA256 (diasurgical-devilutionX-1.4.1_GH0.tar.gz) = 54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8 -SIZE (diasurgical-devilutionX-1.4.1_GH0.tar.gz) = 7578111 -SHA256 (diasurgical-libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38_GH0.tar.gz) = 40c0dc21943de22e153d56a7992c621a42a0c56c7cd833f8b84f90e48da753ea -SIZE (diasurgical-libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38_GH0.tar.gz) = 18556 -SHA256 (diasurgical-libmpq-0f10bd1600f406b13932bf5351ba713361262184_GH0.tar.gz) = ee173f5edb20f162482658cbc9d4bb84b640f651041d686c0ad7b2af12baf2a1 -SIZE (diasurgical-libmpq-0f10bd1600f406b13932bf5351ba713361262184_GH0.tar.gz) = 69570 -SHA256 (diasurgical-asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644_GH0.tar.gz) = 88bb72f7bbdde7dbd050789bd73ff2abb2e9eacd8f9c889202b502f222230b6e -SIZE (diasurgical-asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644_GH0.tar.gz) = 1614738 -SHA256 (diasurgical-libzt-37a2efb0b925df632299ef07dc78c0af5f6b4756_GH0.tar.gz) = 7fdbc4a73e3e1d0b98521c0b6520f89852a0896158a815070052e37a2a08b585 -SIZE (diasurgical-libzt-37a2efb0b925df632299ef07dc78c0af5f6b4756_GH0.tar.gz) = 390934 +TIMESTAMP = 1711067017 +SHA256 (devilutionx.mpq?tag=v4) = c563903af73f7037be0a7d3752e3422f2074b75cddce6bca951a138f3597197e +SIZE (devilutionx.mpq?tag=v4) = 5293561 +SHA256 (diasurgical-devilutionX-1.5.2_GH0.tar.gz) = c046fd23778729ce77e7f6fd1c66ba7c3e1b32a1472821c3485f0d8bd4f3b4aa +SIZE (diasurgical-devilutionX-1.5.2_GH0.tar.gz) = 9448866 +SHA256 (diasurgical-libsmackerdec-91e732bb6953489077430572f43fc802bf2c75b2_GH0.tar.gz) = e565e37ef1ae4f8846d9c9c24b861bc56fdce2d7a4ece47de448e00aa9048b87 +SIZE (diasurgical-libsmackerdec-91e732bb6953489077430572f43fc802bf2c75b2_GH0.tar.gz) = 18576 +SHA256 (diasurgical-libmpq-b78d66c6fee6a501cc9b95d8556a129c68841b05_GH0.tar.gz) = 348cd9c2be9c067dfcb8a2d6cd6f947ade5088e1543c1e5db1fdc5b12db6aeea +SIZE (diasurgical-libmpq-b78d66c6fee6a501cc9b95d8556a129c68841b05_GH0.tar.gz) = 70149 +SHA256 (diasurgical-asio-cfbe961e2d6e2978d5e081231e4f798df46437c_GH0.tar.gz) = 85a36a7cbed568c0a1ea01709405dddec502252c47b54aadc600c584b5d0249d +SIZE (diasurgical-asio-cfbe961e2d6e2978d5e081231e4f798df46437c_GH0.tar.gz) = 1615001 +SHA256 (diasurgical-libzt-d6c6a069a5041a3e89594c447ced3f15d77618b8_GH0.tar.gz) = 2e0388061f57dbae12f36497f5e3f20a07a0bff1140159a9d14efaf2a3d23dc1 +SIZE (diasurgical-libzt-d6c6a069a5041a3e89594c447ced3f15d77618b8_GH0.tar.gz) = 386305 SHA256 (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 39c1b7e28f9d4d92edaaa831007715358465a068019fe84a56b5366b386a1363 SIZE (diasurgical-ZeroTierOne-b1350ac91118d1bd6bb71c0c41be5f4a30196838_GH0.tar.gz) = 13122622 SHA256 (diasurgical-lwip-1bf7e011caf4e992ad139f6cb8c9818a9c1fbe1b_GH0.tar.gz) = 1477b5a427672480d0035b5af3e2cfae01c691afa9cace4500b43fcd262fa0bf diff --git a/games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt b/games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt new file mode 100644 index 000000000000..441490c096f6 --- /dev/null +++ b/games/devilutionX/files/patch-3rdParty_asio_CMakeLists.txt @@ -0,0 +1,10 @@ +--- 3rdParty/asio/CMakeLists.txt.orig 2024-01-15 01:03:52 UTC ++++ 3rdParty/asio/CMakeLists.txt +@@ -8,6 +8,7 @@ add_library(asio INTERFACE) + FetchContent_MakeAvailableExcludeFromAll(asio) + + add_library(asio INTERFACE) ++target_compile_definitions(asio INTERFACE ASIO_HAS_STD_INVOKE_RESULT=ON) + target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/asio/include) + + if(NINTENDO_3DS OR NINTENDO_SWITCH) diff --git a/games/devilutionX/files/patch-CMake_Dependencies.cmake b/games/devilutionX/files/patch-CMake_Dependencies.cmake deleted file mode 100644 index b5916c37a486..000000000000 --- a/games/devilutionX/files/patch-CMake_Dependencies.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- CMake/Dependencies.cmake.orig 2022-07-25 04:41:06 UTC -+++ CMake/Dependencies.cmake -@@ -31,7 +31,9 @@ else() - if(DEVILUTIONX_SYSTEM_SDL2) - find_package(SDL2 REQUIRED) - if(TARGET SDL2::SDL2) -- set(SDL2_MAIN SDL2::SDL2main) -+ if(TARGET SDL2::SDL2main) -+ set(SDL2_MAIN SDL2::SDL2main) -+ endif() - elseif(TARGET SDL2::SDL2-static) - # On some distros, such as vitasdk, only the SDL2::SDL2-static target is available. - # Alias to SDL2::SDL2 because some finder scripts may refer to SDL2::SDL2.