[arch-commits] Commit in mkvtoolnix/trunk (2 files)

[Giovanni Scafora]

    Date: Sunday, September 21, 2014 @ 06:44:03
  Author: giovanni
Revision: 222526

upgpkg: mkvtoolnix 7.2.0-1

upstream release

Modified:
  mkvtoolnix/trunk/PKGBUILD
Deleted:
  mkvtoolnix/trunk/0001-fix-compilation-with-Boost-1.56.0.patch

----------------------------------------------+
 0001-fix-compilation-with-Boost-1.56.0.patch |   74 -------------------------
 PKGBUILD                                     |   12 +---
 2 files changed, 4 insertions(+), 82 deletions(-)

Deleted: 0001-fix-compilation-with-Boost-1.56.0.patch
===================================================================
--- 0001-fix-compilation-with-Boost-1.56.0.patch	2014-09-20 22:01:44 UTC (rev 222525)
+++ 0001-fix-compilation-with-Boost-1.56.0.patch	2014-09-21 04:44:03 UTC (rev 222526)
@@ -1,74 +0,0 @@
-From 0c89ff941bfdd9f3378312f293a84f13cf3e2a96 Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <moritz at bunkus.org>
-Date: Sat, 9 Aug 2014 22:32:24 +0200
-Subject: [PATCH] fix compilation with Boost 1.56.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Boost's »indexed« range adaptor has changed in an incompatible way in
-1.56.0. The underlying iterator can now be used with range-based for
-loops, but that means that there's no way safe for #ifdefs for catering
-to both 1.56.0 and older versions.
-
-Fixes #1051.
----
- src/common/iso639.cpp | 25 +++++++++++++++++++++----
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/src/common/iso639.cpp b/src/common/iso639.cpp
-index db40117..aec77f0 100644
---- a/src/common/iso639.cpp
-+++ b/src/common/iso639.cpp
-@@ -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;
--- 
-2.0.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-20 22:01:44 UTC (rev 222525)
+++ PKGBUILD	2014-09-21 04:44:03 UTC (rev 222526)
@@ -4,23 +4,19 @@
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=7.1.0
-pkgrel=4
+pkgver=7.2.0
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz"
-        "0001-fix-compilation-with-Boost-1.56.0.patch")
-md5sums=('a374511b0743a700548622d23cd5616c'
-         '1fa23e00ad329435fda249e52df91755')
+source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('ad13a7bd6620692aa53392ad0e297251')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p1 -i "${srcdir}/0001-fix-compilation-with-Boost-1.56.0.patch"
-
   # Disable automagic curl dep used for online update checking
   sed -i -e '/curl/d' configure.in
   export CURL_CFLAGS="" CURL_LIBS=""