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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d8c4a8e653f99dd27f15ddfe8dc8e9b7c854ec2e">https://github.com/macports/macports-ports/commit/d8c4a8e653f99dd27f15ddfe8dc8e9b7c854ec2e</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 d8c4a8e653f scummvm: bump release to v2.2.0
</span>d8c4a8e653f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d8c4a8e653f99dd27f15ddfe8dc8e9b7c854ec2e
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Dec 9 21:36:06 2020 -0800

<span style='display:block; white-space:pre;color:#404040;'>    scummvm: bump release to v2.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    always use c++11 -- fixes build on Leopard, at least
</span><span style='display:block; white-space:pre;color:#404040;'>    minor tweak to patches, otherwise minimal changes
</span>---
 emulators/scummvm/Portfile                         | 28 +++++------
 .../files/remove-date-time-from-version.patch      | 57 +++++++++++-----------
 2 files changed, 39 insertions(+), 46 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 b8eca502294..ad1ae0a2394 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;'>@@ -15,11 +15,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.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           sha256  6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        rmd160  0361156e76b9a1f0fd4541be0637dc888504091c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    27188916
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup        scummvm scummvm 2.2.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  1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  3011e4d66fd3b5e28029afbd894a9cd7df9e9ec1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    63652348
</span> 
     conflicts           ${name}-devel
     long_description ${description}: \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ if {${subport} eq ${name}} {
</span>         6 months. If for some reason this port does not build or function as desired, try \
         the ${name}-devel port.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    master_sites        ${homepage}/frs/${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    master_sites        https://downloads.scummvm.org/frs/${name}/${version}
</span>     use_xz              yes
 
     github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,24 +89,18 @@ configure.args-append  \
</span>                     --enable-jpeg \
                     --enable-readline \
                     --enable-all-engines \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --enable-verbose-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --enable-verbose-build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --enable-c++11
</span> 
 # libcurl needs --enable-cloud as well otherwise link errors
 # also connected to --enable-sdlnet
 
 if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cxx11 description {build with c++11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # scummvm builds fine without c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # I'm not sure if there is any advantage to enabling c++11 support at present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # but keep it here as a variant in case someone finds there is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     compiler.cxx_standard   2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --enable-c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Leopard build, at least, fails without c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard   2011
</span> 
 variant mpeg2 description {add mpeg2 support - has many dependencies} {
      # this builds fine, but libmpeg2 is old (2008) and pulls in a lot of deps
<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 51d554ebe73..89f5275c559 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;'>@@ -1,47 +1,46 @@
</span> Remove build date and time from version strings.
 https://bugs.scummvm.org/ticket/11246
 https://reproducible-builds.org/docs/version-information/
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gui/about.cpp.orig  2019-10-04 16:41:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gui/about.cpp  2019-11-07 21:46:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,9 +91,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::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:#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(copyright_text[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- base/version.cpp.orig  2019-10-04 16:41:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ base/version.cpp       2019-11-07 21:41:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,13 +60,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git base/version.cpp base/version.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c19cd0c..e73c340 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- base/version.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ base/version.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,9 +59,8 @@ const char *gScummVMVersion = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__amigaos4__) || defined(__MORPHOS__)
</span>  static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
  #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __PLAYSTATION2__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMBuildDate = "Git Master"; /* ScummVM Git Master */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION " - PlayStation2";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " - PlayStation2";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span> -const char *gScummVMBuildDate = __DATE__ " " __TIME__;
 -const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
 -const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
 +const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION;
 +const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span>  const char *gScummVMFeatures = ""
  #ifdef TAINTED_BUILD
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- base/version.h.orig 2019-10-04 16:41:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ base/version.h 2019-11-07 21:45:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,9 +24,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // TAINTED means the build contains engines/subengines not enabled by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git base/version.h base/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 74a0e72..cbd731d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- base/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ base/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,6 @@
</span>  #define BASE_VERSION_H
  
  extern const char *gScummVMVersion;     // e.g. "0.4.1"
 -extern const char *gScummVMBuildDate;   // e.g. "2003-06-24"
<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 *gScummVMVersionDate; // e.g. "0.4.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
</span>  extern const char *gScummVMFeatures;    // e.g. "ALSA MPEG2 zLib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gui/about.cpp gui/about.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a8adaf3..35ec554 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gui/about.cpp
</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 @@ AboutDialog::AboutDialog()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   version += gScummVMVersion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   _lines.push_back(version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  Common::String date = Common::String::format(_("(built on %s)"), gScummVMBuildDate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  _lines.push_back("C2" + date);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   for (i = 0; i < ARRAYSIZE(copyright_text); i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           addLine(copyright_text[i]);
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>

</pre>