Date: Sun, 26 Feb 2023 11:04:06 GMT From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 953c79c007a1 - main - games/scummvm: Update to 2.7.0 Message-ID: <202302261104.31QB46l0063617@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=953c79c007a16b2e6658d278b1e3bddc1d256406 commit 953c79c007a16b2e6658d278b1e3bddc1d256406 Author: Kai Knoblich <kai@FreeBSD.org> AuthorDate: 2023-02-26 10:58:57 +0000 Commit: Kai Knoblich <kai@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302261104.31QB46l0063617>