diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
commit | b0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch) | |
tree | 376cc5751d9a587815d7270caa61070f38832766 /extra/vlc/PKGBUILD | |
parent | 8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff) | |
parent | 76ee9007095484a113d1856786b81e2d2fae8202 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/bmp-musepack/PKGBUILD
community/bmp-wma/PKGBUILD
community/bonnie++/PKGBUILD
community/cantata/PKGBUILD
community/checkinstall/PKGBUILD
community/chrootuid/PKGBUILD
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/compiz/PKGBUILD
community/compizconfig-backend-gconf/PKGBUILD
community/compizconfig-python/PKGBUILD
community/ekg2/PKGBUILD
community/emerald/PKGBUILD
community/fbgetty/PKGBUILD
community/flumotion/PKGBUILD
community/leafnode/PKGBUILD
community/libcompizconfig/PKGBUILD
community/libdnet/PKGBUILD
community/libee/PKGBUILD
community/libtxc_dxtn/PKGBUILD
community/linux-tools/PKGBUILD
community/openntpd/PKGBUILD
community/osiris/PKGBUILD
community/perl-package-stash-xs/PKGBUILD
community/perl-params-util/PKGBUILD
community/procstatd/PKGBUILD
community/scponly/PKGBUILD
community/sniffit/PKGBUILD
community/synergy/PKGBUILD
community/turbojpeg/PKGBUILD
community/unbound/PKGBUILD
community/uucp/PKGBUILD
core/gawk/PKGBUILD
core/ifenslave/PKGBUILD
core/jfsutils/PKGBUILD
core/openldap/PKGBUILD
core/rfkill/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
core/xinetd/PKGBUILD
extra/avahi/PKGBUILD
extra/calligra/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/flac/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libbluray/PKGBUILD
extra/libdmx/PKGBUILD
extra/libfs/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/libtiff/PKGBUILD
extra/libxau/PKGBUILD
extra/libxfixes/PKGBUILD
extra/licq/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-guard/PKGBUILD
extra/perl-template-toolkit/PKGBUILD
extra/pidgin/PKGBUILD
extra/pigeonhole/PKGBUILD
extra/poppler/PKGBUILD
extra/postgresql/PKGBUILD
extra/python-geoip/PKGBUILD
extra/python/PKGBUILD
extra/samba/PKGBUILD
extra/sqlite/PKGBUILD
extra/vde2/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-dict/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/xscreensaver-libre/PKGBUILD
Diffstat (limited to 'extra/vlc/PKGBUILD')
-rw-r--r-- | extra/vlc/PKGBUILD | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 0b5a3ed0e..89e79b0ef 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ +# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.6 -pkgrel=2 +pkgver=2.0.7 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -13,10 +13,9 @@ license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms') + 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' + 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' @@ -47,7 +46,6 @@ optdepends+=('libcaca: for colored ASCII art video output' 'xosd: for xosd support' 'aalib: for ASCII art plugin' 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' @@ -61,7 +59,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('b45be633c71dca04ca7d6c3d64dd728b') +md5sums=('3b0e465b0990097b65abaf3e25589957') build() { cd "${srcdir}/${pkgname}-${pkgver}" |