diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /extra/soundtouch | |
parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/soundtouch')
-rw-r--r-- | extra/soundtouch/PKGBUILD | 28 | ||||
-rw-r--r-- | extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch | 28 |
2 files changed, 25 insertions, 31 deletions
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD index 3de1063b2..02932f3f5 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' 'mips64el') @@ -16,24 +14,18 @@ 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 disable-mmx.patch) -md5sums=('5456481d8707d2a2c27466ea64a099cb' - 'f0204136c90ce4f6d4761073151eb4dc' - '0d856bb5b519b18c6ba3a2e1770bdfd2' - '3a5097f2a65ec9bd5f733f9935cd498b') -sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' - '39815091c4cb1817f8a56b8fb29fa684984514d1' - '95282cca856b3b8645fadb530ce5eb892074f193' - '92d7851d1992a592dab5490f18c072df943afdda') + soundtouch-1.4.0-x86_64-asm-broken.patch) build() { cd "${srcdir}/${pkgname}" - patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" - patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" + 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" if [ "${CARCH}" = "mips64el" ]; then patch -Np1 -i "${srcdir}/disable-mmx.patch" fi + ./bootstrap case $CARCH in i686) ./configure --prefix=/usr --enable-shared @@ -46,7 +38,9 @@ build() { ;; esac make +} + +package() { + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install - # Upstream changed pkgconfig filename - ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || return 1 } 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
|