diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
| commit | 8a3d4ee5105eefa2136eb7ae83e69d01f29864c3 (patch) | |
| tree | 8be9a06d3b2d8cade4b5dba48e040c632bd33850 /extra/vlc | |
| parent | 404b7ff94ece6bb2ce0e9df042ac1fe798137c83 (diff) | |
| parent | d1d87d2ac643e3dabc251f3cec7d3b00e29b282c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/zathura/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/libdvdread/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/postgresql/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 71013e312..be817dda5 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143209 2011-11-23 11:58:47Z giovanni $ +# $Id: PKGBUILD 144439 2011-12-05 19:49:38Z andyrtr $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.12 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -14,7 +14,7 @@ depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' |