Mon Oct 1 00:42:09 PDT 2012

1 files changed, 22 insertions, 44 deletions

diff --git a/community/stk/PKGBUILD b/community/stk/PKGBUILD
index 498763465..2a97d360c 100644
--- a/community/stk/PKGBUILD
+++ b/community/stk/PKGBUILD
@@ -1,51 +1,38 @@
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Ray Rashif <schiv@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=stk
-pkgver=4.4.2
-pkgrel=6
-pkgdesc="The Synthesis ToolKit in C++"
+pkgver=4.4.4
+pkgrel=1
+pkgdesc='The Synthesis ToolKit in C++'
 arch=('i686' 'x86_64')
-url="http://ccrma.stanford.edu/software/stk/"
+url='http://ccrma.stanford.edu/software/stk/'
 license=('MIT')
 depends=('gcc-libs' 'jack')
 makedepends=('pkg-config')
-optdepends=('oss: use OSSv4 output/API'
-            'tk: run provided demos/samples')
-source=(http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz
-        $pkgname.license
-        cxxflags.patch
+optdepends=('tk: run provided demos/samples')
+source=("http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz"
+        "$pkgname.license"
         runtime.patch)
-md5sums=('0b7bd1f913ca01fb8b2201ebcf853358'
+md5sums=('66646cb1117eee2d767c4571cc51a8c3'
          'a0163d75a5f516b6c93f4fc948acff73'
-         '1b09d29321d575ad670f6371651015c6'
          '36551c348340307c765fde85d4336e73')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # fails with --as-needed
-  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-
-  # optimise for our target architecture(s)
-  patch -Np1 -i ../cxxflags.patch
-  autoreconf
+  # add missing linker flag
+  export LIBS="$LIBS -lpthread" 
 
   # enable shared library
-  sed -i \
-    "s:cd src && \$(MAKE)$:& lib$pkgname.so.$pkgver:" \
-      Makefile.in
+  sed -i 's/all : $(STATICLIB)/all : $(SHAREDLIB)/' src/Makefile.in
 
   # fix demo rawwaves path
-  sed -i 's:\.\./\.\.:/usr/lib/stk:' \
-    projects/demo/demo.cpp
+  sed -i 's:\.\./\.\.:/usr/lib/stk:' projects/demo/demo.cpp
 
   # run actual build
-  ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ \
-              --prefix=/usr \
-              --with-alsa \
-              --with-jack \
-              --with-oss
+  ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack
   make
 
   # fix executable scripts
@@ -62,27 +49,18 @@ package() {
 
   # install headers
   install -m644 include/* "$pkgdir/usr/include/stk/"
-  rm "$pkgdir"/usr/include/stk/*~
 
   # install runtime files
-  cp -a rawwaves projects/demo/{demo,tcl} \
-    projects/effects/{effects,tcl} \
-    projects/ragamatic/{ragamat,tcl,rawwaves} \
-      "$pkgdir/usr/lib/stk/"
+  cp -a rawwaves projects/demo/{demo,tcl} projects/effects/{effects,tcl} \
+    projects/ragamatic/{ragamat,tcl,rawwaves} "$pkgdir/usr/lib/stk/"
 
   # install executables
-  install -m755 projects/{demo/StkDemo,effects/StkEffects} \
-    "$pkgdir/usr/bin/"
-
-  install -m755 projects/ragamatic/Raga \
-    "$pkgdir/usr/bin/StkRagamatic"
+  install -m755 projects/{demo/StkDemo,effects/StkEffects} "$pkgdir/usr/bin/"
+  install -m755 projects/ragamatic/Raga "$pkgdir/usr/bin/StkRagamatic"
 
   # install license
-  install -Dm644 ../$pkgname.license \
-    "$pkgdir/usr/share/licenses/stk/LICENSE"
+  install -Dm644 "../$pkgname.license" "$pkgdir/usr/share/licenses/stk/LICENSE"
 
   # remove .DS_Store directory: https://bugs.archlinux.org/task/25255
-  rm -rf ${pkgdir}/usr/lib/stk/rawwaves/.DS_Store
+  rm -rf "${pkgdir}/usr/lib/stk/rawwaves/.DS_Store"
 }
-
-# vim:set ts=2 sw=2 et: