sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (9a41e5136450a38fe4cdf8922804bde56b67ff0d)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9a41e5136450a38fe4cdf8922804bde56b67ff0d)
Date: Mon, 24 Mar 2014 15:41:36 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 1
audio-creation/lmms/DEPENDS | 5 +
audio-creation/lmms/HISTORY | 3
audio-libs/stk/01-makefile.patch | 130
+++++++++++++++++++++++++++++++++++
audio-libs/stk/02-realtime.patch | 49 +++++++++++++
audio-libs/stk/04-build-shared.patch | 11 ++
audio-libs/stk/05-endian.h.patch | 11 ++
audio-libs/stk/BUILD | 1
audio-libs/stk/DEPENDS | 8 ++
audio-libs/stk/DETAILS | 26 +++++++
audio-libs/stk/HISTORY | 5 +
audio-libs/stk/INSTALL | 4 +
audio-libs/stk/PRE_BUILD | 6 +
13 files changed, 259 insertions(+), 1 deletion(-)

New commits:
commit 9a41e5136450a38fe4cdf8922804bde56b67ff0d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-creation/lmms: add optional dependency on stk

commit 716a5c4ead659ee6b09bbd4dbeebea906b9aeba5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-libs/stk: new spell, the synthesis toolkit in C++

diff --git a/ChangeLog b/ChangeLog
index cd4e406..5023660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* audio-plugins/calf-plugins: new spell, professional-grade audio
plugins
for jack
+ * audio-libs/stk: new spell, the synthesis toolkit in C++

2014-03-22 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/rbtools: new spell, tools for ReviewBoard
diff --git a/audio-creation/lmms/DEPENDS b/audio-creation/lmms/DEPENDS
index f860624..0d204ae 100755
--- a/audio-creation/lmms/DEPENDS
+++ b/audio-creation/lmms/DEPENDS
@@ -70,6 +70,11 @@ optional_depends calf-plugins \
"-DWANT_CALF=0" \
"for calf plugins support" &&

+optional_depends stk \
+ "-DWANT_STK=1" \
+ "-DWANT_STK=0" \
+ "use the Synthesis ToolKit" &&
+
optional_depends fluidsynth \
"-DWANT_SF2=1" \
"-DWANT_SF2=0" \
diff --git a/audio-creation/lmms/HISTORY b/audio-creation/lmms/HISTORY
index 97f9e1c..9f91710 100644
--- a/audio-creation/lmms/HISTORY
+++ b/audio-creation/lmms/HISTORY
@@ -1,6 +1,7 @@
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.0
- * DEPENDS: add dependency on fltk, optional dependency on calf-plugins
+ * DEPENDS: add dependency on fltk, optional dependency on
calf-plugins,
+ optional dependency on stk

2010-01-22 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.4.6
diff --git a/audio-libs/stk/01-makefile.patch
b/audio-libs/stk/01-makefile.patch
new file mode 100644
index 0000000..3452268
--- /dev/null
+++ b/audio-libs/stk/01-makefile.patch
@@ -0,0 +1,130 @@
+Origin: Debian
+Description: Provide an install target to the src target.
+ Add SONAME to shared libraries.
+Forwarded: no
+---
+ Makefile.in | 5 ++++-
+ configure | 4 ++--
+ configure.ac | 4 ++--
+ projects/demo/Makefile.in | 6 +++---
+ src/Makefile.in | 20 +++++++++++++++++---
+ 5 files changed, 28 insertions(+), 11 deletions(-)
+
+--- stk.orig/projects/demo/Makefile.in
++++ stk/projects/demo/Makefile.in
+@@ -1,7 +1,7 @@
+ ### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
+ ### STK demo Makefile - for various flavors of unix
+
+-PROGRAMS = demo
++PROGRAMS = stk-demo
+ RM = /bin/rm
+ SRC_PATH = ../../src
+ OBJECT_PATH = @object_path@
+@@ -57,8 +57,8 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+
+ all : $(PROGRAMS)
+
+-demo: demo.cpp $(OBJECTS)
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo demo.cpp
$(OBJECT_PATH)/*.o $(LIBRARY)
++stk-demo: demo.cpp $(OBJECTS)
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp utilities.cpp
-L../../src -lstk $(LIBRARY)
+
+ libdemo: demo.cpp
+ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp
-L../../src -lstk $(LIBRARY)
+--- stk.orig/src/Makefile.in
++++ stk/src/Makefile.in
+@@ -3,13 +3,15 @@
+
+ STATICLIB = libstk.a
+ SHAREDLIB = @sharedlib@
+-MAJOR = 4
++MAJOR = 0
+ RELEASE = 4.4.4
+
+ AR = ar -rsc
+ RM = /bin/rm
+ LN = /bin/ln
+ OBJECT_PATH = @object_path@
++LIBDIR = @libdir@
++PREFIX = @prefix@
+ vpath %.o $(OBJECT_PATH)
+
+ OBJECTS = Stk.o Generator.o Noise.o Blit.o BlitSaw.o
BlitSquare.o Granulate.o \
+@@ -71,11 +73,23 @@ $(STATICLIB) : $(OBJECTS)
+ $(AR) $(STATICLIB) $(OBJECT_PATH)/*.o
+
+ $(SHAREDLIB) : $(OBJECTS)
+- $(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
++ $(RM) -f $(@) $(SHAREDLIB).$(MAJOR).$(RELEASE) $(SHAREDLIB).$(MAJOR)
$(SHAREDLIB)
+ $(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
++ $(LN) -s $(SHAREDLIB).$(MAJOR).$(RELEASE) @sharedname@
+ $(LN) -s @sharedname@ $(SHAREDLIB)
+ # $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
+
++install-headers:
++ install -d $(DESTDIR)/usr/include/stk
++ cp -r ../include/*.h $(DESTDIR)/usr/include/stk
++
++install: $(SHAREDLIB) install-headers
++ install -d $(DESTDIR)/usr/share/stk
++ install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
++ install -m 644 $(SHAREDLIB).$(MAJOR).$(RELEASE)
$(DESTDIR)$(PREFIX)$(LIBDIR)
++ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE)
$(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
++ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE)
$(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
++
+ $(OBJECTS) : Stk.h
+
+ clean :
+@@ -86,4 +100,4 @@ clean :
+ $(RM) -fR *.dSYM
+
+ distclean: clean
+- $(RM) Makefile
+\ No newline at end of file
++ $(RM) Makefile
+--- stk.orig/Makefile.in
++++ stk/Makefile.in
+@@ -4,7 +4,7 @@ RM = /bin/rm
+
+ all :
+ cd src && $(MAKE)
+- cd projects/demo && $(MAKE) libdemo
++ cd projects/demo && $(MAKE) stk-demo
+ cd projects/effects && $(MAKE) libeffects
+ cd projects/ragamatic && $(MAKE) libragamat
+ cd projects/eguitar && $(MAKE) libeguitar
+@@ -28,3 +28,6 @@ distclean: clean
+ cd projects/eguitar && $(MAKE) distclean
+ cd projects/examples && $(MAKE) distclean
+
++install:
++ make -C src install
++# make -C projects/demo install
+--- stk.orig/configure
++++ stk/configure
+@@ -4898,9 +4898,9 @@ case $host_os in *\ *) host_os=`echo "$h
+
+ sharedlib="libstk.so"
+
+-sharedname="libstk.so.\$(RELEASE)"
++sharedname="libstk.so.\$(MAJOR)"
+
+-libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o
\$(SHAREDLIB).\$(RELEASE)"
++libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o
\$(SHAREDLIB).\$(MAJOR).\$(RELEASE)"
+
+ case $host in
+ *-apple*)
+--- stk.orig/configure.ac
++++ stk/configure.ac
+@@ -93,8 +93,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
+ AC_CANONICAL_HOST
+
+ AC_SUBST( sharedlib, ["libstk.so"] )
+-AC_SUBST( sharedname, ["libstk.so.\$(RELEASE)"] )
+-AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o
\$(SHAREDLIB).\$(RELEASE)"] )
++AC_SUBST( sharedname, ["libstk.so.\$(MAJOR)"] )
++AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o
\$(SHAREDLIB).\$(MAJOR).\$(RELEASE)"] )
+ case $host in
+ *-apple*)
+ AC_SUBST( sharedlib, ["libstk.dylib"] )
diff --git a/audio-libs/stk/02-realtime.patch
b/audio-libs/stk/02-realtime.patch
new file mode 100644
index 0000000..ab409cc
--- /dev/null
+++ b/audio-libs/stk/02-realtime.patch
@@ -0,0 +1,49 @@
+Author: Pino Toscano <toscano.pino AT tiscali.it>
+Description: Enable realtime support only on those architectures that
+ actually provide it.
+Forwarded: no
+---
+ Makefile.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- stk.orig/Makefile.in
++++ stk/Makefile.in
+@@ -2,30 +2,38 @@
+
+ RM = /bin/rm
+
++REALTIME = @realtime@
++
+ all :
+ cd src && $(MAKE)
+ cd projects/demo && $(MAKE) stk-demo
++ifeq ($(REALTIME),yes)
+ cd projects/effects && $(MAKE) libeffects
+ cd projects/ragamatic && $(MAKE) libragamat
+ cd projects/eguitar && $(MAKE) libeguitar
++endif
+ cd projects/examples && $(MAKE) -f libMakefile
+
+ clean :
+ $(RM) -f *~
+ cd src && $(MAKE) clean
+ cd projects/demo && $(MAKE) clean
++ifeq ($(REALTIME),yes)
+ cd projects/effects && $(MAKE) clean
+ cd projects/ragamatic && $(MAKE) clean
+ cd projects/eguitar && $(MAKE) clean
++endif
+ cd projects/examples && $(MAKE) clean
+
+ distclean: clean
+ $(RM) -rf config.log config.status autom4te.cache Makefile
+ cd src && $(MAKE) distclean
+ cd projects/demo && $(MAKE) distclean
++ifeq ($(REALTIME),yes)
+ cd projects/effects && $(MAKE) distclean
+ cd projects/ragamatic && $(MAKE) distclean
+ cd projects/eguitar && $(MAKE) distclean
++endif
+ cd projects/examples && $(MAKE) distclean
+
+ install:
diff --git a/audio-libs/stk/04-build-shared.patch
b/audio-libs/stk/04-build-shared.patch
new file mode 100644
index 0000000..280ae8b
--- /dev/null
+++ b/audio-libs/stk/04-build-shared.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -67,7 +67,7 @@
+ %.o : ../src/include/%.cpp
+ $(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
+
+-all : $(STATICLIB)
++all : $(STATICLIB) $(SHAREDLIB)
+
+ $(STATICLIB) : $(OBJECTS)
+ $(RM) -f $(STATICLIB)
diff --git a/audio-libs/stk/05-endian.h.patch
b/audio-libs/stk/05-endian.h.patch
new file mode 100644
index 0000000..593c81d
--- /dev/null
+++ b/audio-libs/stk/05-endian.h.patch
@@ -0,0 +1,11 @@
+--- a/src/include/soundcard.h
++++ b/src/include/soundcard.h
+@@ -103,7 +103,7 @@
+ #define SNDCARD_OPL 28
+
+ #include <sys/types.h>
+-#include <machine/endian.h>
++#include <endian.h>
+ #ifndef _IOWR
+ #include <sys/ioccom.h>
+ #endif /* !_IOWR */
diff --git a/audio-libs/stk/BUILD b/audio-libs/stk/BUILD
new file mode 100755
index 0000000..5ff6936
--- /dev/null
+++ b/audio-libs/stk/BUILD
@@ -0,0 +1 @@
+CXXFLAGS+="-pthread" LDFLAGS+="-pthread" default_build
diff --git a/audio-libs/stk/DEPENDS b/audio-libs/stk/DEPENDS
new file mode 100755
index 0000000..0446f87
--- /dev/null
+++ b/audio-libs/stk/DEPENDS
@@ -0,0 +1,8 @@
+optional_depends JACK-DRIVER \
+ "--with-jack" \
+ "--without-jack" \
+ "for jack support" &&
+optional_depends alsa-lib \
+ "--with-alsa" \
+ "--without-alsa" \
+ "for ALSA support"
diff --git a/audio-libs/stk/DETAILS b/audio-libs/stk/DETAILS
new file mode 100755
index 0000000..0b70eb4
--- /dev/null
+++ b/audio-libs/stk/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=stk
+ VERSION=4.4.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://ccrma.stanford.edu/software/${SPELL}/release/${SOURCE}
+
SOURCE_HASH=sha512:e36c43a20e95eb86ed0335ae17df23c1a672562656738496f9e2e5654a825292c4235e04774fcb0356d47a775b7d7af6b4fd63c9d151ab7f2f9195bb5f728e37
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://ccrma.stanford.edu/software/stk/";
+ LICENSE[0]=JSON
+ ENTERED=20140324
+ SHORT="audio signal processing and algorithmic synthesis classes
written in the C++"
+cat << EOF
+The Synthesis ToolKit in C++ (STK) is a set of open source audio
+signal processing and algorithmic synthesis classes written in the C++
+programming language. STK was designed to facilitate rapid development
+of music synthesis and audio processing software, with an emphasis on
+cross-platform functionality, realtime control, ease of use, and educational
+example code. The Synthesis ToolKit is extremely portable (it's mostly
+platform-independent C and C++ code), and it's completely user-extensible
+(all source included, no unusual libraries, and no hidden drivers). We like
+to think that this increases the chances that our programs will still work
+in another 5-10 years. In fact, the ToolKit has been working continuously
+for nearly 15 years now. STK currently runs with realtime support (audio
+and MIDI) on Linux, Macintosh OS X, and Windows computer platforms. Generic,
+non-realtime support has been tested under NeXTStep, Sun, and other platforms
+and should work with any standard C++ compiler.
+EOF
diff --git a/audio-libs/stk/HISTORY b/audio-libs/stk/HISTORY
new file mode 100644
index 0000000..e4bbf12
--- /dev/null
+++ b/audio-libs/stk/HISTORY
@@ -0,0 +1,5 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 01-makefile.patch, 02-realtime.patch, 04-build-shared.patch,
+ 05-endian.h.patch, BUILD, DEPENDS, DETAILS, HISTORY, PRE_BUILD,
+ INSTALL: spell created, patches from Ubuntu
+
diff --git a/audio-libs/stk/INSTALL b/audio-libs/stk/INSTALL
new file mode 100755
index 0000000..0158ca9
--- /dev/null
+++ b/audio-libs/stk/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+mkdir -p $INSTALL_ROOT/usr/share/stk/{rawwaves,tcl} &&
+install -m664 $SOURCE_DIRECTORY/rawwaves/*
$INSTALL_ROOT/usr/share/stk/rawwaves/ &&
+install -m644 $(find $SOURCE_DIRECTORY -type f -name "*.tcl")
$INSTALL_ROOT/usr/share/stk/tcl/
diff --git a/audio-libs/stk/PRE_BUILD b/audio-libs/stk/PRE_BUILD
new file mode 100755
index 0000000..40e83eb
--- /dev/null
+++ b/audio-libs/stk/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/01-makefile.patch &&
+patch -p1 < $SPELL_DIRECTORY/02-realtime.patch &&
+patch -p1 < $SPELL_DIRECTORY/04-build-shared.patch &&
+patch -p1 < $SPELL_DIRECTORY/05-endian.h.patch

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (9a41e5136450a38fe4cdf8922804bde56b67ff0d), Florian Franzmann, 03/24/2014