diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-04 21:39:50 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-04 21:39:50 -0300 |
commit | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (patch) | |
tree | 1f5ef1cf64d8477147f581592b19c94bcaafd917 /extra/mkvtoolnix | |
parent | 2bd8076ad5b2278e808a796d572bb99a7fccf52a (diff) | |
parent | 85828cc2c2c3ef5c0b9b03388b9323d3d163b389 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/avidemux/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/valgrind/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
staging/kdeutils/PKGBUILD
Diffstat (limited to 'extra/mkvtoolnix')
-rw-r--r-- | extra/mkvtoolnix/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 873ba0163..8b2ae6712 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 145175 2011-12-19 00:22:15Z giovanni $ +# $Id: PKGBUILD 145886 2012-01-03 19:05:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.2.0 -pkgrel=2 +pkgver=5.2.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('53445217c42736d5932082e5596c20d4') +md5sums=('d4942dc6427935838e914b8b7b83021a') build() { cd "${srcdir}/${pkgbase}-${pkgver}" |