Mon Aug 22 23:14:28 UTC 2011

2 files changed, 34 insertions, 33 deletions

diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index 5a016aa63..e27054573 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -1,10 +1,8 @@
-# $Id: PKGBUILD 67310 2010-02-06 08:17:47Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Raymano <re1212122000@yahoo.com>
+# $Id: PKGBUILD 136036 2011-08-21 23:32:17Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=soundtouch
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="An audio processing library"
 arch=('i686' 'x86_64')
@@ -15,22 +13,25 @@ options=('!libtool')
 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=('5456481d8707d2a2c27466ea64a099cb' 'f0204136c90ce4f6d4761073151eb4dc'\
+md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
+         '108cd080b4b0ebe8ed1f950ff1315e7a'
          '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' '39815091c4cb1817f8a56b8fb29fa684984514d1'\
-         '95282cca856b3b8645fadb530ce5eb892074f193')
+sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
+          '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
+          '95282cca856b3b8645fadb530ce5eb892074f193')
 
 build() {
   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 --enable-shared --with-pic || return 1
-  else
-    ./configure --prefix=/usr --enable-shared || return 1
-  fi
-  make || return 1
-  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || return 1
-  # Upstream changed pkgconfig filename
-  ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || return 1
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
+
+  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install
 }
diff --git a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
index 4369b178b..562e38e97 100644
--- a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
+++ b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
@@ -1,14 +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:
+diff -up soundtouch/source/SoundTouch/Makefile.am~ soundtouch/source/SoundTouch/Makefile.am
+--- soundtouch/source/SoundTouch/Makefile.am~	2009-02-15 11:21:36.000000000 +0100
++++ soundtouch/source/SoundTouch/Makefile.am	2009-02-15 11:23:30.000000000 +0100
+@@ -36,7 +36,9 @@
+ # 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

+ 

+ 

+ # other linking flags to add