<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/687a2058568b5b919dd659b475b9ec15bb513b54">https://github.com/macports/macports-ports/commit/687a2058568b5b919dd659b475b9ec15bb513b54</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 687a2058568 scummvm: update to 2.5.0
</span>687a2058568 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 687a2058568b5b919dd659b475b9ec15bb513b54
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Mon Oct 11 22:01:07 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    scummvm: update to 2.5.0
</span>---
 emulators/scummvm/Portfile                         | 36 ++++++++++--------
 .../files/patch-scummvm-macosx-versions.diff       | 34 +++++++++++++++++
 .../scummvm/files/patch-scummvm-macosx-window.diff | 13 +++++++
 .../remove-date-time-from-version-devel.patch      | 44 ----------------------
 .../files/remove-date-time-from-version.patch      | 14 +++----
 5 files changed, 73 insertions(+), 68 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/Portfile b/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c8d2dc8bb2..723c8c71fb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem          1.0
 PortGroup           github 1.0
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +17,11 @@ long_description    \
</span> homepage            https://www.scummvm.org
 
 if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup        scummvm scummvm 2.2.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           sha256  1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        rmd160  3011e4d66fd3b5e28029afbd894a9cd7df9e9ec1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    63652348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup        scummvm scummvm 2.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           sha256  b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  a4fa5b99f483d27e7c132fd5c553aa88030c627e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    130095472
</span> 
     conflicts           ${name}-devel
     long_description ${description}: \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,29 +33,28 @@ if {${subport} eq ${name}} {
</span>     use_xz              yes
 
     patchfiles-append   patch-scummvm-sdl2indet.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-scummvm-macosx-window.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-scummvm-macosx-versions.diff
</span>     patchfiles-append   remove-date-time-from-version.patch
 
     github.livecheck.regex {([0-9.]+)}
 }
 
 subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup        scummvm scummvm 62581d91cdc4f18ef22aeae8778c96e1e0c63dca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version             20201209
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  c26b3eb067e299ef15f10e88deb8027d8d6e5821 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  f40e642d50fde808a7f8102ed957a7b832047e1b762d87b737ac840dc738b097 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    140636255
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup        scummvm scummvm b8132baa943f3a9c82886ea074a34140aa2557f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version             20211011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160  ff96dad1308e4184a4965eeaec35cd592bc65aa6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  96cd2135dcdb0ffe4de802181f14faa821f5868ce1c0bff4e869f1488a18e9de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    151853236
</span> 
     conflicts           ${name}
     long_description ${description}: \
         This port follows the master version of ${name}, which is typically updated every few weeks.
 
     patchfiles-append   patch-scummvm-sdl2indet.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   remove-date-time-from-version-devel.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # this needs to be added to the devel build at present, otherwise all the plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # fail to link against libSDL2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.ldflags-append -lSDL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-scummvm-macosx-window.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   remove-date-time-from-version.patch
</span> 
     livecheck.type      none
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,6 +107,9 @@ if {[string match *clang* ${configure.cxx}]} {
</span>     configure.ldflags-append -stdlib=${configure.cxx_stdlib}
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the plugins fail to link against libSDL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -lSDL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Leopard build, at least, fails without c++11
 compiler.cxx_standard   2011
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/patch-scummvm-macosx-versions.diff b/emulators/scummvm/files/patch-scummvm-macosx-versions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9529be30191
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/patch-scummvm-macosx-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/scummvm/scummvm/pull/3414
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- backends/platform/sdl/macosx/macosx-compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ backends/platform/sdl/macosx/macosx-compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAC_OS_X_VERSION_10_6    1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MAC_OS_X_VERSION_10_7    1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MAC_OS_X_VERSION_10_10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAC_OS_X_VERSION_10_10 101000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- backends/platform/sdl/macosx/macosx-window.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ backends/platform/sdl/macosx/macosx-window.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FORBIDDEN_SYMBOL_ALLOW_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "backends/platform/sdl/macosx/macosx-window.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "backends/platform/sdl/macosx/macosx-compat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AppKit/NSWindow.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float SdlWindow_MacOSX::getDpiScalingFactor() const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SDL_SysWMinfo wmInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (getSDLWMInformation(&wmInfo)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           NSWindow *nswindow = wmInfo.info.cocoa.window;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          if (nswindow)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          if ([nswindow respondsToSelector:@selector(backingScaleFactor)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   return [nswindow backingScaleFactor];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/patch-scummvm-macosx-window.diff b/emulators/scummvm/files/patch-scummvm-macosx-window.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..21bde5a255c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/patch-scummvm-macosx-window.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The YES and NO Objective-C macros clash with enum values of the same name in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+DisposeAfterUse class.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- backends/platform/sdl/macosx/macosx-window.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ backends/platform/sdl/macosx/macosx-window.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "common/ptr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "backends/platform/sdl/sdl-window.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class SdlWindow_MacOSX final : public SdlWindow {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/remove-date-time-from-version-devel.patch b/emulators/scummvm/files/remove-date-time-from-version-devel.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 08ff5bfb23c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/files/remove-date-time-from-version-devel.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove build date and time from version strings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.scummvm.org/ticket/11246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://reproducible-builds.org/docs/version-information/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git base/version.cpp base/version.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c19cd0c..e73c340 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- base/version.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ base/version.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,9 +59,8 @@ const char *gScummVMVersion = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__amigaos4__) || defined(__MORPHOS__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMBuildDate = __DATE__ " " __TIME__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *gScummVMFeatures = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef TAINTED_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   // TAINTED means the build contains engines/subengines not enabled by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git base/version.h base/version.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 74a0e72..cbd731d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- base/version.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ base/version.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BASE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMVersion;     // e.g. "0.4.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern const char *gScummVMBuildDate;   // e.g. "2003-06-24"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMFeatures;    // e.g. "ALSA MPEG2 zLib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./gui/about.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./gui/about.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,9 +99,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   version += gScummVMVersion;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   _lines.push_back(version);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  Common::U32String date = Common::U32String::format(_("(built on %s)"), gScummVMBuildDate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  _lines.push_back(U32String("C2") + date);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   for (i = 0; i < ARRAYSIZE(copyright_text); i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           addLine(U32String(copyright_text[i]));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/remove-date-time-from-version.patch b/emulators/scummvm/files/remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 89f5275c559..08ff5bfb23c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/files/remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +30,15 @@ index 74a0e72..cbd731d 100644
</span>  extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
  extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
  extern const char *gScummVMFeatures;    // e.g. "ALSA MPEG2 zLib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gui/about.cpp gui/about.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a8adaf3..35ec554 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gui/about.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gui/about.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,9 +99,6 @@ AboutDialog::AboutDialog()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./gui/about.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./gui/about.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,9 +99,6 @@
</span>   version += gScummVMVersion;
        _lines.push_back(version);
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>--       Common::String date = Common::String::format(_("(built on %s)"), gScummVMBuildDate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  _lines.push_back("C2" + date);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  Common::U32String date = Common::U32String::format(_("(built on %s)"), gScummVMBuildDate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  _lines.push_back(U32String("C2") + date);
</span> -
        for (i = 0; i < ARRAYSIZE(copyright_text); i++)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                addLine(copyright_text[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           addLine(U32String(copyright_text[i]));
</span>  
</pre><pre style='margin:0'>

</pre>