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

2014-01-01 Thread Ray Rashif
Date: Thursday, January 2, 2014 @ 07:24:22
  Author: schiv
Revision: 203029

upgpkg: snd 14.2-1

upstream release

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

--+
 PKGBUILD |   20 +---
 type_error.patch |   12 
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-02 06:23:00 UTC (rev 203028)
+++ PKGBUILD2014-01-02 06:24:22 UTC (rev 203029)
@@ -4,30 +4,20 @@
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=14.1
-pkgrel=2
+pkgver=14.2
+pkgrel=1
 pkgdesc=An advanced sound editor
 arch=('i686' 'x86_64')
 url=http://ccrma.stanford.edu/software/snd/;
-license=('custom')
+license=('custom:free')
 depends=('jack' 'gamin' 'gsl' 'fftw' 'gtk2' 'libmpc')
 makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
  'timidity++' 'mpg123' 'vorbis-tools')
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
 'timidity++' 'vorbis-tools')
-source=(ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz;
-'type_error.patch')
-md5sums=('955ca19ca70ac0e4d03cd710516c0174'
- '9bfea0dccdfb5da1ba81e721672b11cc')
+
source=(ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz;)
+md5sums=('a442b98c75043bc8a4b9b50ba0c2b5b7')
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix incomplete type error
-  # see http://www.mail-archive.com/cmdist@ccrma.stanford.edu/msg04241.html
-  patch -Np1 -i $srcdir/type_error.patch
-}
-
 build() {
   cd $srcdir/$pkgname-$pkgver
 

Deleted: type_error.patch
===
--- type_error.patch2014-01-02 06:23:00 UTC (rev 203028)
+++ type_error.patch2014-01-02 06:24:22 UTC (rev 203029)
@@ -1,12 +0,0 @@
-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);
- }



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

2013-10-27 Thread Ray Rashif
Date: Sunday, October 27, 2013 @ 22:04:21
  Author: schiv
Revision: 197655

upgpkg: snd 14.1-1

upstream release

Added:
  snd/trunk/type_error.patch
Modified:
  snd/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 type_error.patch |   20 
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-27 19:10:51 UTC (rev 197654)
+++ PKGBUILD2013-10-27 21:04:21 UTC (rev 197655)
@@ -4,7 +4,7 @@
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.9
+pkgver=14.1
 pkgrel=1
 pkgdesc=An advanced sound editor
 arch=('i686' 'x86_64')
@@ -16,9 +16,18 @@
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
 'timidity++' 'vorbis-tools')
 install=$pkgname.install
-source=(ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz;)
-md5sums=('acceab2d1e30720640aca54d4b68d45b')
+source=(ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz;
+'type_error.patch')
+md5sums=('955ca19ca70ac0e4d03cd710516c0174'
+ '6e96d59346b53a1c73060857f688dbd0')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # work around incomplete type error
+  patch -Np1 -i $srcdir/type_error.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
 

Added: type_error.patch
===
--- type_error.patch(rev 0)
+++ type_error.patch2013-10-27 21:04:21 UTC (rev 197655)
@@ -0,0 +1,20 @@
+diff -ur snd-14.1.orig/vct.h snd-14.1/vct.h
+--- snd-14.1.orig/vct.h2013-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 {