[arch-commits] Commit in mkvtoolnix/repos (10 files)

Giovanni Scafora giovanni at archlinux.org
Sun Sep 21 04:44:11 UTC 2014


    Date: Sunday, September 21, 2014 @ 06:44:11
  Author: giovanni
Revision: 222527

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  mkvtoolnix/repos/extra-i686/PKGBUILD
    (from rev 222526, mkvtoolnix/trunk/PKGBUILD)
  mkvtoolnix/repos/extra-i686/mkvtoolnix.install
    (from rev 222526, mkvtoolnix/trunk/mkvtoolnix.install)
  mkvtoolnix/repos/extra-x86_64/PKGBUILD
    (from rev 222526, mkvtoolnix/trunk/PKGBUILD)
  mkvtoolnix/repos/extra-x86_64/mkvtoolnix.install
    (from rev 222526, mkvtoolnix/trunk/mkvtoolnix.install)
Deleted:
  mkvtoolnix/repos/extra-i686/0001-fix-compilation-with-Boost-1.56.0.patch
  mkvtoolnix/repos/extra-i686/PKGBUILD
  mkvtoolnix/repos/extra-i686/mkvtoolnix.install
  mkvtoolnix/repos/extra-x86_64/0001-fix-compilation-with-Boost-1.56.0.patch
  mkvtoolnix/repos/extra-x86_64/PKGBUILD
  mkvtoolnix/repos/extra-x86_64/mkvtoolnix.install

-----------------------------------------------------------+
 /PKGBUILD                                                 |  186 ++++++++++++
 /mkvtoolnix.install                                       |   30 +
 extra-i686/0001-fix-compilation-with-Boost-1.56.0.patch   |   74 ----
 extra-i686/PKGBUILD                                       |   97 ------
 extra-i686/mkvtoolnix.install                             |   15 
 extra-x86_64/0001-fix-compilation-with-Boost-1.56.0.patch |   74 ----
 extra-x86_64/PKGBUILD                                     |   97 ------
 extra-x86_64/mkvtoolnix.install                           |   15 
 8 files changed, 216 insertions(+), 372 deletions(-)

Deleted: extra-i686/0001-fix-compilation-with-Boost-1.56.0.patch
===================================================================
--- extra-i686/0001-fix-compilation-with-Boost-1.56.0.patch	2014-09-21 04:44:03 UTC (rev 222526)
+++ extra-i686/0001-fix-compilation-with-Boost-1.56.0.patch	2014-09-21 04:44:11 UTC (rev 222527)
@@ -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
-

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-09-21 04:44:03 UTC (rev 222526)
+++ extra-i686/PKGBUILD	2014-09-21 04:44:11 UTC (rev 222527)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: xduugu <xduugu at gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=7.1.0
-pkgrel=4
-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')
-
-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=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  # 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
-  ./drake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  ./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' 'lzo')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  ./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
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  ./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*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}

Copied: mkvtoolnix/repos/extra-i686/PKGBUILD (from rev 222526, mkvtoolnix/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-09-21 04:44:11 UTC (rev 222527)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: xduugu <xduugu at gmx.com>
+
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
+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")
+md5sums=('ad13a7bd6620692aa53392ad0e297251')
+
+prepare() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # Disable automagic curl dep used for online update checking
+  sed -i -e '/curl/d' configure.in
+  export CURL_CFLAGS="" CURL_LIBS=""
+
+  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+
+  # 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
+  ./drake
+
+  mv src/mkvinfo{,-cli}
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib
+  ./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' 'lzo')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  ./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
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/applications
+  rm -rf "${pkgdir}"/usr/share/icons
+  rm -rf "${pkgdir}"/usr/share/mime
+}
+
+package_mkvtoolnix-gtk() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
+  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  ./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*
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
+}

Deleted: extra-i686/mkvtoolnix.install
===================================================================
--- extra-i686/mkvtoolnix.install	2014-09-21 04:44:03 UTC (rev 222526)
+++ extra-i686/mkvtoolnix.install	2014-09-21 04:44:11 UTC (rev 222527)
@@ -1,15 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-   update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}

Copied: mkvtoolnix/repos/extra-i686/mkvtoolnix.install (from rev 222526, mkvtoolnix/trunk/mkvtoolnix.install)
===================================================================
--- extra-i686/mkvtoolnix.install	                        (rev 0)
+++ extra-i686/mkvtoolnix.install	2014-09-21 04:44:11 UTC (rev 222527)
@@ -0,0 +1,15 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   if [ -f usr/bin/update-mime-database ]; then
+      update-mime-database usr/share/mime &> /dev/null
+   fi
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   post_install
+}
+
+pre_remove() {
+   post_install
+}

Deleted: extra-x86_64/0001-fix-compilation-with-Boost-1.56.0.patch
===================================================================
--- extra-x86_64/0001-fix-compilation-with-Boost-1.56.0.patch	2014-09-21 04:44:03 UTC (rev 222526)
+++ extra-x86_64/0001-fix-compilation-with-Boost-1.56.0.patch	2014-09-21 04:44:11 UTC (rev 222527)
@@ -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
-

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-09-21 04:44:03 UTC (rev 222526)
+++ extra-x86_64/PKGBUILD	2014-09-21 04:44:11 UTC (rev 222527)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: xduugu <xduugu at gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=7.1.0
-pkgrel=4
-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')
-
-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=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  # 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
-  ./drake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  ./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' 'lzo')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  ./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
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  ./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*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}

Copied: mkvtoolnix/repos/extra-x86_64/PKGBUILD (from rev 222526, mkvtoolnix/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-09-21 04:44:11 UTC (rev 222527)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: xduugu <xduugu at gmx.com>
+
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
+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")
+md5sums=('ad13a7bd6620692aa53392ad0e297251')
+
+prepare() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # Disable automagic curl dep used for online update checking
+  sed -i -e '/curl/d' configure.in
+  export CURL_CFLAGS="" CURL_LIBS=""
+
+  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+
+  # 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
+  ./drake
+
+  mv src/mkvinfo{,-cli}
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib
+  ./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' 'lzo')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  ./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
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
+  rm -rf "${pkgdir}"/usr/share/applications
+  rm -rf "${pkgdir}"/usr/share/icons
+  rm -rf "${pkgdir}"/usr/share/mime
+}
+
+package_mkvtoolnix-gtk() {
+  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
+  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils' 'desktop-file-utils')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  ./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*
+  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
+  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
+}

Deleted: extra-x86_64/mkvtoolnix.install
===================================================================
--- extra-x86_64/mkvtoolnix.install	2014-09-21 04:44:03 UTC (rev 222526)
+++ extra-x86_64/mkvtoolnix.install	2014-09-21 04:44:11 UTC (rev 222527)
@@ -1,15 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-   update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}

Copied: mkvtoolnix/repos/extra-x86_64/mkvtoolnix.install (from rev 222526, mkvtoolnix/trunk/mkvtoolnix.install)
===================================================================
--- extra-x86_64/mkvtoolnix.install	                        (rev 0)
+++ extra-x86_64/mkvtoolnix.install	2014-09-21 04:44:11 UTC (rev 222527)
@@ -0,0 +1,15 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   if [ -f usr/bin/update-mime-database ]; then
+      update-mime-database usr/share/mime &> /dev/null
+   fi
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   post_install
+}
+
+pre_remove() {
+   post_install
+}




More information about the arch-commits mailing list