Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/pigeonhole/PKGBUILD
	community/mingw32-pthreads/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/remmina/PKGBUILD
	core/crda/PKGBUILD
	core/libnl/PKGBUILD
	core/wpa_supplicant/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/libcdio/PKGBUILD
	extra/maxima/PKGBUILD
	extra/vcdimager/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xfdesktop/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/q4wine/PKGBUILD
	testing/dovecot/PKGBUILD

1 files changed, 36 insertions, 22 deletions

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index b82ecab07..37cf8571b 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 150788 2012-02-22 11:22:08Z ibiru $
+# $Id: PKGBUILD 150929 2012-02-23 23:36:49Z 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=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=('GPL')
+license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+         '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'
+         'xcb-util-keysyms' 'ttf-freefont')
 makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
+             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'libgcrypt'
              'libraw1394' 'libdc1394' 'libavc1394' 'libpulse'
-             'gnutls' 'libcaca' 'oss')
+             'gnutls' 'libcaca' 'librsvg' 'portaudio' 'oss'
+             'ncurses' 'libgme' 'schroedinger' 'udev' 'projectm' 'twolame' 
+             'libdvdcss' 'gnome-vfs' 'libgoom2' 'vcdimager')
 [ "$CARCH" = "mips64el" ] || makedepends+=('libva' 'lirc-utils')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
@@ -29,10 +31,22 @@ optdepends=('avahi: for service discovery using bonjour protocol'
 optdepends+=('libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support')
-[ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards')
-optdepends+=('libbluray: for Blu-Ray disks'
-            'oss: for OSS audio')
+            'libpulse: PulseAudio support'
+[ "$CARCH" = "mips64el" ] || optdepends+=('vdpau-video: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
+optdepends+=('libbluray: for Blu-Ray support' 
+            'oss: for OSS audio support'
+            'portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'projectm: for ProjectM visualisation plugin'
+            'udev: for service discovery using udev'
+            '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')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -40,7 +54,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        access_smb_link_to_smbclient.patch)
+        'access_smb_link_to_smbclient.patch')
 md5sums=('8806bff2ea9c76791123d444a92f708c'
          '5f510fdea99cdb7941423eb40045968a')
 
@@ -57,24 +71,24 @@ build() {
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
-              --enable-dbus-control \
               --enable-nls \
               --enable-lirc \
               --enable-pvr \
               --enable-ncurses \
-              --enable-upnp \
-              --enable-oss \
-              --enable-bluray \
-              --enable-live555 \
+              --enable-real \
               --enable-realrtsp \
-              $extraconf
+              --enable-xosd \
+              --enable-aa \
+              --enable-vcdx \
+              --enable-media-library \
+	      $extraconf
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}/" install
+  make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128; do
     install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \