[arch-commits] Commit in soundtouch/repos (5 files)

Sat Nov 7 00:09:31 UTC 2009

Date: Friday, November 6, 2009 @ 19:09:31
  Author: jgc
Revision: 58315

Merged revisions 21423,58307,58309,58313 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/soundtouch/trunk

........
  r21423 | eric | 2008-12-13 01:10:06 +0100 (Sat, 13 Dec 2008) | 1 line
  
  added svn Id tag
........
  r58307 | jgc | 2009-11-07 00:54:57 +0100 (Sat, 07 Nov 2009) | 4 lines
  
  upgpkg: soundtouch 1.4.0-1
      Update to 1.4.0, use some patches from redhat:
  - fix ASM on x86_64
  - only compile SSE/MMX optimized parts with mmmx and msse flags
........
  r58309 | jgc | 2009-11-07 00:59:45 +0100 (Sat, 07 Nov 2009) | 2 lines
  
  upgpkg: soundtouch 1.4.0-1
      Fix PIC issue (FS#16534)
........
  r58313 | jgc | 2009-11-07 01:08:26 +0100 (Sat, 07 Nov 2009) | 2 lines
  
  upgpkg: soundtouch 1.4.0-1
      Really fix PIC issues now
........

Added:
  soundtouch/repos/extra-i686/soundtouch-1.4.0-mmx-sse-compile-fix.patch
    (from rev 58313, soundtouch/trunk/soundtouch-1.4.0-mmx-sse-compile-fix.patch)
  soundtouch/repos/extra-i686/soundtouch-1.4.0-x86_64-asm-broken.patch
    (from rev 58313, soundtouch/trunk/soundtouch-1.4.0-x86_64-asm-broken.patch)
Modified:
  soundtouch/repos/extra-i686/	(properties)
  soundtouch/repos/extra-i686/PKGBUILD	(contents, properties)
Deleted:
  soundtouch/repos/extra-i686/07_gcc43.patch

--------------------------------------------+
 07_gcc43.patch                             |   13 -----------
 PKGBUILD                                   |   30 +++++++++++++++++----------
 soundtouch-1.4.0-mmx-sse-compile-fix.patch |   14 ++++++++++++
 soundtouch-1.4.0-x86_64-asm-broken.patch   |   12 ++++++++++
 4 files changed, 45 insertions(+), 24 deletions(-)


Property changes on: soundtouch/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /soundtouch/trunk:1-21415
   + /soundtouch/trunk:1-58314

Deleted: extra-i686/07_gcc43.patch
===================================================================

--- extra-i686/07_gcc43.patch	2009-11-07 00:08:41 UTC (rev 58314)
+++ extra-i686/07_gcc43.patch	2009-11-07 00:09:31 UTC (rev 58315)
@@ -1,13 +0,0 @@
-
-diff -Nur soundtouch-1.3.0/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp soundtouch-1.3.0.new/build-tree/SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp
---- SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp	2004-10-30 11:10:16.000000000 -0400
-+++ SoundTouch-1.3.0/source/example/SoundStretch/WavFile.cpp	2008-03-10 11:14:37.000000000 -0400
-@@ -48,6 +48,7 @@
- #include <stdio.h>
- #include <stdexcept>
- #include <string>
-+#include <cstring>
- #include <assert.h>
- #include <limits.h>
- 
-

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-07 00:08:41 UTC (rev 58314)
+++ extra-i686/PKGBUILD	2009-11-07 00:09:31 UTC (rev 58315)
@@ -1,25 +1,33 @@
-# $Id: PKGBUILD,v 1.13 2007/06/19 02:12:51 Snowman Exp $
+# $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot at juvepoland.com>
 # Contributor: Raymano <re1212122000 at yahoo.com>
 
 pkgname=soundtouch
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="An audio processing library"
 arch=('i686' 'x86_64')
 url="http://www.surina.net/soundtouch/"
 license=('LGPL')
-depends=('gcc-libs')
+depends=('gcc-libs>=4.4.2')
 options=('!libtool')
-source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz 07_gcc43.patch)
-md5sums=('5e0185e81dbba2f2eed8581b7664ab04' '3c7f912769f8c59042a12277deba5d89')
+source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
+        soundtouch-1.4.0-mmx-sse-compile-fix.patch
+        soundtouch-1.4.0-x86_64-asm-broken.patch)
+md5sums=('fc4bb10401624899efe4fb554d4fd3ed'
+         'f0204136c90ce4f6d4761073151eb4dc'
+         '0d856bb5b519b18c6ba3a2e1770bdfd2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../07_gcc43.patch || return 1
-  ./bootstrap || return 1
-  ./configure --prefix=/usr || return 1
+  cd "${srcdir}/${pkgname}"
+  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" || return 1
+  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" || return 1
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --with-pic || return 1
+  else
+    ./configure --prefix=/usr || return 1
+  fi
   make || return 1
-  make DESTDIR=$startdir/pkg pkgdocdir=/usr/share/doc/soundtouch install || return 1
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || return 1
 }


Property changes on: soundtouch/repos/extra-i686/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Copied: soundtouch/repos/extra-i686/soundtouch-1.4.0-mmx-sse-compile-fix.patch (from rev 58313, soundtouch/trunk/soundtouch-1.4.0-mmx-sse-compile-fix.patch)
===================================================================
--- extra-i686/soundtouch-1.4.0-mmx-sse-compile-fix.patch	                        (rev 0)
+++ extra-i686/soundtouch-1.4.0-mmx-sse-compile-fix.patch	2009-11-07 00:09:31 UTC (rev 58315)
@@ -0,0 +1,14 @@
+diff -up soundtouch/source/SoundTouch/Makefile.in~ soundtouch/source/SoundTouch/Makefile.in
+--- soundtouch/source/SoundTouch/Makefile.in~	2009-02-15 11:21:36.000000000 +0100
++++ soundtouch/source/SoundTouch/Makefile.in	2009-02-15 11:23:30.000000000 +0100
+@@ -209,7 +209,9 @@ libSoundTouch_la_SOURCES = AAFilter.cpp 
+ # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
+ # fix this script to automatically check for CPU architecture, please submit a patch 
+ # to me.
+-AM_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include
++AM_CXXFLAGS = -fcheck-new -I../../include
++mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
++sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
+ all: all-am
+ 
+ .SUFFIXES:

Copied: soundtouch/repos/extra-i686/soundtouch-1.4.0-x86_64-asm-broken.patch (from rev 58313, soundtouch/trunk/soundtouch-1.4.0-x86_64-asm-broken.patch)
===================================================================
--- extra-i686/soundtouch-1.4.0-x86_64-asm-broken.patch	                        (rev 0)
+++ extra-i686/soundtouch-1.4.0-x86_64-asm-broken.patch	2009-11-07 00:09:31 UTC (rev 58315)
@@ -0,0 +1,12 @@
+diff -up soundtouch/include/STTypes.h~ soundtouch/include/STTypes.h
+--- soundtouch/include/STTypes.h~	2009-01-25 17:32:53.000000000 +0100
++++ soundtouch/include/STTypes.h	2009-02-14 22:22:37.000000000 +0100
+@@ -87,7 +87,7 @@ namespace soundtouch
+  
+  #endif
+ 
+-    #if (WIN32 || __i386__ || __x86_64__)
++    #if (WIN32 || __i386__)
+         /// Define this to allow X86-specific assembler/intrinsic optimizations. 
+         /// Notice that library contains also usual C++ versions of each of these
+         /// these routines, so if you're having difficulties getting the optimized 


