diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-12 09:40:29 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-12 09:40:29 -0300 |
| commit | eef796260fb7cc9b81044e43df8f313c3c8e768a (patch) | |
| tree | db6c6a07c0da415fe2e68648fbd39473cba2ccd2 /extra/vlc | |
| parent | 6767b6bbf9829a692c85c3dcd5ee0280982bd252 (diff) | |
| parent | ef947957a5734ba25be3cdb6595491c816592133 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/btanks/PKGBUILD
community/highlight/PKGBUILD
community/luaexpat/PKGBUILD
community/luakit/PKGBUILD
community/luasec/PKGBUILD
community/luasocket/PKGBUILD
extra/graphviz/PKGBUILD
extra/gvfs/PKGBUILD
extra/lua/PKGBUILD
extra/openal/PKGBUILD
extra/sane/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 0a3ceae07..cbbc4e3e9 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 171268 2012-11-16 23:35:53Z ibiru $ +# $Id: PKGBUILD 173179 2012-12-12 00:32:08Z eric $ # 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.4 -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/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 'xcb-util-keysyms') @@ -19,7 +19,8 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'fluidsynth' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2') + 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' + 'mesa') [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' @@ -85,7 +86,8 @@ build() { --enable-upnp \ --enable-opus \ --enable-sftp \ - $extraconf + $extraconf \ + LUAC=luac5.1 make } |