Date: Sunday, October 27, 2013 @ 22:04:41 Author: schiv Revision: 197656
archrelease: copy trunk to extra-i686, extra-x86_64 Added: snd/repos/extra-i686/.contrib (from rev 197655, snd/trunk/.contrib) snd/repos/extra-i686/PKGBUILD (from rev 197655, snd/trunk/PKGBUILD) snd/repos/extra-i686/snd.install (from rev 197655, snd/trunk/snd.install) snd/repos/extra-i686/type_error.patch (from rev 197655, snd/trunk/type_error.patch) snd/repos/extra-x86_64/.contrib (from rev 197655, snd/trunk/.contrib) snd/repos/extra-x86_64/PKGBUILD (from rev 197655, snd/trunk/PKGBUILD) snd/repos/extra-x86_64/snd.install (from rev 197655, snd/trunk/snd.install) snd/repos/extra-x86_64/type_error.patch (from rev 197655, snd/trunk/type_error.patch) Deleted: snd/repos/extra-i686/.contrib snd/repos/extra-i686/PKGBUILD snd/repos/extra-i686/snd.install snd/repos/extra-x86_64/.contrib snd/repos/extra-x86_64/PKGBUILD snd/repos/extra-x86_64/snd.install -------------------------------+ /.contrib | 4 + /PKGBUILD | 108 ++++++++++++++++++++++++++++++++++++++++ /snd.install | 6 ++ extra-i686/.contrib | 2 extra-i686/PKGBUILD | 45 ---------------- extra-i686/snd.install | 3 - extra-i686/type_error.patch | 20 +++++++ extra-x86_64/.contrib | 2 extra-x86_64/PKGBUILD | 45 ---------------- extra-x86_64/snd.install | 3 - extra-x86_64/type_error.patch | 20 +++++++ 11 files changed, 158 insertions(+), 100 deletions(-) Deleted: extra-i686/.contrib =================================================================== --- extra-i686/.contrib 2013-10-27 21:04:21 UTC (rev 197655) +++ extra-i686/.contrib 2013-10-27 21:04:41 UTC (rev 197656) @@ -1,2 +0,0 @@ -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: dorphell <dorph...@archlinux.org> Copied: snd/repos/extra-i686/.contrib (from rev 197655, snd/trunk/.contrib) =================================================================== --- extra-i686/.contrib (rev 0) +++ extra-i686/.contrib 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,2 @@ +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: dorphell <dorph...@archlinux.org> Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-27 21:04:21 UTC (rev 197655) +++ extra-i686/PKGBUILD 2013-10-27 21:04:41 UTC (rev 197656) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: Juergen Hoetzel <juer...@archlinux.org> -# Contributor: see .contrib - -pkgname=snd -pkgver=13.9 -pkgrel=1 -pkgdesc="An advanced sound editor" -arch=('i686' 'x86_64') -url="http://ccrma.stanford.edu/software/snd/" -license=('custom') -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') -install=$pkgname.install -source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('acceab2d1e30720640aca54d4b68d45b') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - LDFLAGS+=" -Wl,-z,noexecstack" - - ./configure --prefix=/usr \ - --with-alsa \ - --with-jack \ - --with-gtk \ - --with-ladspa \ - --with-gmp - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make prefix="$pkgdir/usr" install - - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: Copied: snd/repos/extra-i686/PKGBUILD (from rev 197655, snd/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> +# Contributor: see .contrib + +pkgname=snd +pkgver=14.1 +pkgrel=1 +pkgdesc="An advanced sound editor" +arch=('i686' 'x86_64') +url="http://ccrma.stanford.edu/software/snd/" +license=('custom') +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') +install=$pkgname.install +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" + + LDFLAGS+=" -Wl,-z,noexecstack" + + ./configure --prefix=/usr \ + --with-alsa \ + --with-jack \ + --with-gtk \ + --with-ladspa \ + --with-gmp + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: Deleted: extra-i686/snd.install =================================================================== --- extra-i686/snd.install 2013-10-27 21:04:21 UTC (rev 197655) +++ extra-i686/snd.install 2013-10-27 21:04:41 UTC (rev 197656) @@ -1,3 +0,0 @@ -post_upgrade() { - echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues" -} Copied: snd/repos/extra-i686/snd.install (from rev 197655, snd/trunk/snd.install) =================================================================== --- extra-i686/snd.install (rev 0) +++ extra-i686/snd.install 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,3 @@ +post_upgrade() { + echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues" +} Copied: snd/repos/extra-i686/type_error.patch (from rev 197655, snd/trunk/type_error.patch) =================================================================== --- extra-i686/type_error.patch (rev 0) +++ extra-i686/type_error.patch 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,20 @@ +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" { Deleted: extra-x86_64/.contrib =================================================================== --- extra-x86_64/.contrib 2013-10-27 21:04:21 UTC (rev 197655) +++ extra-x86_64/.contrib 2013-10-27 21:04:41 UTC (rev 197656) @@ -1,2 +0,0 @@ -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: dorphell <dorph...@archlinux.org> Copied: snd/repos/extra-x86_64/.contrib (from rev 197655, snd/trunk/.contrib) =================================================================== --- extra-x86_64/.contrib (rev 0) +++ extra-x86_64/.contrib 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,2 @@ +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: dorphell <dorph...@archlinux.org> Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-27 21:04:21 UTC (rev 197655) +++ extra-x86_64/PKGBUILD 2013-10-27 21:04:41 UTC (rev 197656) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: Juergen Hoetzel <juer...@archlinux.org> -# Contributor: see .contrib - -pkgname=snd -pkgver=13.9 -pkgrel=1 -pkgdesc="An advanced sound editor" -arch=('i686' 'x86_64') -url="http://ccrma.stanford.edu/software/snd/" -license=('custom') -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') -install=$pkgname.install -source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('acceab2d1e30720640aca54d4b68d45b') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - LDFLAGS+=" -Wl,-z,noexecstack" - - ./configure --prefix=/usr \ - --with-alsa \ - --with-jack \ - --with-gtk \ - --with-ladspa \ - --with-gmp - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make prefix="$pkgdir/usr" install - - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: Copied: snd/repos/extra-x86_64/PKGBUILD (from rev 197655, snd/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> +# Contributor: see .contrib + +pkgname=snd +pkgver=14.1 +pkgrel=1 +pkgdesc="An advanced sound editor" +arch=('i686' 'x86_64') +url="http://ccrma.stanford.edu/software/snd/" +license=('custom') +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') +install=$pkgname.install +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" + + LDFLAGS+=" -Wl,-z,noexecstack" + + ./configure --prefix=/usr \ + --with-alsa \ + --with-jack \ + --with-gtk \ + --with-ladspa \ + --with-gmp + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/snd.install =================================================================== --- extra-x86_64/snd.install 2013-10-27 21:04:21 UTC (rev 197655) +++ extra-x86_64/snd.install 2013-10-27 21:04:41 UTC (rev 197656) @@ -1,3 +0,0 @@ -post_upgrade() { - echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues" -} Copied: snd/repos/extra-x86_64/snd.install (from rev 197655, snd/trunk/snd.install) =================================================================== --- extra-x86_64/snd.install (rev 0) +++ extra-x86_64/snd.install 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,3 @@ +post_upgrade() { + echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues" +} Copied: snd/repos/extra-x86_64/type_error.patch (from rev 197655, snd/trunk/type_error.patch) =================================================================== --- extra-x86_64/type_error.patch (rev 0) +++ extra-x86_64/type_error.patch 2013-10-27 21:04:41 UTC (rev 197656) @@ -0,0 +1,20 @@ +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" {