From nobody Sun Feb 26 11:04:06 2023 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 4PPgjz1h5fz3tCm4; Sun, 26 Feb 2023 11:04:07 +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 4PPgjz0szHz3CwP; Sun, 26 Feb 2023 11:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677409447; 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=6sLnj7v5MSRopOndwt9dPpaojojScV6iuo4gvQlEHNk=; b=jF8gQWBrwimB0PlXSW9w5/Anbq4nIpGJ1HL9CLEMKPcF/Hhjigpn/D17A7CM3dH+2U/hVP 00mMa6fOO0Zde8MmQEsbiwQtzD3n8sVnRFY7m0bC5F31g6wRhxTSLMtLJ9IV9BeiFHRryP AubU7h1E3qO3juwNUhjAnyc2YEIKpmd7R3nBczyxwdMqfs0O51YeF+A0wrv6V7fzIS6DI7 9T90bbfcr2vkttFK2ufYGkxUrVU8NlR6eLQirhrTjsR1fRkZty1Q7eadh7jFNtfuuKuOLm aWdRP2xGABjKdGaQp1K6lX+U2DBm1p97TwtLeQxll5LPGDlRbnNamVf9H9ohzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677409447; 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=6sLnj7v5MSRopOndwt9dPpaojojScV6iuo4gvQlEHNk=; b=faOLIMypQmvis1vTSr9+9KciYiM9cWH5OQ6kzE1DYsDR37r/G80sUJjcMjPWGeQmtfZx1O ABlsp7+TcFfI3V4ZbM3r6Gfwhzw2rjdNRhE449DZQypaUjgI1s2U+Ai1wy1g6V/rFuRK4K HxA2EAGJmkqxbf7kb6ppR771z8JPQDOQfOKnVx6fgg299GWXvS5K+MIh7YSTNV2wFoJywl ExENicpyE33Y1u59+3HNvblPYlafK8pmf1CUB8E9ZNQQJO2lQxFPbq9pZ8g1VxfVsGHpkc 79SHhfXuixlqVVZ1TtzceOba+w/9EF1IBA3xXWo53hfTsXjj3vo4ZhFSw6CBsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677409447; a=rsa-sha256; cv=none; b=MzquUZIF3fvD0jUGiCaerdE9Nth7j9QCtdokrnwEgVpxpDbEL60q04BKmzF2pqzHLwece5 zPVGsDcIBTnyb6QGAcItUa9iM69GqHaluklGSBw80zuSzc29oV2QZfQV3wlBWL8O/iY7Sq LpLACv3r5DP7klgaOsMkNADR1f4yxYU9zddpMCSW5YDdEi/TYvrrtX6K0K1mpHlpyrUuCx 2w1LGs24XCwulgs7QAdeBIqZ5PjMleuLMb1/PrOR5m2Proi1s89CYPHhGGVwyoM0/UGCP2 IzgYfeKcLPZwi1LEaoOkoQhu/FG8PW/OpEsrgrMh+SyQe0qUJjcB4TtjQsPj0A== 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 4PPgjy6kt1zjZv; Sun, 26 Feb 2023 11:04:06 +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 31QB46kq063618; Sun, 26 Feb 2023 11:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QB46l0063617; Sun, 26 Feb 2023 11:04:06 GMT (envelope-from git) Date: Sun, 26 Feb 2023 11:04:06 GMT Message-Id: <202302261104.31QB46l0063617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 953c79c007a1 - main - games/scummvm: Update to 2.7.0 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 953c79c007a16b2e6658d278b1e3bddc1d256406 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=953c79c007a16b2e6658d278b1e3bddc1d256406 commit 953c79c007a16b2e6658d278b1e3bddc1d256406 Author: Kai Knoblich AuthorDate: 2023-02-26 10:58:57 +0000 Commit: Kai Knoblich CommitDate: 2023-02-26 10:58:57 +0000 games/scummvm: Update to 2.7.0 Changelog: https://downloads.scummvm.org/frs/scummvm/2.7.0/ReleaseNotes.html MFH: No (feature release) --- games/scummvm/Makefile | 2 +- games/scummvm/distinfo | 6 +- games/scummvm/files/patch-configure | 17 +---- ...l1_engine_libraries_newton_core_dgPolyhedra.cpp | 40 +++++++++++ games/scummvm/pkg-plist | 84 ++++++++++++++++++++-- 5 files changed, 127 insertions(+), 22 deletions(-) diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index cd50557f43a9..a13e1edef097 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,5 +1,5 @@ PORTNAME= scummvm -PORTVERSION= 2.6.1 +PORTVERSION= 2.7.0 CATEGORIES= games emulators MASTER_SITES= https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/ diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo index e092fc2ab37b..bb451cb39c9f 100644 --- a/games/scummvm/distinfo +++ b/games/scummvm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666437888 -SHA256 (scummvm-2.6.1.tar.xz) = 8fafb9efabdd1bf8adfe39eeec3fc80b22de30ceddd1fadcde180e356cd317e9 -SIZE (scummvm-2.6.1.tar.xz) = 141354456 +TIMESTAMP = 1676408740 +SHA256 (scummvm-2.7.0.tar.xz) = 444b1ffd61774fe867824e57bb3033c9998ffa8a4ed3a13246b01611d5cf9993 +SIZE (scummvm-2.7.0.tar.xz) = 145171776 diff --git a/games/scummvm/files/patch-configure b/games/scummvm/files/patch-configure index 1db275249480..bab2273a9ea8 100644 --- a/games/scummvm/files/patch-configure +++ b/games/scummvm/files/patch-configure @@ -1,24 +1,13 @@ ---- configure.orig 2022-07-16 20:28:55 UTC +--- configure.orig 2023-02-13 22:19:22 UTC +++ configure -@@ -2939,9 +2939,9 @@ EOF - append_var LDFLAGS "-s USE_ZLIB=1" +@@ -3019,8 +3019,8 @@ EOF fi ;; -- freebsd*) + freebsd* | dragonfly*) - append_var LDFLAGS "-L/usr/local/lib" - append_var CXXFLAGS "-I/usr/local/include" -+ dragonfly* | freebsd*) + append_var LDFLAGS "-L%%LOCALBASE%%/lib" + append_var CXXFLAGS "-I%%LOCALBASE%%/include" ;; gamecube) _optimization_level=-Os -@@ -4021,7 +4021,7 @@ case $_host_os in - amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | morphos | n64 | ps3 | psp2 | psp | riscos | wii) - _posix=no - ;; -- 3ds | android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | serenity* | solaris* | sunos* | switch | uclinux*) -+ 3ds | android | beos* | bsd* | darwin* | dragonfly* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | serenity* | solaris* | sunos* | switch | uclinux*) - _posix=yes - ;; - os2-emx*) diff --git a/games/scummvm/files/patch-engines_hpl1_engine_libraries_newton_core_dgPolyhedra.cpp b/games/scummvm/files/patch-engines_hpl1_engine_libraries_newton_core_dgPolyhedra.cpp new file mode 100644 index 000000000000..c31a549376f6 --- /dev/null +++ b/games/scummvm/files/patch-engines_hpl1_engine_libraries_newton_core_dgPolyhedra.cpp @@ -0,0 +1,40 @@ +The HPL1 engine seems to be still under heavy development so this is +rather a workaround to fix the build on x64 platforms with Clang which +is very strict regarding pointer conversions to smaller types. + +Amend this issue after brief consultation with upstream by using +`PointerToInt(NULL)` instead of `dgUnsigned32(NULL)`. + +Obtained from: + +https://github.com/scummvm/scummvm/commit/5304df12f1232ddcfa33fcffed1cd5fb4ad01275 + +--- engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp.orig 2023-02-13 22:19:11 UTC ++++ engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp +@@ -2714,7 +2714,7 @@ void dgPolyhedra::Optimize(const dgFloat64 *const arra + if (handle) { + handle->m_edge = NULL; + } +- ptr->m_userData = dgUnsigned32(NULL); ++ ptr->m_userData = PointerToInt(NULL); + + } + +@@ -2753,7 +2753,7 @@ void dgPolyhedra::Optimize(const dgFloat64 *const arra + if (handle) { + handle->m_edge = NULL; + } +- ptr1->m_userData = dgUnsigned32(NULL); ++ ptr1->m_userData = PointerToInt(NULL); + + } + } +@@ -2780,7 +2780,7 @@ void dgPolyhedra::Optimize(const dgFloat64 *const arra + if (handle) { + handle->m_edge = NULL; + } +- ptr1->m_twin->m_userData = dgUnsigned32(NULL); ++ ptr1->m_twin->m_userData = PointerToInt(NULL); + + } + } diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist index 62a1672546d1..ca03ce10f8d0 100644 --- a/games/scummvm/pkg-plist +++ b/games/scummvm/pkg-plist @@ -26,6 +26,7 @@ share/pixmaps/scummvm.xpm %%DATADIR%%/drascula.dat %%DATADIR%%/encoding.dat %%DATADIR%%/fonts.dat +%%DATADIR%%/freescape.dat %%DATADIR%%/grim-patch.lab %%DATADIR%%/gui-icons.dat %%XENGINES%%%%DATADIR%%/hadesch_translations.dat @@ -44,6 +45,7 @@ share/pixmaps/scummvm.xpm %%DATADIR%%/scummclassic.zip %%DATADIR%%/scummmodern.zip %%DATADIR%%/scummremastered.zip +%%DATADIR%%/shaders.dat %%DATADIR%%/shaders/emi_actor.fragment %%DATADIR%%/shaders/emi_actor.vertex %%DATADIR%%/shaders/emi_actorlights.fragment @@ -72,8 +74,86 @@ share/pixmaps/scummvm.xpm %%DATADIR%%/shaders/grim_smush.vertex %%DATADIR%%/shaders/grim_text.fragment %%DATADIR%%/shaders/grim_text.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Ambient_Color.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Bump2D_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Bump2D_Light.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpColorSpec_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpColorSpec_Light_Spot.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpSpec2D_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpSpec2D_Light.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpSpec_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpSpec_Light_Spot.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_BumpSpec_Light_Spot_pass2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Bump_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Bump_Light_Spot.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Bump_Light_Spot_pass2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_DiffuseSpec_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_DiffuseSpec_Light.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_DiffuseSpec_Light_Spot.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_DiffuseSpec_Light_Spot.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_DiffuseSpec_Light_Spot_pass2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Color.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Color.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_ColorMul.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_EnvMap_Reflect.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_EnvMap_Reflect.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Light.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Light_Spot.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Light_Spot.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Light_Spot_pass1.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Diffuse_Light_Spot_pass2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Bump_Light.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Diffuse_Light_Spot.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Diffuse_Light_Spot_p2.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Diffuse_Light_p1.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Diffuse_Light_p1.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Diffuse_Light_p2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback01_Diffuse_Light_p2.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_DIffuse_Light_Spot_p2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_DIffuse_Light_Spot_p3.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_Diffuse_Light_Spot_p2.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_Diffuse_Light_Spot_p3.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_Diffuse_Light_p1.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_Diffuse_Light_p1.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fallback02_Diffuse_Light_p2.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fog_Solid.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fog_Solid.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fog_Trans.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fog_Trans_Alpha.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fog_Trans_Mod.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Fog_Trans_ModX2.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Bloom.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Bloom.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Blur.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Blur_2D.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Blur_Rect.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_DoF.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_DoF.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Fallback01_Blur_2D.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Fallback01_Blur_Rect.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Motion.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Motion.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Motion_staticloop.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Offset.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_PostEffect_Offset.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_ShadowExtrude.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_ShadowExtrude.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Water_Diffuse.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Water_Diffuse.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Water_Fog.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_Water_Fog.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_refract.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_refract.vertex +%%XENGINES%%%%DATADIR%%/shaders/hpl1_refract_special.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_refract_water.fragment +%%XENGINES%%%%DATADIR%%/shaders/hpl1_refract_water.vertex %%DATADIR%%/shaders/myst3_box.fragment %%DATADIR%%/shaders/myst3_box.vertex +%%DATADIR%%/shaders/myst3_cube.fragment +%%DATADIR%%/shaders/myst3_cube.vertex +%%DATADIR%%/shaders/myst3_text.fragment +%%DATADIR%%/shaders/myst3_text.vertex %%XENGINES%%%%DATADIR%%/shaders/playground3d_bitmap.fragment %%XENGINES%%%%DATADIR%%/shaders/playground3d_bitmap.vertex %%XENGINES%%%%DATADIR%%/shaders/playground3d_cube.fragment @@ -108,10 +188,6 @@ share/pixmaps/scummvm.xpm %%DATADIR%%/shaders/wme_shadow_volume.vertex %%DATADIR%%/shaders/wme_sprite.fragment %%DATADIR%%/shaders/wme_sprite.vertex -%%DATADIR%%/shaders/myst3_cube.fragment -%%DATADIR%%/shaders/myst3_cube.vertex -%%DATADIR%%/shaders/myst3_text.fragment -%%DATADIR%%/shaders/myst3_text.vertex %%DATADIR%%/sky.cpt %%DATADIR%%/supernova.dat %%DATADIR%%/teenagent.dat