Ticket #44844: mkvtoolnix-7.1.0.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           github 1.0
 PortGroup           muniversal 1.0
 PortGroup           wxWidgets 1.0
 
-name                mkvtoolnix
-version             7.0.0
-revision            2
+github.setup        mbunkus mkvtoolnix 7.1.0 release-
 categories          multimedia
 maintainers         nomaintainer
 license             GPL-2+ LGPL-2.1+
@@ -18 +17 @@
                     Unices, just what the OGMtools do for the OGM format.
 homepage            http://www.bunkus.org/videotools/mkvtoolnix/
 platforms           darwin
-master_sites        ${homepage}sources/ \
-                    http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
-use_xz              yes
+#master_sites       ${homepage}sources/
+#use_xz             yes
 
-checksums           rmd160  8e581b26661c2bd1b388b1ad99dfd092f0da0700 \
-                    sha256  2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725
+checksums           rmd160  ce356e8d4101d233e47c6eb5249a1a3f5f52e4b6 \
+                    sha256  51676d1e0f340ccd5a4ef404689566d73e331d199d06049dc72a4639cb48e0a8
 
 wxWidgets.use       wxWidgets-3.0
 
@@ -52 +50 @@
 
 # patch-clang_errors.diff: https://trac.macports.org/ticket/40231
 patchfiles          patch-ruby.diff \
-                    patch-clang_errors.diff
+                    patch-clang_errors.diff \
+                    patch-upstream-boost.diff
 
 platform darwin {
     if {${os.major} < 13} {

files/patch-upstream-boost.diff

@@ +1 @@
+https://trac.bunkus.org/ticket/1051
+https://trac.bunkus.org/changeset/0c89ff941bfdd9f3378312f293a84f13cf3e2a96
+
+--- src/common/iso639.cpp       (revision 916450e3a7c9b670846ff87a8112f165c903ab19)
++++ src/common/iso639.cpp       (revision 0c89ff941bfdd9f3378312f293a84f13cf3e2a96)
+@@ -13,6 +13,7 @@
+ 
+ #include "common/common_pch.h"
+ 
++#include <boost/version.hpp>
+ #include <unordered_map>
+ 
+ #include "common/iso639.h"
+@@ -592,20 +593,36 @@ map_to_iso639_2_code(std::string const &s,
+   auto range = iso639_languages | badap::indexed(0);
+   auto end   = boost::end(range);
+   for (auto lang = boost::begin(range); lang != end; lang++) {
+-    auto names = split(lang->english_name, ";");
++#if BOOST_VERSION < 105600
++    auto const &english_name = lang->english_name;
++    auto index               = lang.index();
++#else
++    auto const &english_name = lang->value().english_name;
++    auto index               = lang->index();
++#endif
++
++    auto names = split(english_name, ";");
+     strip(names);
+     if (brng::find(names, source) != names.end())
+-      return lang.index();
++      return index;
+   }
+ 
+   if (!allow_short_english_name)
+     return -1;
+ 
+   for (auto lang = boost::begin(range); lang != end; lang++) {
+-    auto names = split(lang->english_name, ";");
++#if BOOST_VERSION < 105600
++    auto const &english_name = lang->english_name;
++    auto index               = lang.index();
++#else
++    auto const &english_name = lang->value().english_name;
++    auto index               = lang->index();
++#endif
++
++    auto names = split(english_name, ";");
+     strip(names);
+     if (names.end() != brng::find_if(names, [&](std::string const &name) { return balg::istarts_with(name, source); }))
+-      return lang.index();
++      return index;
+   }
+ 
+   return -1;