diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
| commit | 7cd4823a20b85a5e516ae51fc04a4d1b72b5d0b9 (patch) | |
| tree | 31c86c3a5284a8b8a7f1720d27ce9e5dbf09fee4 /extra/vlc | |
| parent | d17a0ec458b03b0ed38eff13d399567f36156a73 (diff) | |
| parent | 1f567a9d58d16b76320168f0624aa55bd6320284 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cairo-clock/PKGBUILD
community/flashrom/PKGBUILD
community/kmess/PKGBUILD
core/tzdata/PKGBUILD
extra/gc/PKGBUILD
extra/libsigc++/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdmcp/PKGBUILD
extra/libxevie/PKGBUILD
extra/libxext/PKGBUILD
extra/libxinerama/PKGBUILD
extra/libxkbfile/PKGBUILD
extra/libxpm/PKGBUILD
extra/libxres/PKGBUILD
extra/libxss/PKGBUILD
extra/libxt/PKGBUILD
extra/libxtst/PKGBUILD
extra/libxv/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/pdns-recursor/PKGBUILD
extra/pdns/PKGBUILD
extra/procmail/PKGBUILD
extra/ptlib/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pyorbit/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 8ea49d495..b18902e5b 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 151098 2012-02-24 21:08:06Z giovanni $ +# $Id: PKGBUILD 151463 2012-02-26 12:17:02Z 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.0 -pkgrel=7 +pkgrel=8 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' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' 'aalib' - 'libxinerama' 'libtar' 'libtiger' 'lua' 'v4l-utils' 'smbclient' - 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' - 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' +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') -makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray' - 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'libgcrypt' - 'libraw1394' 'libdc1394' 'libavc1394' 'libpulse' - 'gnutls' 'libcaca' 'librsvg' 'portaudio' - 'ncurses' 'libgme' 'schroedinger' 'udev' 'twolame' - 'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager' 'xosd' 'git') -[ "$CARCH" = "mips64el" ] || makedepends+=('libva' 'lirc-utils' 'oss' 'projectm') +makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' + 'fluidsynth' 'libdc1394' 'libavc1394' + 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' + 'twolame' 'aalib' 'libmtp' 'libdvdcss' + 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') +[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' 'ncurses: for ncurses interface support' @@ -30,28 +28,30 @@ optdepends=('avahi: for service discovery using bonjour protocol' [ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: for lirc plugin') optdepends+=('libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'libpulse: PulseAudio support') + 'kdelibs: KDE Solid hardware integration') [ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards') -optdepends+=('libbluray: for Blu-Ray support') +optdepends+=('libbluray: for Blu-Ray support' + 'flac: for Free Lossless Audio Codec plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('oss: for OSS audio support') optdepends+=('portaudio: for portaudio support' 'twolame: for TwoLAME mpeg2 encoder plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('projectm: for ProjectM visualisation plugin') -optdepends+=('udev: for service discovery using udev' - 'libcaca: for colored ASCII art video output' +optdepends+=('libcaca: for colored ASCII art video output' 'libgme: for libgme plugin' 'librsvg: for SVG plugin' - 'libgcrypt: support for some plugins' 'gnome-vfs: for GNOME Virtual File System support' 'libgoom2: for libgoom plugin' 'vcdimager: navigate VCD with libvcdinfo' - 'xosd: for xosd support') + 'xosd: for xosd support' + 'aalib: for ASCII art plugin' + 'libmtp: for MTP devices support' + 'fluidsynth: for synthesizer MIDI FluidSynth' + 'smbclient: for SMB access plugin') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool') +options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" 'access_smb_link_to_smbclient.patch') @@ -76,7 +76,6 @@ build() { --enable-lirc \ --enable-pvr \ --enable-ncurses \ - --enable-real \ --enable-realrtsp \ --enable-xosd \ --enable-aa \ |