mkvtoolnix: update to 7.4.0

3 files changed, 24 insertions, 29 deletions

diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD
index 2439562..ef840a1 100644
--- a/abs/extra/mkvtoolnix/PKGBUILD
+++ b/abs/extra/mkvtoolnix/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 163843 2012-07-21 11:04:01Z giovanni $
+# $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.7.0
-pkgrel=3
+pkgver=7.4.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' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2"
-        'mm_io.patch')
-md5sums=('99ea44be570412dadafe4ccaee0cfe6e'
-         '293bd4551ef8529e9d4796c5a201b8fc')
+             'boost-libs' 'lzo' 'xdg-utils' 'boost' 'ruby')
+source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('d107166920ff0d966ac30626f7cda80d')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/mm_io.patch"
-
   # Disable automagic curl dep used for online update checking
   sed -i -e '/curl/d' configure.in
   export CURL_CFLAGS="" CURL_LIBS=""
@@ -28,34 +24,42 @@ build() {
   export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
 
-  autoreconf
+  # Sets number of threads for a parallel build
+  export DRAKETHREADS=4
+
+  autoreconf -vfi
+}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib \
               --disable-gui
-  rake
+  ./drake
 
   mv src/mkvinfo{,-cli}
 
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib
-  rake
+  ./drake
 }
 
 package_mkvtoolnix-cli() {
   pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
+  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo')
   provides=('mkvtoolnix')
   conflicts=('mkvtoolnix')
   replaces=('mkvtoolnix')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  rake DESTDIR="${pkgdir}" install
+  ./drake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkvinfo
   install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
 
   rm -rf "${pkgdir}"/usr/bin/mmg
+  rm -rf "${pkgdir}"/usr/share/man/de/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
@@ -68,18 +72,19 @@ package_mkvtoolnix-cli() {
 
 package_mkvtoolnix-gtk() {
   pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
+  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
   install=mkvtoolnix.install
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  rake DESTDIR="${pkgdir}" install
+  ./drake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkv*
   install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
   sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
 
   rm -rf "${pkgdir}"/usr/share/doc
   rm -rf "${pkgdir}"/usr/share/locale
+  rm -rf "${pkgdir}"/usr/share/man/de/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
diff --git a/abs/extra/mkvtoolnix/mkvtoolnix.install b/abs/extra/mkvtoolnix/mkvtoolnix.install
index 74d9eb2..1481351 100644
--- a/abs/extra/mkvtoolnix/mkvtoolnix.install
+++ b/abs/extra/mkvtoolnix/mkvtoolnix.install
@@ -3,6 +3,7 @@ post_install() {
    if [ -f usr/bin/update-mime-database ]; then
       update-mime-database usr/share/mime &> /dev/null
    fi
+   update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/abs/extra/mkvtoolnix/mm_io.patch b/abs/extra/mkvtoolnix/mm_io.patch
deleted file mode 100644
index 9ee9e01..0000000
--- a/abs/extra/mkvtoolnix/mm_io.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common/mm_io.cpp	2012-07-08 20:06:02.000000000 +0200
-+++ b/src/common/mm_io.cpp	2012-07-21 11:59:59.000000000 +0200
-@@ -147,7 +147,7 @@
- void
- mm_file_io_c::prepare_path(const std::string &path) {
-   boost::filesystem::path directory = boost::filesystem::path(path).parent_path();
--  if (boost::filesystem::exists(directory))
-+  if (directory.empty() || boost::filesystem::exists(directory))
-     return;
- 
-   boost::system::error_code error_code;