[arch-commits] CVS update of extra/multimedia/xine-lib (3 files)

[Varun Acharya]

    Date: Thursday, June 7, 2007 @ 12:55:20
  Author: ganja_guru
    Path: /home/cvs-extra/extra/multimedia/xine-lib

   Added: bgo375866.patch (1.1)
          xine-lib-1.1.1-configure-no-mcpu-march.patch (1.1)
          xine-lib-1.1.4-CVE-2007-1246.patch (1.1)

upgpkg: xine-lib 1.1.6-2.1


----------------------------------------------+
 bgo375866.patch                              |   25 ++++++++++++++++++
 xine-lib-1.1.1-configure-no-mcpu-march.patch |   13 +++++++++
 xine-lib-1.1.4-CVE-2007-1246.patch           |   33 +++++++++++++++++++++++++
 3 files changed, 71 insertions(+)


Index: extra/multimedia/xine-lib/bgo375866.patch
diff -u /dev/null extra/multimedia/xine-lib/bgo375866.patch:1.1
--- /dev/null	Thu Jun  7 12:55:20 2007
+++ extra/multimedia/xine-lib/bgo375866.patch	Thu Jun  7 12:55:20 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) {
+
Index: extra/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
diff -u /dev/null extra/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch:1.1
--- /dev/null	Thu Jun  7 12:55:20 2007
+++ extra/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch	Thu Jun  7 12:55:20 2007
@@ -0,0 +1,13 @@
+--- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
++++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
+@@ -161,10 +161,6 @@
+                   ;;
+ 
+               esac
+-              if test x"$archopt_val" != x; then
+-                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+-                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+-              fi
+             fi
+           else
+             dnl we have the Intel compiler
Index: extra/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch
diff -u /dev/null extra/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch:1.1
--- /dev/null	Thu Jun  7 12:55:20 2007
+++ extra/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch	Thu Jun  7 12:55:20 2007
@@ -0,0 +1,33 @@
+? default
+? enterprise
+? prakesh
+Index: src/libw32dll/DirectShow/DS_VideoDecoder.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c,v
+retrieving revision 1.9
+diff -u -B -r1.9 DS_VideoDecoder.c
+--- src/libw32dll/DirectShow/DS_VideoDecoder.c	24 Dec 2003 16:55:36 -0000	1.9
++++ src/libw32dll/DirectShow/DS_VideoDecoder.c	10 Mar 2007 00:33:41 -0000
+@@ -110,6 +110,7 @@
+      
+         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++        this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;
+Index: src/libw32dll/dmo/DMO_VideoDecoder.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c,v
+retrieving revision 1.4
+diff -u -B -r1.4 DMO_VideoDecoder.c
+--- src/libw32dll/dmo/DMO_VideoDecoder.c	24 Dec 2003 16:55:36 -0000	1.4
++++ src/libw32dll/dmo/DMO_VideoDecoder.c	10 Mar 2007 00:33:41 -0000
+@@ -118,6 +118,7 @@
+      
+         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++        this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;