diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
| commit | 3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch) | |
| tree | 05623159a5ae88f6eed2414db216bc9a0d2d71c5 /extra/vlc | |
| parent | d4157e6db6dd7e03802aa9c361a1902e81c2545a (diff) | |
| parent | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/geany/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.conf
community/linux-tools/cpupower.rc
community/stk/PKGBUILD
core/patch/PKGBUILD
core/systemd/PKGBUILD
extra/lftp/PKGBUILD
extra/lftp/lftp-4.3.8-gets.patch
extra/mysql/PKGBUILD
extra/qt/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/polkit/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/systemd/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a02ba16ce..d06fb07c6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165525 2012-08-22 19:38:08Z giovanni $ +# $Id: PKGBUILD 167285 2012-09-30 02:21:52Z 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.3 -pkgrel=3 +pkgrel=4 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' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms' 'ttf-freefont') + 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'fluidsynth' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' @@ -47,7 +47,9 @@ optdepends+=('libcaca: for colored ASCII art video output' 'libmtp: for MTP devices support' 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' - 'libcdio: for audio CD playback support') + 'libcdio: for audio CD playback support' + 'ttf-freefont: for subtitle font ' + 'ttf-dejavu: for subtitle font') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' |