pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/snd Update to 7.15:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab3f2d1b54d6
branches:  trunk
changeset: 503619:ab3f2d1b54d6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Nov 23 22:39:12 2005 +0000

description:
Update to 7.15:
About 7 years of development. Includes among others:
support for flac, speex, ogg/vorbis; a choice of frontends between
motif and gtk; esound support; guile scripting support; and native
NetBSD audio code.

Some possible future work on this package:
Add options for fftw2 fftw3 ladspa gamin/fam mpg123 timidity ruby

diffstat:

 audio/snd/DESCR            |  16 ++--------
 audio/snd/Makefile         |  44 +++++++++++++++-----------------
 audio/snd/PLIST            |  22 ++--------------
 audio/snd/distinfo         |  27 ++-----------------
 audio/snd/options.mk       |  38 ++++++++++++++++++++++++++++
 audio/snd/patches/patch-aa |  28 --------------------
 audio/snd/patches/patch-ab |  13 ---------
 audio/snd/patches/patch-ac |  22 ----------------
 audio/snd/patches/patch-ad |  13 ---------
 audio/snd/patches/patch-ae |  35 -------------------------
 audio/snd/patches/patch-af |  16 -----------
 audio/snd/patches/patch-ag |  17 ------------
 audio/snd/patches/patch-ah |  28 --------------------
 audio/snd/patches/patch-ai |  13 ---------
 audio/snd/patches/patch-aj |  30 ----------------------
 audio/snd/patches/patch-ak |  13 ---------
 audio/snd/patches/patch-al |  13 ---------
 audio/snd/patches/patch-am |  13 ---------
 audio/snd/patches/patch-an |  42 -------------------------------
 audio/snd/patches/patch-ao |  13 ---------
 audio/snd/patches/patch-ap |  13 ---------
 audio/snd/patches/patch-aq |  26 -------------------
 audio/snd/patches/patch-ar |  62 ----------------------------------------------
 audio/snd/patches/patch-as |  12 --------
 24 files changed, 70 insertions(+), 499 deletions(-)

diffs (truncated from 680 to 300 lines):

diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/DESCR
--- a/audio/snd/DESCR   Wed Nov 23 22:31:39 2005 +0000
+++ b/audio/snd/DESCR   Wed Nov 23 22:39:12 2005 +0000
@@ -1,12 +1,4 @@
-Snd is a sound editor modelled loosely after Emacs and an old, sorely-missed
-PDP-10 sound editor named Dpysnd. It can accomodate any number of sounds at
-once, each with any number of channels. Each channel is normally displayed
-in its own window, with its own cursor, edit history, and marks; each sound
-has a 'control panel' to try out various changes quickly, and an expression
-parser, used mainly during searches; there is an overall stack of 'regions'
-that can be browsed and edited; channels and sounds can be grouped together
-during editing; edits can be undone and redone without restriction
-('unlimited undo'); Snd can be customized using an Emacs-lisp-like syntax;
-it can also be extended with user-supplied editing or display functions
-loaded at run time; and it's free; the code is available via anonymous ftp
-from ccrma-ftp.stanford.edu as pub/Lisp/snd.tar.gz.
+Snd is a sound editor modelled loosely after Emacs and an old,
+sorely-missed PDP-10 sound editor named Dpysnd. It can accommodate
+any number of sounds each with any number of channels, and can be
+customized and extended using either Guile or Ruby. Snd is free.
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/Makefile
--- a/audio/snd/Makefile        Wed Nov 23 22:31:39 2005 +0000
+++ b/audio/snd/Makefile        Wed Nov 23 22:39:12 2005 +0000
@@ -1,36 +1,34 @@
-# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:38 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/23 22:39:12 wiz Exp $
 #
 
-DISTNAME=              snd
-PKGNAME=               snd-19980212
-PKGREVISION=           2
+DISTNAME=              snd-7.15
 CATEGORIES=            audio
-MASTER_SITES=          ${MASTER_SITE_LOCAL}
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=snd/}
 
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
-HOMEPAGE=              http://ccrma-www.stanford.edu/CCRMA/Software/snd/snd.html
+HOMEPAGE=              http://ccrma.stanford.edu/software/snd/
 COMMENT=               X based sound editor
 
-NO_SRC_ON_FTP=         Already on MASTER_SITE_LOCAL
-
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
+DEPENDS+=              flac-[0-9]*:../../audio/flac
+DEPENDS+=              speex-[0-9]*:../../audio/speex
+DEPENDS+=              vorbis-tools-[0-9]*:../../audio/vorbis-tools
 
-WRKSRC=                        ${WRKDIR}
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            gmake pkg-config
 
-MAKEFILE=              makefile.netbsd
 BUILD_TARGET=          snd
-
-HTMLDIR=               ${PREFIX}/share/doc/html/snd
+MAKEFILE=              makefile
+WRKSRC=                        ${WRKDIR}/snd-7
 
-INSTALLATION_DIRS=     bin lib/X11/app-defaults
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
+               ${PREFIX}/${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
+
+.include "options.mk"
 
-do-install:
-       cd ${WRKSRC} ; ${INSTALL_PROGRAM} snd ${PREFIX}/bin
-       cd ${WRKSRC} ; ${INSTALL_DATA} Snd.ad ${PREFIX}/lib/X11/app-defaults/Snd
-       ${INSTALL_DATA_DIR} ${HTMLDIR}
-       cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${HTMLDIR}
-
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
-
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/PLIST
--- a/audio/snd/PLIST   Wed Nov 23 22:31:39 2005 +0000
+++ b/audio/snd/PLIST   Wed Nov 23 22:39:12 2005 +0000
@@ -1,20 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/11/23 22:39:12 wiz Exp $
 bin/snd
-lib/X11/app-defaults/Snd
-share/doc/html/snd/README.Snd
-share/doc/html/snd/auto.gif
-share/doc/html/snd/controls.gif
-share/doc/html/snd/d.gif
-share/doc/html/snd/fft.gif
-share/doc/html/snd/files.gif
-share/doc/html/snd/mixer.gif
-share/doc/html/snd/n.gif
-share/doc/html/snd/rec.gif
-share/doc/html/snd/regions.gif
-share/doc/html/snd/s.gif
-share/doc/html/snd/save.gif
-share/doc/html/snd/snd-widgets.txt
-share/doc/html/snd/snd.html
-share/doc/html/snd/snd.txt
-share/doc/html/snd/title.gif
-@dirrm share/doc/html/snd
+man/man1/snd.1
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/distinfo
--- a/audio/snd/distinfo        Wed Nov 23 22:31:39 2005 +0000
+++ b/audio/snd/distinfo        Wed Nov 23 22:39:12 2005 +0000
@@ -1,24 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/09/06 08:10:57 abs Exp $
+$NetBSD: distinfo,v 1.10 2005/11/23 22:39:12 wiz Exp $
 
-SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65
-RMD160 (snd.tar.gz) = 69f665f4710fbdd671f6677cec6f91467789f4a1
-Size (snd.tar.gz) = 735422 bytes
-SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a
-SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1
-SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7
-SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17
-SHA1 (patch-ae) = f3968df5d034d5b3629aef8708cfff7e7a033fd9
-SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161
-SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1
-SHA1 (patch-ah) = bade0ce099e74626c1db30c3689220cefa214758
-SHA1 (patch-ai) = 8447999b934cb8af70deb2c1ccc2b4b3d9bc61a8
-SHA1 (patch-aj) = 94c096717006f564a5d200ee07f4bccd2f2c13cb
-SHA1 (patch-ak) = 8732fd50e181bf02db4b7e63d2464f71e44e2f1e
-SHA1 (patch-al) = 7edd5495f5caf1c82c1a43db78e3b2e54adb4ca3
-SHA1 (patch-am) = 46955a9e33ceefdb88871e7f32443c839a46138c
-SHA1 (patch-an) = 4498dff116f9394767ba6e8f06670b549e4fce5b
-SHA1 (patch-ao) = 67b88decbf4b8b4c3c00a4edccd26df89ba1755f
-SHA1 (patch-ap) = 1416ab82eca6a907920ef876b2e54fd51425650a
-SHA1 (patch-aq) = 574db781f41d3689325d1fe7b3ae95b76ab9650f
-SHA1 (patch-ar) = 838ff0663e7b6aebfa09223a66f445b49f6f0e97
-SHA1 (patch-as) = 6ee5137a2e6703b95b41849836fcaa4ed091ec36
+SHA1 (snd-7.15.tar.gz) = 17d092df3e85c2eed7b17d1c8ebcadfc8db6f272
+RMD160 (snd-7.15.tar.gz) = c28a2a1c19ca404b47061644d42700bc6bdf6396
+Size (snd-7.15.tar.gz) = 6546108 bytes
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/snd/options.mk      Wed Nov 23 22:39:12 2005 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: options.mk,v 1.1 2005/11/23 22:39:12 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.snd
+PKG_SUPPORTED_OPTIONS= esound guile
+# fftw2 fftw3 ladspa gamin/fam mpg123 timidity
+PKG_OPTIONS_REQUIRED_GROUPS=   frontend
+PKG_OPTIONS_GROUP.frontend=    gtk motif
+PKG_SUGGESTED_OPTIONS= gtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mesound)
+CONFIGURE_ARGS+=       --with-esd
+.include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-esd
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=       --with-gtk
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-gtk
+.endif
+
+.if !empty(PKG_OPTIONS:Mguile)
+CONFIGURE_ARGS+=       --with-guile
+.include "../../lang/guile/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-guile
+.endif
+
+.if !empty(PKG_OPTIONS:Mmotif)
+CONFIGURE_ARGS+=       --with-motif
+.include "../../x11/openmotif/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-motif
+.endif
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/patches/patch-aa
--- a/audio/snd/patches/patch-aa        Wed Nov 23 22:31:39 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:08 agc Exp $
-
---- snd.orig/snd.h     Thu Feb 12 15:36:40 1998
-+++ snd.h      Sun Feb 22 02:19:27 1998
-@@ -21,17 +21,21 @@
- #include "sound_types.h"
- #include "cmus_prototypes.h"
- 
--#if defined(SGI) || defined(LINUX) || defined(NEXT) || defined(SCO5) || defined(UW2) || defined(SOLARIS)
-+#ifndef HAVE_MOTIF
-+#if defined(SGI) || defined(LINUX) || defined(NEXT) || defined(SCO5) || defined(UW2) || defined(SOLARIS) || defined(__NetBSD__)
-   #define HAVE_MOTIF 1
- #else
-   #define HAVE_MOTIF 0
- #endif
-+#endif /* HAVE_MOTIF */
- 
--#if defined(LINUX) || defined(SCO5) || defined(UW2)
-+#ifndef HAVE_OSS
-+#if defined(LINUX) || defined(SCO5) || defined(UW2) || defined(__NetBSD__)
-   #define HAVE_OSS 1
- #else
-   #define HAVE_OSS 0
- #endif
-+#endif /* HAVE_OSS */
- 
- #include "snd-0.h"
- 
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/patches/patch-ab
--- a/audio/snd/patches/patch-ab        Wed Nov 23 22:31:39 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/cmus.h    Thu Jan 22 15:08:02 1998
-+++ cmus.h     Sun Feb 22 02:04:51 1998
-@@ -17,7 +17,7 @@
- 
- /* due to project builder stupidity, we can't always depend on -D flags here (maybe we need a CLM_SND_OS macro?) */
- 
--#if (!(defined(SGI))) && (!(defined(NEXT))) && (!(defined(LINUX))) && (!(defined(MACOS))) && (!(defined(BEOS))) && (!(defined(SUN))) && (!(defined(UW2))) && (!(defined(SCO5)))
-+#if (!(defined(SGI))) && (!(defined(NEXT))) && (!(defined(LINUX))) && (!(defined(MACOS))) && (!(defined(BEOS))) && (!(defined(SUN))) && (!(defined(UW2))) && (!(defined(SCO5)))  && 
(!(defined(__NetBSD__))) 
-   #if defined(__dest_os)
-     /* we're in Metrowerks Land */
-     #if (__dest_os == __be_os)
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/patches/patch-ac
--- a/audio/snd/patches/patch-ac        Wed Nov 23 22:31:39 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/cmus_prototypes.h Thu Feb 12 15:36:33 1998
-+++ cmus_prototypes.h  Sun Feb 22 02:05:30 1998
-@@ -208,7 +208,7 @@
- #endif
- 
- /* pipe.c */
--#if defined(SGI) || defined(LINUX)
-+#if defined(SGI) || defined(LINUX) || defined(__NetBSD__)
-   int write_snd_fifo(char *buf, int len);
- #endif
- 
-@@ -229,7 +229,7 @@
-   void set_rt_record_p (int rt);
-   int clm_read_any(int tfd, int beg, int chans, int nints, int **bufs, int *cm);
- 
--#if defined(SGI) || defined(LINUX)
-+#if defined(SGI) || defined(LINUX) || defined(__NetBSD__)
-   float c_control (int n);
-   float c_set_control (int n, float val);
-   int c_open_controls (int size);
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/patches/patch-ad
--- a/audio/snd/patches/patch-ad        Wed Nov 23 22:31:39 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:09 agc Exp $
-
---- snd.orig/io.c      Mon Feb  2 14:59:54 1998
-+++ io.c       Sun Feb 22 02:06:44 1998
-@@ -399,7 +399,7 @@
-  * many cases -- the output buffer can collect many notes before flushing, etc.
-  */
- 
--#if defined(SGI) || defined(LINUX) || defined(UW2) || defined(SCO5)
-+#if defined(SGI) || defined(LINUX) || defined(UW2) || defined(SCO5) || defined(__NetBSD__)
-   #define FILE_DESCRIPTORS 256
-   #define BASE_FILE_DESCRIPTORS 200
- #else
diff -r f11a8afc1294 -r ab3f2d1b54d6 audio/snd/patches/patch-ae
--- a/audio/snd/patches/patch-ae        Wed Nov 23 22:31:39 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2002/09/21 01:02:05 jlam Exp $
-
---- makefile.netbsd.orig       Mon Aug  9 19:22:24 1999
-+++ makefile.netbsd    Mon Aug  9 19:25:36 1999
-@@ -0,0 +1,30 @@
-+# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out)
-+
-+#CC = gcc
-+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include
-+CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include
-+CFLAGS += -g
-+
-+LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio
-+CLM_HEADERS = cmus_prototypes.h cmus.h sound_types.h
-+SND_HEADERS = snd.h snd-0.h snd-1.h snd-ufun.h snd-strings.h sndclm.h
-+SND_X_HEADERS = snd-x0.h snd-x1.h
-+
-+CLM_O_FILES = io.o headers.o
-+
-+O_FILES = snd-io.o snd-utils.o snd-parser.o snd-axis.o snd-data.o snd-fft.o snd-marks.o snd-file.o snd-edits.o snd-chn.o snd-dac.o snd-clip.o snd-find.o snd-snd.o snd-help.o snd-clm.o snd-main.o 
snd-print.o snd-ufun.o snd-ufunex.o snd-apply.o snd-trans.o snd-mix.o snd.o snd-env.o 
-+
-+X_O_FILES = snd-xutils.o snd-xdata.o snd-xmenu.o snd-xchn.o snd-xsnd.o snd-xdac.o snd-xclip.o snd-xmain.o snd-xclm.o snd-xmix.o snd-xrec.o snd-xenv.o



Home | Main Index | Thread Index | Old Index