From nobody Sun Aug 18 17:38:29 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 4Wn2yF1t4fz5Syq8; Sun, 18 Aug 2024 17:38:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wn2yF1LvWz3wf0; Sun, 18 Aug 2024 17:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724002709; 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=OWYAbdMFFsrZfETXOM/+bnFmCWZw7g9XundhVQPYSAQ=; b=rPO3TDDzxOitPa6MEDqnXsRovQ+Pe+kPml8BqUeEyBwKME5ABZzLZFaPaeKrixKZLD/+bu TtOZyXAgruqcSTyztwTPwB28SZk0heBhpYKrQVj6+HLXWM4jgAjUd5fJrWsutkNx6yaEy4 piqHlA4ReuXjdjOYO5sNfJDFwT87LH1BhCxrXtAQ8PzrFPPll1prve8LftjqgDw5iqCCOR StX4QPHoyhvbZm+3vDO4fk4LbGh+bccTylTAzkg2EmcuL0sJ/1wv6HU23DgWP8SKNKRicF 0uUaiVWPzXy4eIoqzQmNVdPC3TZBySRPg8a2SAeDE+L4tsMopPahwiEpvaXp2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724002709; a=rsa-sha256; cv=none; b=yMIBk7kPtZOSKhYP7w6NRR/uarAa5EBYD06bskQlevgwGyrTKNAWXLxMYgwrrACvWj5Vex CPYaHtNGBifaULWz3AVNdkECYVmqiRQsqDWKXpAJgTYH9glLG/86kIbLNIdhNxQ+qJpbRN Mwd6bAu5LQfoVeWt6Dryp46ZBRBQ93y3ugXjCNPyjZVhL/5HOIjSICnogSmHTC5TwndM28 Wjo8LFSjQMucec5uHZyEtt2UT+Cn9Pza0h4L5PoZ98nho4GU5YaP67vJCqhbpwv+C6gfXH 197LwxTmB2sanBvjc0nn8JJbFnTe6Gd53ehMJ/e/FM7OBbnnVhcE+d+AQ0HYlg== 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=1724002709; 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=OWYAbdMFFsrZfETXOM/+bnFmCWZw7g9XundhVQPYSAQ=; b=IVji6fKLYyQTj8yKGn5wwnJUiR7E8r3RYjTjkAmpMkfmCqffsT+xQ21YkxwqgAn0DweTRJ JuD21jJapF/POckNTBmBnhtVyj5bwhY4LK8y18M0AxCQ2jLvBqXNokEJ3JwvpLtNP4lDmr ZCi/jaDmlGp17rwfM7wTNdse3I6gQfPzUJ4p5p8PaDiaz0fhEOSqGuvEVEnoeBl42BggTb Hb1k3eZpmA9eSiR8P2nWNSTq3kxJ8YkbfEHwXqdhAc1p6wd6XFDZwAdWuUL493ZWtQh2/P XbYPPewPwEHxNEoXrZRd6/NbMBtwppjKy67AjktzVFN995kuJmsRbqrGwhVeLw== 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 4Wn2yF0xnXzjbJ; Sun, 18 Aug 2024 17:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47IHcTds063120; Sun, 18 Aug 2024 17:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47IHcTWG063117; Sun, 18 Aug 2024 17:38:29 GMT (envelope-from git) Date: Sun, 18 Aug 2024 17:38:29 GMT Message-Id: <202408181738.47IHcTWG063117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 443dd2c414f2 - main - games/SRB2: version 2.2.13 update request 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 443dd2c414f2d78c621ad6ded53f608cf87b9419 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=443dd2c414f2d78c621ad6ded53f608cf87b9419 commit 443dd2c414f2d78c621ad6ded53f608cf87b9419 Author: Fernando Apesteguía AuthorDate: 2024-06-09 16:22:04 +0000 Commit: Fernando Apesteguía CommitDate: 2024-08-18 17:38:02 +0000 games/SRB2: version 2.2.13 update request ChangeLog: https://github.com/STJr/SRB2/releases/tag/SRB2_release_2.2.13 PR: 264260 Reported by: slava@planetslav.ca Several improvements * Fix assets version * Configure with system libraries (avoid CPM) --- games/SRB2/Makefile | 27 +++++++++----- games/SRB2/distinfo | 10 +++--- games/SRB2/files/patch-CMakeLists.txt | 45 ++++++++++++++++++++++++ games/SRB2/files/patch-assets_CMakeLists.txt | 14 ++++++++ games/SRB2/files/patch-thirdparty_CMakeLists.txt | 10 ++++++ games/SRB2/pkg-plist | 3 +- 6 files changed, 94 insertions(+), 15 deletions(-) diff --git a/games/SRB2/Makefile b/games/SRB2/Makefile index 553ed6daf616..8bff37a52198 100644 --- a/games/SRB2/Makefile +++ b/games/SRB2/Makefile @@ -1,7 +1,6 @@ PORTNAME= SRB2 -PORTVERSION= 2.2.9 +PORTVERSION= 2.2.13 DISTVERSIONPREFIX= SRB2_release_ -PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://github.com/STJr/SRB2/releases/download/SRB2_release_${PORTVERSION}/:assets DISTFILES+= SRB2-v${PORTVERSION:C/\.//g}-Full.zip:assets @@ -19,7 +18,12 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libopenmpt.so:audio/libopenmpt \ libpng.so:graphics/png -USES= cmake sdl +USES= cmake localbase:ldflags sdl +CMAKE_ARGS+= -DSRB2_CONFIG_ASSET_DIRECTORY=${WRKSRC}/assets/installer/ \ + -DSRB2_SDL2_EXE_NAME=${EXE_NAME} + +CMAKE_ON= SRB2_CONFIG_SYSTEM_LIBRARIES +CMAKE_OFF= SRB2_CONFIG_ENABLE_TESTS USE_GITHUB= yes GH_ACCOUNT= STJr @@ -29,20 +33,25 @@ USE_SDL= mixer2 sdl2 CXXFLAGS+= -DDEFAULTWADLOCATION5=${DATADIR} LDFLAGS+= -lexecinfo -lm +EXE_NAME= srb2 + post-extract: @${MKDIR} ${WRKSRC}/assets/installer - @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v229-Full.zip srb2.pk3 - @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v229-Full.zip player.dta - @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v229-Full.zip zones.pk3 - @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v229-Full.zip patch.pk3 + @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v${PORTVERSION:S/.//g}-Full.zip srb2.pk3 + @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v${PORTVERSION:S/.//g}-Full.zip models.dat + @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v${PORTVERSION:S/.//g}-Full.zip music.dta + @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v${PORTVERSION:S/.//g}-Full.zip player.dta + @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v${PORTVERSION:S/.//g}-Full.zip zones.pk3 + @cd ${WRKSRC}/assets/installer && ${UNZIP_NATIVE_CMD} ${DISTDIR}/SRB2-v${PORTVERSION:S/.//g}-Full.zip patch.pk3 post-install: @${MKDIR} ${STAGEDIR}/${DATADIR} @${MV} ${STAGEDIR}/${PREFIX}/srb2.pk3 ${STAGEDIR}/${DATADIR} + @${MV} ${STAGEDIR}/${PREFIX}/models.dat ${STAGEDIR}/${DATADIR} + @${MV} ${STAGEDIR}/${PREFIX}/music.dta ${STAGEDIR}/${DATADIR} @${MV} ${STAGEDIR}/${PREFIX}/player.dta ${STAGEDIR}/${DATADIR} @${MV} ${STAGEDIR}/${PREFIX}/zones.pk3 ${STAGEDIR}/${DATADIR} @${MV} ${STAGEDIR}/${PREFIX}/patch.pk3 ${STAGEDIR}/${DATADIR} - @${MV} ${STAGEDIR}/${PREFIX}/srb2 ${STAGEDIR}/${PREFIX}/bin - @${MV} ${STAGEDIR}/${PREFIX}/srb2-${PORTVERSION} ${STAGEDIR}/${PREFIX}/bin + @${MV} ${STAGEDIR}/${PREFIX}/${EXE_NAME} ${STAGEDIR}/${PREFIX}/bin .include diff --git a/games/SRB2/distinfo b/games/SRB2/distinfo index 788670fa6553..b41c0c889ded 100644 --- a/games/SRB2/distinfo +++ b/games/SRB2/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1631304306 -SHA256 (SRB2-v229-Full.zip) = 48e644604bed81b5ce6b12ef23a2f4042d0118d0ba70f18c534dfe86ebe6f37d -SIZE (SRB2-v229-Full.zip) = 195309133 -SHA256 (STJr-SRB2-SRB2_release_2.2.9_GH0.tar.gz) = 5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a -SIZE (STJr-SRB2-SRB2_release_2.2.9_GH0.tar.gz) = 59265756 +TIMESTAMP = 1717950063 +SHA256 (SRB2-v2213-Full.zip) = 83b91a351135b63705e49daffa44e7ac3cf3e33b397f56ff347ebb71eda27d4a +SIZE (SRB2-v2213-Full.zip) = 156054029 +SHA256 (STJr-SRB2-SRB2_release_2.2.13_GH0.tar.gz) = 0fc460dc93c056c21bfcc389ac0515588673ee692968d9a6711b19e63d283b3f +SIZE (STJr-SRB2-SRB2_release_2.2.13_GH0.tar.gz) = 58207762 diff --git a/games/SRB2/files/patch-CMakeLists.txt b/games/SRB2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4ed20a9a8c29 --- /dev/null +++ b/games/SRB2/files/patch-CMakeLists.txt @@ -0,0 +1,45 @@ +--- CMakeLists.txt.orig 2023-09-08 23:16:28 UTC ++++ CMakeLists.txt +@@ -8,7 +8,9 @@ include(CMakeDependentOption) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + + include(CMakeDependentOption) +-include(cmake/CPM.cmake) ++if (SRB2_CONFIG_SYSTEM_LIBRARIES) ++ include(cmake/CPM.cmake) ++endif() + + file(STRINGS src/version.h SRB2_VERSION) + string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION}) +@@ -79,7 +81,8 @@ set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to + # SRB2_CONFIG_PROFILEMODE is probably superceded by some CMake setting. + option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) + set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.") +- ++ ++if (NOT SRB2_CONFIG_SYSTEM_LIBRARIES) + if(SRB2_CONFIG_ENABLE_TESTS) + # https://github.com/catchorg/Catch2 + CPMAddPackage( +@@ -98,6 +101,7 @@ endif() + target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) + catch_discover_tests(srb2tests) + endif() ++endif() + + # Enable CCache + # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) +@@ -114,11 +118,13 @@ else() + endif() + endif() + else() ++ if (NOT SRB2_CONFIG_SYSTEM_LIBRARIES) + CPMAddPackage( + NAME Ccache.cmake + GITHUB_REPOSITORY TheLartians/Ccache.cmake + VERSION 1.2 + ) ++endif() + endif() + + # Dependencies diff --git a/games/SRB2/files/patch-assets_CMakeLists.txt b/games/SRB2/files/patch-assets_CMakeLists.txt new file mode 100644 index 000000000000..8e17ae4a87e1 --- /dev/null +++ b/games/SRB2/files/patch-assets_CMakeLists.txt @@ -0,0 +1,14 @@ +--- assets/CMakeLists.txt.orig 2024-06-23 17:50:54 UTC ++++ assets/CMakeLists.txt +@@ -43,9 +43,9 @@ if(${CMAKE_SYSTEM} MATCHES Darwin) + if(${CMAKE_SYSTEM} MATCHES Darwin) + get_target_property(outname SRB2SDL2 OUTPUT_NAME) + install(FILES ${SRB2_ASSETS} DESTINATION "${outname}.app/Contents/Resources") +- install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/models" DESTINATION "${outname}.app/Contents/Resources") ++ install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/" DESTINATION "${outname}.app/Contents/Resources") + install(FILES ${SRB2_ASSETS_DOCS} DESTINATION .) + else() + install(FILES ${SRB2_ASSETS} DESTINATION .) +- install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/models" DESTINATION .) ++ install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/" DESTINATION .) + endif() diff --git a/games/SRB2/files/patch-thirdparty_CMakeLists.txt b/games/SRB2/files/patch-thirdparty_CMakeLists.txt new file mode 100644 index 000000000000..2c0d39f3569c --- /dev/null +++ b/games/SRB2/files/patch-thirdparty_CMakeLists.txt @@ -0,0 +1,10 @@ +--- thirdparty/CMakeLists.txt.orig 2024-06-10 07:06:58 UTC ++++ thirdparty/CMakeLists.txt +@@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + include("cpm-png.cmake") + include("cpm-curl.cmake") + include("cpm-openmpt.cmake") ++ include("cpm-libgme.cmake") + endif() +- +-include("cpm-libgme.cmake") diff --git a/games/SRB2/pkg-plist b/games/SRB2/pkg-plist index 384bfd0c0cf8..92e43045f277 100644 --- a/games/SRB2/pkg-plist +++ b/games/SRB2/pkg-plist @@ -1,5 +1,6 @@ bin/srb2 -bin/srb2-2.2.9 +%%DATADIR%%/models.dat +%%DATADIR%%/music.dta %%DATADIR%%/patch.pk3 %%DATADIR%%/player.dta %%DATADIR%%/srb2.pk3