[stk] Update to 4.4.4.
Thomas Moschny
thm at fedoraproject.org
Sun Dec 16 22:51:37 UTC 2012
commit b36a62006f8c4318ec5b8279b54a84291df7e0fa
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sun Dec 16 23:49:38 2012 +0100
Update to 4.4.4.
- Rebase patches.
- Follow upstream and use version 4 for the soname.
- Modernize spec file.
- Pack new demo project 'eguitar'.
.gitignore | 1 +
README.fedora | 74 +-
config.guess | 1516 --------------------
config.sub | 1626 ----------------------
repack.sh | 44 +
sources | 2 +-
stk-4.4.2-cflags-lib.patch | 22 -
stk-4.4.2-missing.patch | 10 -
stk-4.4.2-sharedlib.patch | 44 -
stk-4.4.4-cflags-lib.patch | 22 +
stk-4.4.2-header.patch => stk-4.4.4-header.patch | 70 +-
stk-4.4.4-projects.patch | 17 +
stk-4.4.4-pthread.patch | 12 +
stk-4.4.4-sharedlib.patch | 29 +
stk.spec | 65 +-
15 files changed, 218 insertions(+), 3336 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82f076a..699fa15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
stk-4.4.2.stripped.tar.gz
+/stk-4.4.4.stripped.tar.gz
diff --git a/README.fedora b/README.fedora
index 5c9188d..5f6c194 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,53 +1,23 @@
-For legal reasons, the following files have been removed from the
-original tarfile:
+For legal and other reasons, the following files have been removed
+from the original tarfile:
- stk-4.4.2/doc/html/tutorial/bachfugue.ski
- stk-4.4.2/doc/html/tutorial/bookert.ski
- stk-4.4.2/projects/demo/scores/bachfugue.ski
- stk-4.4.2/projects/demo/scores/bookert.ski
- stk-4.4.2/projects/demo/scores/chords.ski
- stk-4.4.2/projects/demo/scores/doogie.ski
- stk-4.4.2/projects/demo/scores/drumfunk.ski
- stk-4.4.2/projects/demo/scores/drumtest.ski
- stk-4.4.2/projects/demo/scores/duelingb.ski
- stk-4.4.2/projects/demo/scores/fiddle.ski
- stk-4.4.2/projects/demo/scores/flutbach.ski
- stk-4.4.2/projects/demo/scores/funicula.ski
- stk-4.4.2/projects/demo/scores/funskini.ski
- stk-4.4.2/projects/demo/scores/lacrymos.ski
- stk-4.4.2/projects/demo/scores/mandtune.ski
- stk-4.4.2/projects/demo/scores/marimba2.ski
- stk-4.4.2/projects/demo/scores/marimtst.ski
- stk-4.4.2/projects/demo/scores/misacrio.ski
- stk-4.4.2/projects/demo/scores/morazbel.ski
- stk-4.4.2/projects/demo/scores/organs.ski
- stk-4.4.2/projects/demo/scores/pickdamp.ski
- stk-4.4.2/projects/demo/scores/pictures.ski
- stk-4.4.2/projects/demo/scores/riderson.ski
- stk-4.4.2/projects/demo/scores/scales.ski
- stk-4.4.2/projects/demo/scores/shaktest.ski
- stk-4.4.2/projects/demo/scores/simplgft.ski
- stk-4.4.2/projects/demo/scores/spain.ski
- stk-4.4.2/projects/demo/scores/streetsf.ski
- stk-4.4.2/projects/demo/scores/test.ski
- stk-4.4.2/projects/demo/scores/thecars.ski
- stk-4.4.2/projects/demo/scores/tubebell.ski
- stk-4.4.2/projects/demo/scores/vocaliz.ski
- stk-4.4.2/projects/examples/midifiles/bwv772.mid
- stk-4.4.2/projects/examples/midifiles/jesu.mid
- stk-4.4.2/projects/examples/midifiles/tango.mid
- stk-4.4.2/projects/examples/scores/bachfugue.ski
- stk-4.4.2/projects/examples/scores/bookert.ski
- stk-4.4.2/src/include/asio.cpp
- stk-4.4.2/src/include/asiodrivers.cpp
- stk-4.4.2/src/include/asiodrivers.h
- stk-4.4.2/src/include/asiodrvr.h
- stk-4.4.2/src/include/asio.h
- stk-4.4.2/src/include/asiolist.cpp
- stk-4.4.2/src/include/asiolist.h
- stk-4.4.2/src/include/asiosys.h
- stk-4.4.2/src/include/dsound.h
- stk-4.4.2/src/include/iasiodrv.h
- stk-4.4.2/src/include/iasiothiscallresolver.cpp
- stk-4.4.2/src/include/iasiothiscallresolver.h
- stk-4.4.2/src/include/soundcard.h
+stk-4.4.4/doc/html/tutorial/*.ski
+stk-4.4.4/projects/demo/scores/*.ski
+stk-4.4.4/projects/eguitar/scores/*.ski
+stk-4.4.4/projects/examples/midifiles/*.mid
+stk-4.4.4/projects/examples/scores/*.ski
+stk-4.4.4/src/Debug/*.o
+stk-4.4.4/src/include/._soundcard.h
+stk-4.4.4/src/include/asio.cpp
+stk-4.4.4/src/include/asio.h
+stk-4.4.4/src/include/asiodrivers.cpp
+stk-4.4.4/src/include/asiodrivers.h
+stk-4.4.4/src/include/asiodrvr.h
+stk-4.4.4/src/include/asiolist.cpp
+stk-4.4.4/src/include/asiolist.h
+stk-4.4.4/src/include/asiosys.h
+stk-4.4.4/src/include/dsound.h
+stk-4.4.4/src/include/iasiodrv.h
+stk-4.4.4/src/include/iasiothiscallresolver.cpp
+stk-4.4.4/src/include/iasiothiscallresolver.h
+stk-4.4.4/src/include/soundcard.h
diff --git a/repack.sh b/repack.sh
new file mode 100755
index 0000000..10addcf
--- /dev/null
+++ b/repack.sh
@@ -0,0 +1,44 @@
+#! /bin/bash
+
+version=4.4.4
+src=stk-${version}.tar.gz
+dst=${src%.tar.gz}.stripped.tar.gz
+
+read -r -d '' files <<-EOF
+ stk-${version}/doc/html/tutorial/*.ski
+ stk-${version}/projects/demo/scores/*.ski
+ stk-${version}/projects/eguitar/scores/*.ski
+ stk-${version}/projects/examples/midifiles/*.mid
+ stk-${version}/projects/examples/scores/*.ski
+ stk-${version}/src/Debug/*.o
+ stk-${version}/src/include/._soundcard.h
+ stk-${version}/src/include/asio.cpp
+ stk-${version}/src/include/asio.h
+ stk-${version}/src/include/asiodrivers.cpp
+ stk-${version}/src/include/asiodrivers.h
+ stk-${version}/src/include/asiodrvr.h
+ stk-${version}/src/include/asiolist.cpp
+ stk-${version}/src/include/asiolist.h
+ stk-${version}/src/include/asiosys.h
+ stk-${version}/src/include/dsound.h
+ stk-${version}/src/include/iasiodrv.h
+ stk-${version}/src/include/iasiothiscallresolver.cpp
+ stk-${version}/src/include/iasiothiscallresolver.h
+ stk-${version}/src/include/soundcard.h
+EOF
+
+rm -f ${dst} ${dst%.gz}
+cp -av ${src} ${dst}
+
+gzip -d ${dst}
+
+tar --delete --file=${dst%.gz} ${files}
+
+gzip ${dst%.gz}
+
+cat >README.fedora <<EOF
+For legal and other reasons, the following files have been removed
+from the original tarfile:
+
+${files}
+EOF
diff --git a/sources b/sources
index a9e5bbe..87f8e9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00945641546200dbdbd853de56932c33 stk-4.4.2.stripped.tar.gz
+02524b03fef741bd813411147af13bb5 stk-4.4.4.stripped.tar.gz
diff --git a/stk-4.4.4-cflags-lib.patch b/stk-4.4.4-cflags-lib.patch
new file mode 100644
index 0000000..2e798d7
--- /dev/null
+++ b/stk-4.4.4-cflags-lib.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index 40c7395..b635dcd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,7 +65,7 @@ if test "$debug" = "yes"; then
+ else
+ AC_SUBST( debug, [no] )
+ AC_SUBST( cppflag, [] )
+- AC_SUBST( cxxflag, [-O3] )
++ AC_SUBST( cxxflag, [] )
+ AC_SUBST( object_path, [Release] )
+ fi
+ AC_MSG_RESULT($debug)
+@@ -81,7 +81,7 @@ CPPFLAGS="$CPPFLAGS $cppflag"
+
+ # For debugging and optimization ... overwrite default because it has both -g and -O2
+ echo "$CXXFLAGS"
+-CXXFLAGS="$cxxflag"
++CXXFLAGS="$CXXFLAGS $cxxflag"
+
+ # Check compiler and use -Wall if gnu.
+ if [test $GXX = "yes" ;] then
diff --git a/stk-4.4.2-header.patch b/stk-4.4.4-header.patch
similarity index 89%
rename from stk-4.4.2-header.patch
rename to stk-4.4.4-header.patch
index 7df9583..5f7b09f 100644
--- a/stk-4.4.2-header.patch
+++ b/stk-4.4.4-header.patch
@@ -23,7 +23,7 @@ index 5062685..3cc8ab6 100644
bool parseSkiniControl = true;
diff --git a/projects/demo/demo.cpp b/projects/demo/demo.cpp
-index 6eb37e1..c82f506 100644
+index c354364..bd1ce01 100644
--- a/projects/demo/demo.cpp
+++ b/projects/demo/demo.cpp
@@ -19,7 +19,7 @@
@@ -36,25 +36,22 @@ index 6eb37e1..c82f506 100644
#include <algorithm>
#include <cmath>
diff --git a/projects/demo/utilities.cpp b/projects/demo/utilities.cpp
-index 65b6a0b..0823ad7 100644
+index 7013396..bb5fdd9 100644
--- a/projects/demo/utilities.cpp
+++ b/projects/demo/utilities.cpp
-@@ -2,8 +2,8 @@
+@@ -2,6 +2,7 @@
//
// Gary P. Scavone, 1999.
--#include <stdlib.h>
--#include <string.h>
+#include <cstdlib>
-+#include <cstring>
+ #include <cstring>
#include "utilities.h"
- // STK Instrument Classes
diff --git a/projects/effects/effects.cpp b/projects/effects/effects.cpp
-index 616bd64..5771af8 100644
+index 5477a3c..9c78256 100644
--- a/projects/effects/effects.cpp
+++ b/projects/effects/effects.cpp
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
#include "Messager.h"
#include "RtAudio.h"
@@ -116,10 +113,10 @@ index 5f3174f..ff5bc8e 100644
#include <iostream>
#include <algorithm>
diff --git a/src/Messager.cpp b/src/Messager.cpp
-index 2136094..3f89b7e 100644
+index 558f0db..d03c50d 100644
--- a/src/Messager.cpp
+++ b/src/Messager.cpp
-@@ -302,7 +302,7 @@ bool Messager :: startSocketInput( int port )
+@@ -308,7 +308,7 @@ bool Messager :: startSocketInput( int port )
#if (defined(__OS_IRIX__) || defined(__OS_LINUX__) || defined(__OS_MACOSX__))
#include <sys/time.h>
@@ -129,7 +126,7 @@ index 2136094..3f89b7e 100644
THREAD_RETURN THREAD_TYPE socketHandler(void *ptr)
diff --git a/src/Noise.cpp b/src/Noise.cpp
-index 063487e..01244ae 100644
+index 8bc6c34..c809792 100644
--- a/src/Noise.cpp
+++ b/src/Noise.cpp
@@ -11,7 +11,7 @@
@@ -142,39 +139,40 @@ index 063487e..01244ae 100644
namespace stk {
diff --git a/src/RtAudio.cpp b/src/RtAudio.cpp
-index 78259e9..fb190ba 100644
+index 823faaf..44e15a5 100644
--- a/src/RtAudio.cpp
+++ b/src/RtAudio.cpp
@@ -45,6 +45,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <climits>
-+#include <cstdio>
-
- // Static variable definitions.
- const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
-@@ -6299,11 +6300,10 @@ extern "C" void *alsaCallbackHandler( void *ptr )
-
- #include <unistd.h>
- #include <sys/ioctl.h>
--#include <unistd.h>
- #include <fcntl.h>
- #include "soundcard.h"
--#include <errno.h>
--#include <math.h>
-+#include <cerrno>
-+#include <cmath>
-
- extern "C" void *ossCallbackHandler(void * ptr);
-
+ #include <cstdlib>
+ #include <cstring>
+ #include <climits>
++#include <cstdio>
+
+ // Static variable definitions.
+ const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
+@@ -6745,11 +6746,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,
+
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+-#include <unistd.h>
+ #include <fcntl.h>
+ #include "soundcard.h"
+-#include <errno.h>
+-#include <math.h>
++#include <cerrno>
++#include <cmath>
+
+ extern "C" void *ossCallbackHandler(void * ptr);
+
diff --git a/src/Stk.cpp b/src/Stk.cpp
-index 1a6f740..f41aa08 100644
+index ab90da9..9e6d93b 100644
--- a/src/Stk.cpp
+++ b/src/Stk.cpp
-@@ -51,6 +51,7 @@
+@@ -51,7 +51,7 @@
/***************************************************/
#include "Stk.h"
+-#include <stdlib.h>
+#include <cstdlib>
namespace stk {
diff --git a/stk-4.4.4-projects.patch b/stk-4.4.4-projects.patch
new file mode 100644
index 0000000..90b0ff2
--- /dev/null
+++ b/stk-4.4.4-projects.patch
@@ -0,0 +1,17 @@
+diff --git a/projects/demo/Banded b/projects/demo/Banded
+old mode 100755
+new mode 100644
+index be738c7..519b21e
+--- a/projects/demo/Banded
++++ b/projects/demo/Banded
+@@ -1 +1 @@
+-wish < tcl/Banded.tcl | demo BandedWG -or -ip
+\ No newline at end of file
++wish < tcl/Banded.tcl | ./demo BandedWG -or -ip
+diff --git a/projects/eguitar/ElectricGuitar b/projects/eguitar/ElectricGuitar
+index dfc6437..9f078b2 100755
+--- a/projects/eguitar/ElectricGuitar
++++ b/projects/eguitar/ElectricGuitar
+@@ -1 +1 @@
+-wish < tcl/EGuitar.tcl | ./eguitar -or -ip
++wish < tcl/Eguitar.tcl | ./eguitar -or -ip
diff --git a/stk-4.4.4-pthread.patch b/stk-4.4.4-pthread.patch
new file mode 100644
index 0000000..6b754f8
--- /dev/null
+++ b/stk-4.4.4-pthread.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index b635dcd..2791040 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,6 +132,7 @@ if test $realtime = yes; then
+ AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
+ fi
+
++ AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
+ ;;
+
+ *-apple*)
diff --git a/stk-4.4.4-sharedlib.patch b/stk-4.4.4-sharedlib.patch
new file mode 100644
index 0000000..7ba357a
--- /dev/null
+++ b/stk-4.4.4-sharedlib.patch
@@ -0,0 +1,29 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b16e4e3..e1325ee 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -64,7 +64,7 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
+ %.o : ../src/include/%.cpp
+ $(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
+
+-all : $(STATICLIB)
++all : $(SHAREDLIB) $(STATICLIB)
+
+ $(STATICLIB) : $(OBJECTS)
+ $(RM) -f $(STATICLIB)
+@@ -74,7 +74,7 @@ $(SHAREDLIB) : $(OBJECTS)
+ $(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+ $(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
+ $(LN) -s @sharedname@ $(SHAREDLIB)
+-# $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
++ $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
+
+ $(OBJECTS) : Stk.h
+
+@@ -86,4 +86,4 @@ clean :
+ $(RM) -fR *.dSYM
+
+ distclean: clean
+- $(RM) Makefile
+\ No newline at end of file
++ $(RM) Makefile
diff --git a/stk.spec b/stk.spec
index 72eb39b..1e1a5bb 100644
--- a/stk.spec
+++ b/stk.spec
@@ -1,21 +1,20 @@
Name: stk
-Version: 4.4.2
-Release: 5%{?dist}
+Version: 4.4.4
+Release: 1%{?dist}
Summary: Synthesis ToolKit in C++
Group: System Environment/Libraries
License: MIT
URL: http://ccrma.stanford.edu/software/stk/
Source0: %{name}-%{version}.stripped.tar.gz
-# Original tarfile can be found at %{url}/release/%{name}-%{version}.tar.gz
-# We remove legeally questionable files.
+# Original tarfile can be found at %%{url}/release/%%{name}-%%{version}.tar.gz
+# We remove legeally questionable files as well as accidentally packed
+# object files.
Source1: README.fedora
-Source2: config.guess
-Source3: config.sub
-Patch0: stk-4.4.2-header.patch
-Patch1: stk-4.4.2-cflags-lib.patch
-Patch2: stk-4.4.2-sharedlib.patch
-Patch3: stk-4.4.2-missing.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: stk-4.4.4-header.patch
+Patch1: stk-4.4.4-cflags-lib.patch
+Patch2: stk-4.4.4-sharedlib.patch
+Patch3: stk-4.4.4-projects.patch
+Patch4: stk-4.4.4-pthread.patch
BuildRequires: alsa-lib-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: symlinks
@@ -57,28 +56,27 @@ Requires: tk
Requires: %{name} = %{version}-%{release}
%description demo
-The %{name}-demo package contains the demo applications for the
+The %{name}-demo package contains the demo applications for the
C++ Sound Synthesis ToolKit.
%prep
-%setup0 -q
+%setup0 -q
%patch0 -p1 -b .header
%patch1 -p1 -b .cflags
%patch2 -p1 -b .sharedlib
-%patch3 -p1 -b .missing
+%patch3 -p1 -b .projects
+%patch4 -p1 -b .pthread
# we patched configure.ac
autoconf
cp -a %{SOURCE1} README.fedora
-# update old aux scripts
-rm config/config.guess config/config.sub
-install -m 0755 -p %{SOURCE2} config/config.guess
-install -m 0755 -p %{SOURCE3} config/config.sub
+# generated file
+rm projects/examples/libMakefile
-# remove backup file
+# remove backup files
find . -name '*~' -exec rm {} \;
@@ -90,10 +88,10 @@ make %{?_smp_mflags} -C projects/demo libdemo libMd2Skini
make %{?_smp_mflags} -C projects/examples -f libMakefile
make %{?_smp_mflags} -C projects/effects libeffects
make %{?_smp_mflags} -C projects/ragamatic libragamat
+make %{?_smp_mflags} -C projects/eguitar libeguitar
%install
-rm -rf %{buildroot}
mkdir -p \
%{buildroot}%{_includedir}/stk \
%{buildroot}%{_libdir} \
@@ -102,9 +100,10 @@ mkdir -p \
%{buildroot}%{_datadir}/stk/demo \
%{buildroot}%{_datadir}/stk/examples \
%{buildroot}%{_datadir}/stk/effects \
- %{buildroot}%{_datadir}/stk/ragamatic
+ %{buildroot}%{_datadir}/stk/ragamatic \
+ %{buildroot}%{_datadir}/stk/eguitar
-cp -p include/* %{buildroot}%{_includedir}/stk
+cp -p include/* %{buildroot}%{_includedir}/stk
cp -pd src/libstk.* %{buildroot}%{_libdir}
cp -p rawwaves/*.raw %{buildroot}%{_datadir}/stk/rawwaves
@@ -143,6 +142,13 @@ sed -e 's,\./ragamat,%{_bindir}/stk-ragamat,' -e '1i#! /bin/sh' \
-i projects/ragamatic/Raga
cp -p projects/ragamatic/Raga %{buildroot}%{_datadir}/stk/ragamatic
+cp -pr projects/eguitar/tcl %{buildroot}%{_datadir}/stk/eguitar
+cp -pr projects/eguitar/scores %{buildroot}%{_datadir}/stk/eguitar
+cp -p projects/eguitar/eguitar %{buildroot}%{_bindir}/stk-eguitar
+sed -e 's,\./eguitar,%{_bindir}/stk-eguitar,' -e '1i#! /bin/sh' \
+ -i projects/eguitar/ElectricGuitar
+cp -p projects/eguitar/ElectricGuitar %{buildroot}%{_datadir}/stk/eguitar
+
# fix encoding
iconv -f iso-8859-1 -t utf-8 doc/doxygen/index.txt \
-o doc/doxygen/index.txt.tmp
@@ -155,10 +161,6 @@ symlinks -crv %{buildroot}
chmod -R u=rwX,go=rX %{buildroot}
-%clean
-rm -rf %{buildroot}
-
-
%post -p /sbin/ldconfig
@@ -166,7 +168,6 @@ rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc README
%{_libdir}/libstk.so.*
%dir %{_datadir}/stk
@@ -174,7 +175,6 @@ rm -rf %{buildroot}
%files devel
-%defattr(-,root,root,-)
%doc README doc/* README.fedora
%exclude %{_libdir}/libstk.a
%{_libdir}/libstk.so
@@ -182,7 +182,6 @@ rm -rf %{buildroot}
%files demo
-%defattr(-,root,root,-)
%doc README README.fedora
%{_bindir}/stk-*
%{_bindir}/Md2Skini
@@ -190,9 +189,17 @@ rm -rf %{buildroot}
%{_datadir}/stk/examples
%{_datadir}/stk/effects
%{_datadir}/stk/ragamatic
+%{_datadir}/stk/eguitar
%changelog
+* Sun Dec 16 2012 Thomas Moschny <thomas.moschny at gmx.de> - 4.4.4-1
+- Update to 4.4.4.
+- Rebase patches.
+- Follow upstream and use version 4 for the soname.
+- Modernize spec file.
+- Pack new demo project 'eguitar'.
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list