diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
| commit | 92155342158c2dbcc0c840325d63d1742d3583ec (patch) | |
| tree | f0900a2867d221c79742e7a06ca4244a21abf8f3 /extra/vlc | |
| parent | 78fa3fcb824603de4b7bc558a423edca6bc18836 (diff) | |
| parent | e4a5730eb358cb0d78bc022204ddccac068c2bf2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/astyle/PKGBUILD
community/gavl/PKGBUILD
community/lmms/PKGBUILD
community/portaudio/PKGBUILD
community/redshift/PKGBUILD
extra/gnutls/PKGBUILD
extra/libglade/PKGBUILD
extra/libgnome/PKGBUILD
extra/orbit2/PKGBUILD
extra/pypgsql/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-appres/PKGBUILD
extra/xorg-xdriinfo/PKGBUILD
extra/xorg-xfs/PKGBUILD
extra/xorg-xgamma/PKGBUILD
extra/xorg-xhost/PKGBUILD
extra/xorg-xkbevd/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xload/PKGBUILD
extra/xorg-xlogo/PKGBUILD
extra/xorg-xlsatoms/PKGBUILD
extra/xorg-xlsclients/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmodmap/PKGBUILD
extra/xorg-xrdb/PKGBUILD
extra/xorg-xrefresh/PKGBUILD
extra/xorg-xsetroot/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
extra/xorg-xwd/PKGBUILD
extra/xorg-xwud/PKGBUILD
extra/zile/PKGBUILD
multilib/wine/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 37cf8571b..06839c37e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150929 2012-02-23 23:36:49Z giovanni $ +# $Id: PKGBUILD 151098 2012-02-24 21:08:06Z 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=5 +pkgrel=7 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -21,7 +21,7 @@ makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray' 'libraw1394' 'libdc1394' 'libavc1394' 'libpulse' 'gnutls' 'libcaca' 'librsvg' 'portaudio' 'oss' 'ncurses' 'libgme' 'schroedinger' 'udev' 'projectm' 'twolame' - 'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager') + 'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager' 'xosd') [ "$CARCH" = "mips64el" ] || makedepends+=('libva' 'lirc-utils') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' @@ -46,7 +46,8 @@ optdepends+=('libbluray: for Blu-Ray support' 'libgcrypt: support for some plugins' 'gnome-vfs: for GNOME Virtual File System support' 'libgoom2: for libgoom plugin' - 'vcdimager: navigate VCD with libvcdinfo') + 'vcdimager: navigate VCD with libvcdinfo' + 'xosd: for xosd support') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' @@ -70,6 +71,7 @@ build() { ./configure --prefix=/usr \ --disable-rpath \ + --enable-oss \ --enable-faad \ --enable-nls \ --enable-lirc \ @@ -80,7 +82,6 @@ build() { --enable-xosd \ --enable-aa \ --enable-vcdx \ - --enable-media-library \ $extraconf make } |