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

Giovanni Scafora giovanni at archlinux.org
Tue Nov 29 22:35:31 UTC 2011


    Date: Tuesday, November 29, 2011 @ 17:35:31
  Author: giovanni
Revision: 143843

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

Added:
  mkvtoolnix/repos/staging-i686/PKGBUILD
    (from rev 143842, mkvtoolnix/trunk/PKGBUILD)
  mkvtoolnix/repos/staging-i686/mkvtoolnix.install
    (from rev 143842, mkvtoolnix/trunk/mkvtoolnix.install)
  mkvtoolnix/repos/staging-x86_64/PKGBUILD
    (from rev 143842, mkvtoolnix/trunk/PKGBUILD)
  mkvtoolnix/repos/staging-x86_64/mkvtoolnix.install
    (from rev 143842, mkvtoolnix/trunk/mkvtoolnix.install)
Deleted:
  mkvtoolnix/repos/staging-i686/PKGBUILD
  mkvtoolnix/repos/staging-i686/mkvtoolnix.install
  mkvtoolnix/repos/staging-x86_64/PKGBUILD
  mkvtoolnix/repos/staging-x86_64/mkvtoolnix.install

-----------------------------------+
 staging-i686/PKGBUILD             |  149 +++++++++++++++++++-----------------
 staging-i686/mkvtoolnix.install   |   28 +++---
 staging-x86_64/PKGBUILD           |  149 +++++++++++++++++++-----------------
 staging-x86_64/mkvtoolnix.install |   28 +++---
 4 files changed, 190 insertions(+), 164 deletions(-)

Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD	2011-11-29 22:35:07 UTC (rev 143842)
+++ staging-i686/PKGBUILD	2011-11-29 22:35:31 UTC (rev 143843)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.0.1
-pkgrel=5
-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")
-md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
-
-build() {
-  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=2"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-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')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  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/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')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  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*
-}

Copied: mkvtoolnix/repos/staging-i686/PKGBUILD (from rev 143842, mkvtoolnix/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2011-11-29 22:35:31 UTC (rev 143843)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
+pkgver=5.0.1
+pkgrel=6
+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")
+md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
+
+build() {
+  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=2"
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+
+  autoreconf
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib \
+              --disable-gui
+  rake
+
+  mv src/mkvinfo{,-cli}
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib
+  rake
+}
+
+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')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake 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/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/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')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake 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/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*
+}

Deleted: staging-i686/mkvtoolnix.install
===================================================================
--- staging-i686/mkvtoolnix.install	2011-11-29 22:35:07 UTC (rev 143842)
+++ staging-i686/mkvtoolnix.install	2011-11-29 22:35:31 UTC (rev 143843)
@@ -1,14 +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
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}

Copied: mkvtoolnix/repos/staging-i686/mkvtoolnix.install (from rev 143842, mkvtoolnix/trunk/mkvtoolnix.install)
===================================================================
--- staging-i686/mkvtoolnix.install	                        (rev 0)
+++ staging-i686/mkvtoolnix.install	2011-11-29 22:35:31 UTC (rev 143843)
@@ -0,0 +1,14 @@
+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
+}
+
+post_upgrade() {
+   post_install
+}
+
+pre_remove() {
+   post_install
+}

Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD	2011-11-29 22:35:07 UTC (rev 143842)
+++ staging-x86_64/PKGBUILD	2011-11-29 22:35:31 UTC (rev 143843)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.0.1
-pkgrel=5
-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")
-md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
-
-build() {
-  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=2"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-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')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  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/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')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  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*
-}

Copied: mkvtoolnix/repos/staging-x86_64/PKGBUILD (from rev 143842, mkvtoolnix/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2011-11-29 22:35:31 UTC (rev 143843)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgbase=mkvtoolnix
+pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
+pkgver=5.0.1
+pkgrel=6
+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")
+md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
+
+build() {
+  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=2"
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+
+  autoreconf
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib \
+              --disable-gui
+  rake
+
+  mv src/mkvinfo{,-cli}
+
+  ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib
+  rake
+}
+
+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')
+  provides=('mkvtoolnix')
+  conflicts=('mkvtoolnix')
+  replaces=('mkvtoolnix')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake 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/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/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')
+  install=mkvtoolnix.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  rake 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/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*
+}

Deleted: staging-x86_64/mkvtoolnix.install
===================================================================
--- staging-x86_64/mkvtoolnix.install	2011-11-29 22:35:07 UTC (rev 143842)
+++ staging-x86_64/mkvtoolnix.install	2011-11-29 22:35:31 UTC (rev 143843)
@@ -1,14 +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
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}

Copied: mkvtoolnix/repos/staging-x86_64/mkvtoolnix.install (from rev 143842, mkvtoolnix/trunk/mkvtoolnix.install)
===================================================================
--- staging-x86_64/mkvtoolnix.install	                        (rev 0)
+++ staging-x86_64/mkvtoolnix.install	2011-11-29 22:35:31 UTC (rev 143843)
@@ -0,0 +1,14 @@
+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
+}
+
+post_upgrade() {
+   post_install
+}
+
+pre_remove() {
+   post_install
+}




More information about the arch-commits mailing list