[135704] trunk/dports/multimedia/mkvtoolnix

[ryandesign at macports.org]

Revision: 135704
          https://trac.macports.org/changeset/135704
Author:   ryandesign at macports.org
Date:     2015-04-29 21:44:50 -0700 (Wed, 29 Apr 2015)
Log Message:
-----------
mkvtoolnix: fix --check-for-updates

Modified Paths:
--------------
    trunk/dports/multimedia/mkvtoolnix/Portfile
    trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff

Modified: trunk/dports/multimedia/mkvtoolnix/Portfile
===================================================================
--- trunk/dports/multimedia/mkvtoolnix/Portfile	2015-04-30 04:32:48 UTC (rev 135703)
+++ trunk/dports/multimedia/mkvtoolnix/Portfile	2015-04-30 04:44:50 UTC (rev 135704)
@@ -2,13 +2,12 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           github 1.0
 PortGroup           muniversal 1.0
 PortGroup           wxWidgets 1.0
-#PortGroup          github 1.0
-#github.setup       mbunkus mkvtoolnix 7.8.0 release-
 
-name                mkvtoolnix
-version             7.8.0
+github.setup        mbunkus mkvtoolnix 7.8.0 release-
+revision            1
 categories          multimedia
 maintainers         ryandesign openmaintainer
 license             GPL-2+ LGPL-2.1+

Modified: trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff
===================================================================
--- trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff	2015-04-30 04:32:48 UTC (rev 135703)
+++ trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff	2015-04-30 04:44:50 UTC (rev 135704)
@@ -1,23 +1,18 @@
 Fix https://github.com/mbunkus/mkvtoolnix/issues/1175
+https://github.com/mbunkus/mkvtoolnix/commit/3f9b3d2490ba33526c821571f4ec3828373ca336
 --- src/common/command_line.cpp.orig
 +++ src/common/command_line.cpp
-@@ -291,6 +291,7 @@ handle_common_cli_args(std::vector<std::string> &args,
-     } else if ((args[i] == "-h") || (args[i] == "-?") || (args[i] == "--help"))
-       usage();
+@@ -299,7 +299,7 @@ handle_common_cli_args(std::vector<std::string> &args,
+         mxerror(boost::format(Y("The update information could not be retrieved from %1%.\n")) % MTX_VERSION_CHECK_URL);
  
-+#if 0
- #if defined(HAVE_CURL_EASY_H)
-     else if (args[i] == "--check-for-updates") {
-       mtx_release_version_t rel = get_latest_release_version();
-@@ -310,6 +311,7 @@ handle_common_cli_args(std::vector<std::string> &args,
-       mxexit(rel.current_version < rel.latest_source ? 1 : 0);
-     }
- #endif  // defined(HAVE_CURL_EASY_H)
-+#endif
+       std::vector<std::string> keys;
+-      brng::push_back(keys, rel.urls | badap::map_keys | badap::filtered([](std::string const &key) { return key != "general"; }));
++      brng::push_back(keys, rel.urls | badap::map_keys | badap::filtered(+[](std::string const &key) { return key != "general"; }));
+       brng::sort(keys);
  
-     else
-       ++i;
+       std::string urls;
 Fix https://github.com/mbunkus/mkvtoolnix/issues/1176
+https://github.com/mbunkus/mkvtoolnix/commit/8a90335fab410f917e78e15d611f065b5d528eb1
 --- src/common/version.cpp.orig
 +++ src/common/version.cpp
 @@ -228,7 +228,7 @@ get_latest_release_version() {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150429/3ad60b0e/attachment.html>