diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
| commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
| tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /extra/vlc | |
| parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
| parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/vlc/vlc.install | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6c899f321..c4be326df 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140130 2011-10-07 15:51:39Z giovanni $ +# $Id: PKGBUILD 142646 2011-11-12 17:15:45Z ibiru $ # 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=1 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -28,8 +28,9 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') [ "$CARCH" = "mips64el" ] && { makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' @@ -42,7 +43,6 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' 'libpulse: PulseAudio support') } conflicts=('vlc-plugin') diff --git a/extra/vlc/vlc.install b/extra/vlc/vlc.install index 4a1091bc5..dc4961cae 100644 --- a/extra/vlc/vlc.install +++ b/extra/vlc/vlc.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins update-desktop-database -q } |