Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/curlftpfs/PKGBUILD
	core/libcap/PKGBUILD
	core/libsasl/PKGBUILD
	core/udev/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dbus/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/mercurial/PKGBUILD
	extra/redland/PKGBUILD
	extra/soprano/PKGBUILD
	multilib/lib32-curl/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD

1 files changed, 27 insertions, 19 deletions

diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 8884d0d3b..ffdf094aa 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,45 +1,53 @@
-# $Id: PKGBUILD 101416 2010-11-29 05:43:59Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 134420 2011-08-03 19:34:12Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.1.19
-pkgrel=2
+pkgrel=3
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'esound' 'flac' 'libvorbis' 'sdl' 'libmng' 'libtheora'
-         'libxcb' 'wavpack' 'ffmpeg' 'faad2')
-makedepends=('pkg-config' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 
-             'vcdimager' 'jack' 'gtk2' 'libpulse' 'speex' 'aalib')
-optdepends=('imagemagick: for using the imagemagick plugin' 'smbclient: for using the smb plugin' \
-            'jack: for using the jack plugin' 'vcdimager: for using the vcd plugin' \
-            'gtk2: for using the gdk-pixbuf plugin' 'mesa: for using the opengl plugin' \
-            'libpulse: for using the pulseaudio plugin' 'speex: for using the speex plugin' \
+depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'libmodplug'
+             'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+            'smbclient: for using the smb plugin' \
+            'jack: for using the jack plugin' \
+            'vcdimager: for using the vcd plugin' \
+            'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
+            'mesa: for using the opengl plugin' \
+            'libpulse: for using the pulseaudio plugin' \
+            'speex: for using the speex plugin' \
+            'libmodplug: for using the modplug plugin' \
+            'v4l-utils: for using the v4l plugin' \
+            'wavpack: for using the wavpack plugin' \
+            'faad2: for using the faad plugin' \
+            'libmng: for using the mng plugin' \
             'aalib: for using the aalib plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
         xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch)
-md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' '9776df4eb54d2f1f68d8268adbc3b5c2'\
+md5sums=('a410a0f0617e1d6309f0cbe907f73f8a'
+         '9776df4eb54d2f1f68d8268adbc3b5c2'
          '8662fb124870b1dd7effe4ff5e2a2e3d')
-sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' '121a8358d7919b2e51067412373f52848290338a'\
-         '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
+sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0'
+          '121a8358d7919b2e51067412373f52848290338a'
+          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch
   patch -p0 < ../xine-lib-1.1.19-xvmc.patch
+  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
+    configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
 
   libtoolize --force --copy
   aclocal -I m4
   autoconf
   automake --add-missing
 
-  ./configure --prefix=/usr --with-w32-path=/usr/lib/codecs \
-    --with-xv-path=/usr/lib --with-xxmc-path=/usr/lib --with-xvmc-path=/usr/lib \
-    --with-libflac --with-wavpack --with-xcb --with-jack --with-speex \
-    --disable-gnomevfs --with-pulseaudio --enable-aalib --disable-modplug \
-    --with-external-ffmpeg
+  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
   make
 }