diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
commit | 4a133169d99e3d760caad3cbca2781872f4a0805 (patch) | |
tree | 73d442004d2d4f70e0194bd78d6b293337ec2456 /extra/mkvtoolnix | |
parent | a420f5c4c2a4eeb411175d086b339b620dba309d (diff) | |
parent | 58f5e0b164b5f4c9af61b2e42bd10c85f28b9bed (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/freedroidrpg/PKGBUILD
community/lincity-ng/PKGBUILD
community/python2-pymongo/PKGBUILD
core/openssh/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
social/monkeysphere/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/inetutils/PKGBUILD
testing/inetutils/ftpd.service
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice-common.csh
testing/libreoffice/libreoffice-common.sh
testing/modemmanager/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/upower/PKGBUILD
Diffstat (limited to 'extra/mkvtoolnix')
-rw-r--r-- | extra/mkvtoolnix/PKGBUILD | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 621575ebd..db0f32b1d 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 163843 2012-07-21 11:04:01Z giovanni $ +# $Id: PKGBUILD 165891 2012-09-03 05:48:23Z giovanni $ # 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=5.8.0 +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" - 'mm_io.patch') -md5sums=('99ea44be570412dadafe4ccaee0cfe6e' - '293bd4551ef8529e9d4796c5a201b8fc') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('8caa3d37d2442a525bad35dbb1babc56') build() { 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="" |