pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/snd
Module Name: pkgsrc
Committed By: nia
Date: Sat Dec 14 18:34:18 UTC 2019
Modified Files:
pkgsrc/audio/snd: Makefile PLIST distinfo options.mk
Added Files:
pkgsrc/audio/snd/patches: patch-audio.c
Log Message:
snd: Update to 19.9
This now uses gtk3
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/audio/snd/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/snd/PLIST pkgsrc/audio/snd/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/snd/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/audio/snd/patches/patch-audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/snd/Makefile
diff -u pkgsrc/audio/snd/Makefile:1.94 pkgsrc/audio/snd/Makefile:1.95
--- pkgsrc/audio/snd/Makefile:1.94 Sun Jul 21 22:24:28 2019
+++ pkgsrc/audio/snd/Makefile Sat Dec 14 18:34:18 2019
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.94 2019/07/21 22:24:28 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2019/12/14 18:34:18 nia Exp $
-DISTNAME= snd-16.9
-PKGREVISION= 7
+DISTNAME= snd-19.9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=snd/}
+MASTER_SITES= https://ccrma.stanford.edu/software/snd/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://ccrma.stanford.edu/software/snd/
-COMMENT= X based sound editor
+COMMENT= Sound editor modelled loosely after Emacs
LICENSE= esdl-license
DEPENDS+= flac-[0-9]*:../../audio/flac
+DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
DEPENDS+= speex-[0-9]*:../../audio/speex
DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
@@ -21,11 +21,21 @@ USE_TOOLS+= gmake msgfmt pkg-config
BUILD_TARGET= snd
MAKE_FILE= makefile
-.include "options.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+
+# On NetBSD we use sunaudio.
+.if ${OSS_TYPE} != "none" && ${OPSYS} != "NetBSD"
+CONFIGURE_ARGS+= --with-oss
+LDFLAGS+= ${LIBOSSAUDIO}
+.else
+CONFIGURE_ARGS+= --without-oss
+.endif
+.include "options.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/snd/PLIST
diff -u pkgsrc/audio/snd/PLIST:1.8 pkgsrc/audio/snd/PLIST:1.9
--- pkgsrc/audio/snd/PLIST:1.8 Sun Nov 27 09:33:11 2016
+++ pkgsrc/audio/snd/PLIST Sat Dec 14 18:34:18 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/11/27 09:33:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/12/14 18:34:18 nia Exp $
bin/snd
man/man1/snd.1
share/snd/CM_patterns.scm
@@ -23,6 +23,7 @@ share/snd/clm.fs
share/snd/clm.rb
share/snd/clm23.scm
share/snd/cload.scm
+share/snd/coretemp.scm
share/snd/dlocsig.rb
share/snd/dlocsig.scm
share/snd/draw.fs
@@ -60,6 +61,7 @@ share/snd/grani.rb
share/snd/grani.scm
share/snd/gtk-effects-utils.scm
share/snd/gtk-effects.scm
+share/snd/gtkex.scm
share/snd/heart.scm
share/snd/hooks.fs
share/snd/hooks.rb
@@ -68,6 +70,7 @@ share/snd/index.rb
share/snd/index.scm
share/snd/jcrev.scm
share/snd/jcvoi.scm
+share/snd/json.scm
share/snd/libc.scm
share/snd/libdl.scm
share/snd/libgdbm.scm
@@ -93,7 +96,6 @@ share/snd/musglyphs.rb
share/snd/musglyphs.scm
share/snd/nb.rb
share/snd/nb.scm
-share/snd/new-backgrounds.scm
share/snd/new-effects.scm
share/snd/noise.rb
share/snd/noise.scm
@@ -115,6 +117,7 @@ share/snd/profile.scm
share/snd/pvoc.rb
share/snd/pvoc.scm
share/snd/r7rs.scm
+share/snd/reactive.scm
share/snd/repl.scm
share/snd/rgb.fs
share/snd/rgb.rb
@@ -138,7 +141,6 @@ share/snd/snd-test.rb
share/snd/snd-test.scm
share/snd/snd-xm.fs
share/snd/snd-xm.rb
-share/snd/snd14.scm
share/snd/snd15.scm
share/snd/snddiff.scm
share/snd/sndlib-ws.scm
Index: pkgsrc/audio/snd/options.mk
diff -u pkgsrc/audio/snd/options.mk:1.8 pkgsrc/audio/snd/options.mk:1.9
--- pkgsrc/audio/snd/options.mk:1.8 Sat Nov 2 21:09:16 2019
+++ pkgsrc/audio/snd/options.mk Sat Dec 14 18:34:18 2019
@@ -1,17 +1,61 @@
-# $NetBSD: options.mk,v 1.8 2019/11/02 21:09:16 rillig Exp $
+# $NetBSD: options.mk,v 1.9 2019/12/14 18:34:18 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.snd
PKG_SUPPORTED_OPTIONS=
# ruby, forth, alsa, oss, jack, pulseaudio, gmp, ladspa
PKG_OPTIONS_REQUIRED_GROUPS= frontend
PKG_OPTIONS_GROUP.frontend= gtk motif
-PKG_SUGGESTED_OPTIONS= gtk
+
+PKG_SUPPORTED_OPTIONS+= alsa jack portaudio pulseaudio ladspa
+PKG_SUGGESTED_OPTIONS.Linux+= alsa
+PKG_SUGGESTED_OPTIONS+= gtk ladspa
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} == "none" && ${OPSYS} != "Linux"
+PKG_SUGGESTED_OPTIONS+= portaudio
+.endif
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+= --with-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-alsa
+.endif
+
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+= --with-jack
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-jack
+.endif
+
+.if !empty(PKG_OPTIONS:Mportaudio)
+CONFIGURE_ARGS+= --with-portaudio
+.include "../../audio/portaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-portaudio
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+= --with-pulseaudio
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-pulseaudio
+.endif
+
+.if !empty(PKG_OPTIONS:Mladspa)
+CONFIGURE_ARGS+= --with-ladspa
+.include "../../audio/ladspa/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-ladspa
+.endif
+
.if !empty(PKG_OPTIONS:Mgtk)
CONFIGURE_ARGS+= --with-gtk
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-gtk
.endif
Index: pkgsrc/audio/snd/distinfo
diff -u pkgsrc/audio/snd/distinfo:1.20 pkgsrc/audio/snd/distinfo:1.21
--- pkgsrc/audio/snd/distinfo:1.20 Sun Nov 27 09:33:11 2016
+++ pkgsrc/audio/snd/distinfo Sat Dec 14 18:34:18 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2016/11/27 09:33:11 wiz Exp $
+$NetBSD: distinfo,v 1.21 2019/12/14 18:34:18 nia Exp $
-SHA1 (snd-16.9.tar.gz) = 479c8cd8800f4cd8bec534f4d5190cf3c4b1a05b
-RMD160 (snd-16.9.tar.gz) = 7ca41770db942adc15570871b11440054bf9ee3a
-SHA512 (snd-16.9.tar.gz) = 4b2769a0bb7b698bf3d86c5c77b8e59bf3a8c318a0061e93a92a3c7b3619a8da4cef628eceeafac15379e5dd1fd1073f4a7b7d3e28793656cc4c4be5ab7f4d8b
-Size (snd-16.9.tar.gz) = 15032677 bytes
+SHA1 (snd-19.9.tar.gz) = 0dc0243979816900e29b674a8cafca73c477572b
+RMD160 (snd-19.9.tar.gz) = 22a07c205af8e7929b04c0a2395037c4f8dc3142
+SHA512 (snd-19.9.tar.gz) = fa78c80f52b78d5b78662fe74579c63f7933383ccf114be20286405578cb929bc9845bb4b779a95ecbd09a76bb23a1d9ad4ec0bc638d73f44e6d20392b54dd74
+Size (snd-19.9.tar.gz) = 15472268 bytes
+SHA1 (patch-audio.c) = 13d4a78b2512c299c0cc0268ef4399abe015c880
Added files:
Index: pkgsrc/audio/snd/patches/patch-audio.c
diff -u /dev/null pkgsrc/audio/snd/patches/patch-audio.c:1.3
--- /dev/null Sat Dec 14 18:34:18 2019
+++ pkgsrc/audio/snd/patches/patch-audio.c Sat Dec 14 18:34:18 2019
@@ -0,0 +1,43 @@
+$NetBSD: patch-audio.c,v 1.3 2019/12/14 18:34:18 nia Exp $
+
+Use /dev/audio instead of /dev/sound - less surprising preservation of
+pause state.
+
+--- audio.c.orig 2019-10-31 19:30:39.000000000 +0000
++++ audio.c
+@@ -5056,7 +5056,7 @@ int mus_audio_open_output(int dev, int s
+ {
+ int line, encode;
+
+- line = open("/dev/sound", O_WRONLY); /* /dev/audio assumes mono 8-bit mulaw */
++ line = open("/dev/audio", O_WRONLY); /* /dev/audio assumes mono 8-bit mulaw */
+ if (line == -1)
+ {
+ if (errno == EBUSY)
+@@ -5123,9 +5123,9 @@ static int netbsd_sample_types(int ur_de
+ dev = MUS_AUDIO_DEVICE(ur_dev);
+ AUDIO_INITINFO(&info);
+
+- audio_fd = open("/dev/sound", O_RDONLY | O_NONBLOCK, 0);
++ audio_fd = open("/dev/audio", O_RDONLY | O_NONBLOCK, 0);
+ if (audio_fd == -1)
+- return_error_exit(MUS_AUDIO_CANT_READ, -1, mus_format("can't open /dev/sound: %s", strerror(errno)));
++ return_error_exit(MUS_AUDIO_CANT_READ, -1, mus_format("can't open /dev/audio: %s", strerror(errno)));
+ err = ioctl(audio_fd, AUDIO_GETINFO, &info);
+ if (err == -1)
+ {
+@@ -5161,11 +5161,11 @@ int mus_audio_open_input(int ur_dev, int
+ mus_sample_type_name(samp_type)));
+
+ if (dev != MUS_AUDIO_DUPLEX_DEFAULT)
+- audio_fd = open("/dev/sound", O_RDONLY, 0);
+- else audio_fd = open("/dev/sound", O_RDWR, 0);
++ audio_fd = open("/dev/audio", O_RDONLY, 0);
++ else audio_fd = open("/dev/audio", O_RDWR, 0);
+ if (audio_fd == -1)
+ return_error_exit(MUS_AUDIO_CANT_OPEN, -1,
+- mus_format("can't open /dev/sound: %s",
++ mus_format("can't open /dev/audio: %s",
+ strerror(errno)));
+
+ AUDIO_INITINFO(&info);
Home |
Main Index |
Thread Index |
Old Index