diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
| commit | 8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (patch) | |
| tree | 0b9c9ccac567cbaf87b22dcd32f10ceed2db065c /extra/vlc/PKGBUILD | |
| parent | 0d18015803bebeb58911bf791653597291056095 (diff) | |
| parent | 43983783a3e8bf61896eb93a2858a14bbaf3a53b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/emerald/PKGBUILD
community/gmic/PKGBUILD
community/libcompizconfig/PKGBUILD
core/xinetd/PKGBUILD
extra/archboot/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kipi-plugins/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/live-media/PKGBUILD
extra/mysql/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/r/PKGBUILD
extra/telepathy-mission-control/PKGBUILD
libre/libretools/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libldap/ntlm.patch
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/vlc/PKGBUILD')
| -rw-r--r-- | extra/vlc/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 654c7d390..7dc877239 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 131876 2011-07-16 10:50:22Z giovanni $ +# $Id: PKGBUILD 132018 2011-07-19 08:30:36Z giovanni $ # 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.11 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') -depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' +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' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') -makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' 'lirc-utils' 'gnutls' 'libcaca') |