[arch-commits] CVS update of arch/build/multimedia/xine-lib (4 files)

Jan de Groot jgc at archlinux.org
Sun Jun 17 06:40:49 EDT 2007


    Date: Sunday, June 17, 2007 @ 06:40:49
  Author: jgc
    Path: /home/cvs-arch/arch/build/multimedia/xine-lib

 Removed: PKGBUILD (1.46) 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)

Remove from current, it went to extra a while ago.


----------------------------------------------+
 PKGBUILD                                     |   40 -------------------------
 bgo375866.patch                              |   25 ---------------
 xine-lib-1.1.1-configure-no-mcpu-march.patch |   13 --------
 xine-lib-1.1.4-CVE-2007-1246.patch           |   33 --------------------
 4 files changed, 111 deletions(-)


Index: arch/build/multimedia/xine-lib/PKGBUILD
diff -u arch/build/multimedia/xine-lib/PKGBUILD:1.46 arch/build/multimedia/xine-lib/PKGBUILD:removed
--- arch/build/multimedia/xine-lib/PKGBUILD:1.46	Fri May 25 01:47:37 2007
+++ arch/build/multimedia/xine-lib/PKGBUILD	Sun Jun 17 06:40:49 2007
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD,v 1.46 2007/05/25 05:47:37 pierre Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
-pkgname=xine-lib
-pkgver=1.1.6
-pkgrel=2.1
-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' 'alsa-lib')
-options=('!libtool')
-source=(http://heanet.dl.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.gz
-	xine-lib-1.1.1-configure-no-mcpu-march.patch
-	bgo375866.patch)
-url="http://xinehq.de/"
-md5sums=('0795db067d191595a5ead8d638c4dfb2'
-         '9776df4eb54d2f1f68d8268adbc3b5c2'
-         '652998ea683f4647b950025ff5bb0064')
-
-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
-  automake --gnu --add-missing
-  autoconf
-  export SED="/bin/sed"
-  export LIBPNG_CONFIG="/usr/bin/pkg-config libpng12"
-
-  ./configure --prefix=/usr --with-w32-path=/usr/lib/win32 \
-    --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 arch/build/multimedia/xine-lib/bgo375866.patch:1.1 arch/build/multimedia/xine-lib/bgo375866.patch:removed
--- arch/build/multimedia/xine-lib/bgo375866.patch:1.1	Wed May 16 17:47:54 2007
+++ arch/build/multimedia/xine-lib/bgo375866.patch	Sun Jun 17 06:40:49 2007
@@ -1,25 +0,0 @@
-
-# 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: arch/build/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
diff -u arch/build/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch:1.1 arch/build/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch:removed
--- arch/build/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch:1.1	Tue May 30 16:00:35 2006
+++ arch/build/multimedia/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch	Sun Jun 17 06:40:49 2007
@@ -1,13 +0,0 @@
---- 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: arch/build/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch
diff -u arch/build/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch:1.1 arch/build/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch:removed
--- arch/build/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch:1.1	Sun Mar 11 04:12:53 2007
+++ arch/build/multimedia/xine-lib/xine-lib-1.1.4-CVE-2007-1246.patch	Sun Jun 17 06:40:49 2007
@@ -1,33 +0,0 @@
-? 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;




More information about the arch-commits mailing list