[arch-commits] Commit in snd/trunk (PKGBUILD snd.install type_error.patch)

[Ray Rashif]

    Date: Thursday, November 7, 2013 @ 18:10:12
  Author: schiv
Revision: 199036

upgpkg: snd 14.1-2

update patch with proper upstream fix
remove install script since gtk is now recommended

Modified:
  snd/trunk/PKGBUILD
  snd/trunk/type_error.patch
Deleted:
  snd/trunk/snd.install

------------------+
 PKGBUILD         |    8 ++++----
 snd.install      |    3 ---
 type_error.patch |   32 ++++++++++++--------------------
 3 files changed, 16 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-07 14:18:34 UTC (rev 199035)
+++ PKGBUILD	2013-11-07 17:10:12 UTC (rev 199036)
@@ -5,7 +5,7 @@
 
 pkgname=snd
 pkgver=14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
 url="http://ccrma.stanford.edu/software/snd/"
@@ -15,16 +15,16 @@
              'timidity++' 'mpg123' 'vorbis-tools')
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
-install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz"
         'type_error.patch')
 md5sums=('955ca19ca70ac0e4d03cd710516c0174'
-         '6e96d59346b53a1c73060857f688dbd0')
+         '9bfea0dccdfb5da1ba81e721672b11cc')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # work around incomplete type error
+  # fix incomplete type error
+  # see http://www.mail-archive.com/cmdist@ccrma.stanford.edu/msg04241.html
   patch -Np1 -i "$srcdir/type_error.patch"
 }
 

Deleted: snd.install
===================================================================
--- snd.install	2013-11-07 14:18:34 UTC (rev 199035)
+++ snd.install	2013-11-07 17:10:12 UTC (rev 199036)
@@ -1,3 +0,0 @@
-post_upgrade() {
-	echo "  > snd GUI is now GTK+ due to lesstif/libxpm build issues"
-}

Modified: type_error.patch
===================================================================
--- type_error.patch	2013-11-07 14:18:34 UTC (rev 199035)
+++ type_error.patch	2013-11-07 17:10:12 UTC (rev 199036)
@@ -1,20 +1,12 @@
-diff -ur snd-14.1.orig/vct.h snd-14.1/vct.h
---- snd-14.1.orig/vct.h	2013-10-28 02:22:35.073798054 +0800
-+++ snd-14.1/vct.h	2013-10-28 02:45:27.166364791 +0800
-@@ -1,11 +1,11 @@
- #ifndef VCT_H
- #define VCT_H
- 
--#if HAVE_SCHEME
--  typedef struct s7_cell vct;
--#else
--typedef struct vct vct;
--#endif
-+typedef struct {
-+  mus_long_t length;
-+  mus_float_t *data;
-+  bool dont_free;
-+} vct;
- 
- #ifdef __cplusplus
- extern "C" {
+diff -bur snd-14.1.orig/snd-ladspa.c snd-14.1/snd-ladspa.c
+--- snd-14.1.orig/snd-ladspa.c	2013-10-28 16:07:53.260612114 +0800
++++ snd-14.1/snd-ladspa.c	2013-10-28 16:11:18.792831983 +0800
+@@ -1191,7 +1191,7 @@
+   if (descriptor->connect_port) 
+     descriptor->connect_port(XEN_TO_C_Ladspa_Handle(ptr),
+ 			     XEN_TO_C_ULONG(port),
+-			     double_to_float(samples->data, samples->length)
++			     double_to_float(mus_vct_data(samples), mus_vct_length(samples))
+ 			     );
+   return(XEN_FALSE);
+ }