diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/snd | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/snd')
| -rw-r--r-- | extra/snd/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/snd/snd.install | 3 | ||||
| -rw-r--r-- | extra/snd/type_error.patch | 32 |
3 files changed, 17 insertions, 28 deletions
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 2a23dc657..aa68286a9 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197656 2013-10-27 21:04:41Z schiv $ +# $Id: PKGBUILD 199037 2013-11-07 17:11:41Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib 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 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp' '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" } diff --git a/extra/snd/snd.install b/extra/snd/snd.install deleted file mode 100644 index 57b42ddff..000000000 --- a/extra/snd/snd.install +++ /dev/null @@ -1,3 +0,0 @@ -post_upgrade() { - echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues" -} diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch index e7bf9ab91..1232c6e36 100644 --- a/extra/snd/type_error.patch +++ b/extra/snd/type_error.patch @@ -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); + } |