[arch-commits] CVS update of arch/build/multimedia/xine-lib (PKGBUILD bgo375866.patch)

[Jan de Groot]

    Date: Wednesday, May 16, 2007 @ 17:47:54
  Author: jgc
    Path: /home/cvs-arch/arch/build/multimedia/xine-lib

   Added: bgo375866.patch (1.1)
Modified: PKGBUILD (1.44 -> 1.45)

upgpkg: xine-lib 1.1.6-2
Backport patch from hg, totem wants it for the browserplugin to function correctly


-----------------+
 PKGBUILD        |   18 +++++++++---------
 bgo375866.patch |   25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)


Index: arch/build/multimedia/xine-lib/PKGBUILD
diff -u arch/build/multimedia/xine-lib/PKGBUILD:1.44 arch/build/multimedia/xine-lib/PKGBUILD:1.45
--- arch/build/multimedia/xine-lib/PKGBUILD:1.44	Fri Apr 20 18:26:48 2007
+++ arch/build/multimedia/xine-lib/PKGBUILD	Wed May 16 17:47:54 2007
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD,v 1.44 2007/04/20 22:26:48 tpowa Exp $
+# $Id: PKGBUILD,v 1.45 2007/05/16 21:47:54 jgc Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=xine-lib
 pkgver=1.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
+license=('LGPL' 'GPL')
 depends=('libgl' 'libxvmc' 'esd' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora'
          'codecs')
 makedepends=('pkgconfig' 'libtool' 'automake' 'autoconf' 'imagemagick' 
              'smbclient' 'mesa')
-options=('nolibtool')
+options=('!libtool')
 source=(http://heanet.dl.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.gz
-	xine-lib-1.1.1-configure-no-mcpu-march.patch)
+	xine-lib-1.1.1-configure-no-mcpu-march.patch
+	bgo375866.patch)
 url="http://xinehq.de/"
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np0 -i ${startdir}/src/xine-lib-1.1.1-configure-no-mcpu-march.patch || return 1
+  patch -Np1 -i ${startdir}/src/bgo375866.patch || return 1
   aclocal -I m4
   libtoolize --force
   autoheader
@@ -26,12 +29,9 @@
   export SED="/bin/sed"
   export LIBPNG_CONFIG="/usr/bin/pkg-config libpng12"
 
-if [ "$CARCH" = "x86_64" ]; then
-  CONF="--disable-polypaudio"
-fi
-
   ./configure --prefix=/usr --with-w32-path=/usr/lib/win32 \
-    --with-xv-path=/usr/lib --with-libflac ${CONF}
+    --with-xv-path=/usr/lib --with-libflac --without-arts \
+    --without-jack --disable-gnomevfs --disable-polypaudio
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }
Index: arch/build/multimedia/xine-lib/bgo375866.patch
diff -u /dev/null arch/build/multimedia/xine-lib/bgo375866.patch:1.1
--- /dev/null	Wed May 16 17:47:54 2007
+++ arch/build/multimedia/xine-lib/bgo375866.patch	Wed May 16 17:47:54 2007
@@ -0,0 +1,25 @@
+
+# HG changeset patch
+# User hadess at cookie.hadess.net
+# Date 1178322114 -3600
+# Node ID 2b182beaba686b9eef2001741ce909ac1a9a82cb
+# Parent ce82ad163b0e36d3edefd90bfe3f2ba05ab3ace3
+- Fix _x_io_select exiting when the select has been interrupted (EINTR errno)
+  when we want to run until the timeout has occurred, partially fixes
+  Totem's browser plugin playing back browser streams with the xine-lib
+  backend
+
+See http://bugzilla.gnome.org/show_bug.cgi?id=375866 for details
+
+--- a/src/xine-engine/io_helper.c	Wed May 02 21:51:16 2007 +0200
++++ b/src/xine-engine/io_helper.c	Sat May 05 00:41:54 2007 +0100
+@@ -276,7 +276,7 @@ int _x_io_select (xine_stream_t *stream,
+     wset = (state & XIO_WRITE_READY) ? &fdset : NULL;
+     ret = select (fd + 1, rset, wset, NULL, &select_timeout);
+ 
+-    if (ret == -1) {
++    if (ret == -1 && errno != EINTR) {
+       /* select error */
+       return XIO_ERROR;
+     } else if (ret == 1) {
+