[arch-commits] Commit in dssi-vst/trunk (4 files)

[speps]

    Date: Friday, March 28, 2014 @ 19:28:39
  Author: speps
Revision: 108559

upgpkg: dssi-vst 0.9.2-4 - bump for [multilib] addition

Added:
  dssi-vst/trunk/dssi-vst-winexec.patch
Modified:
  dssi-vst/trunk/PKGBUILD
Deleted:
  dssi-vst/trunk/ChangeLog
  dssi-vst/trunk/winexec.patch

------------------------+
 ChangeLog              |   11 -----------
 PKGBUILD               |   39 +++++++++++++++++++++------------------
 dssi-vst-winexec.patch |   23 +++++++++++++++++++++++
 winexec.patch          |   14 --------------
 4 files changed, 44 insertions(+), 43 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2014-03-28 15:46:58 UTC (rev 108558)
+++ ChangeLog	2014-03-28 18:28:39 UTC (rev 108559)
@@ -1,11 +0,0 @@
-6 May 2010 (GMT+8) Ray Rashif <schivmeister at gmail.com>
-
-	* 0.9.2
-	upstream release
-	gcc 4.4 patch no longer required
-	file extension issue still unsolved; winexec patch required
-
-26 Dec 2009 (GMT+8) Ray Rashif <schivmeister at gmail.com>
-
-	* 0.8-1
-	initial commit

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-28 15:46:58 UTC (rev 108558)
+++ PKGBUILD	2014-03-28 18:28:39 UTC (rev 108559)
@@ -1,43 +1,46 @@
 # $Id$
-# Maintainer: Ray Rashif <schivmeister at gmail.com>
+# Maintainer : speps <speps at aur dot archlinux dot org>
+# Contributor: Ray Rashif <schivmeister at gmail.com>
 
 pkgname=dssi-vst
 pkgver=0.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="DSSI adapter/wrapper for win32 VST plug-ins"
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://www.breakfastquay.com/dssi-vst/"
 license=('GPL')
-depends=('wine' 'jack' 'liblo>=0.28')
+depends=('wine' 'jack' 'liblo')
 makedepends=('dssi' 'ladspa')
 source=("http://code.breakfastquay.com/attachments/download/10/$pkgname-$pkgver.tar.bz2"
-	'winexec.patch')
+	"$pkgname-winexec.patch")
 md5sums=('5c569200571de76dac18be4eb6fbd9c8'
-         '7578313fb2861165ed349cef1d02f829')
+         '3e445482c8c5302de43be806f0c7506f')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgver
 
   # fix executable extension issue
-  patch -Np1 -i "${srcdir}/winexec.patch"
+  patch -p1 -i ../$pkgname-winexec.patch
 
   # use CXXFLAGS in build
-  sed -i \
-    "s:-Ivestige -Wall -fPIC:$CXXFLAGS -Ivestige -Wall -fPIC:" Makefile
+  sed -i "/m32/! s/CXXFLAGS)/& $CXXFLAGS/" Makefile
 
+  # [x86_64] use /usr/lib32/dssi
+  [[ $CARCH = x86_64 ]] && \
+  sed -i '/\/dssi-vst/s|DSSIDIR|&32|' Makefile && \
+  sed -i '/DSSI_PATH/s|\(/usr/lib\)\(/dssi\)|&:\132\2|' remotevstclient.cpp
+}
+
+build() {
+  cd $pkgname-$pkgver
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make	BINDIR="$pkgdir/usr/bin" \
   	DSSIDIR="$pkgdir/usr/lib/dssi" \
+  	DSSIDIR32="$pkgdir/usr/lib32/dssi" \
 	LADSPADIR="$pkgdir/usr/lib/ladspa" install
-
-  # dssi-vst does not know about the executable extension issue
-  cd "$pkgdir/usr/lib/dssi/dssi-vst"
-
-  mv dssi-vst-server.exe dssi-vst-server
-  mv dssi-vst-scanner.exe dssi-vst-scanner
 }

Added: dssi-vst-winexec.patch
===================================================================
--- dssi-vst-winexec.patch	                        (rev 0)
+++ dssi-vst-winexec.patch	2014-03-28 18:28:39 UTC (rev 108559)
@@ -0,0 +1,23 @@
+Thanks to Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
+Reviewed by speps <speps at aur dot archlinux dot org>
+
+diff -aur dssi-vst-0.9.2/Makefile dssi-vst-0.9.2.patched/Makefile
+--- dssi-vst-0.9.2/Makefile	2010-05-04 11:01:29.000000000 +0200
++++ dssi-vst-0.9.2.patched/Makefile	2014-03-28 18:24:41.128287015 +0100
+@@ -38,12 +38,15 @@
+ all:		$(TARGETS)
+ 
+ install:	all
++		mkdir -p $(DSSIDIR)
+ 		mkdir -p $(DSSIDIR)/dssi-vst
+ 		mkdir -p $(LADSPADIR)
+ 		mkdir -p $(BINDIR)
+ 		install dssi-vst.so $(DSSIDIR)
+ 		install dssi-vst.so $(LADSPADIR)
+-		install dssi-vst-server.exe.so dssi-vst-server dssi-vst-scanner.exe.so dssi-vst-scanner dssi-vst_gui $(DSSIDIR)/dssi-vst
++		install dssi-vst-server.exe.so dssi-vst-scanner.exe.so dssi-vst_gui $(DSSIDIR)/dssi-vst
++		install dssi-vst-server.exe $(DSSIDIR)/dssi-vst/dssi-vst-server
++		install dssi-vst-scanner.exe $(DSSIDIR)/dssi-vst/dssi-vst-scanner
+ 		install vsthost $(BINDIR)
+ 
+ clean:

Deleted: winexec.patch
===================================================================
--- winexec.patch	2014-03-28 15:46:58 UTC (rev 108558)
+++ winexec.patch	2014-03-28 18:28:39 UTC (rev 108559)
@@ -1,14 +0,0 @@
-Thanks to Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
-
-diff -rupN dssi-vst-0.8.old/Makefile dssi-vst-0.8/Makefile
---- dssi-vst-0.8.old/Makefile	2008-12-12 07:34:31.000000000 -0500
-+++ dssi-vst-0.8/Makefile	2009-04-30 04:49:04.000000000 -0400
-@@ -43,7 +43,7 @@ install:	all
- 		mkdir -p $(BINDIR)
- 		install dssi-vst.so $(DSSIDIR)
- 		install dssi-vst.so $(LADSPADIR)
--		install dssi-vst-server.exe.so dssi-vst-server dssi-vst-scanner.exe.so dssi-vst-scanner dssi-vst_gui $(DSSIDIR)/dssi-vst
-+		install dssi-vst-server.exe.so dssi-vst-server.exe dssi-vst-scanner.exe.so dssi-vst-scanner.exe dssi-vst_gui $(DSSIDIR)/dssi-vst
- 		install vsthost $(BINDIR)
-
- clean: