diff --git a/.gitignore b/.gitignore index 34c3874..2bcf356 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -/stk-*.stripped.tar.gz +stk-4.4.2.stripped.tar.gz +/stk-4.4.4.stripped.tar.gz +/stk-4.5.0.stripped.tar.gz diff --git a/README.fedora b/README.fedora index 956cd06..9e6157d 100644 --- a/README.fedora +++ b/README.fedora @@ -1,20 +1,20 @@ For legal and other reasons, the following files have been removed from the original tarfile: -stk-4.6.1/projects/demo/scores/*.ski -stk-4.6.1/projects/eguitar/scores/*.ski -stk-4.6.1/projects/examples/midifiles/*.mid -stk-4.6.1/projects/examples/scores/*.ski -stk-4.6.1/src/include/asio.cpp -stk-4.6.1/src/include/asio.h -stk-4.6.1/src/include/asiodrivers.cpp -stk-4.6.1/src/include/asiodrivers.h -stk-4.6.1/src/include/asiodrvr.h -stk-4.6.1/src/include/asiolist.cpp -stk-4.6.1/src/include/asiolist.h -stk-4.6.1/src/include/asiosys.h -stk-4.6.1/src/include/dsound.h -stk-4.6.1/src/include/iasiodrv.h -stk-4.6.1/src/include/iasiothiscallresolver.cpp -stk-4.6.1/src/include/iasiothiscallresolver.h -stk-4.6.1/src/include/soundcard.h +stk-4.5.0/projects/demo/scores/*.ski +stk-4.5.0/projects/eguitar/scores/*.ski +stk-4.5.0/projects/examples/midifiles/*.mid +stk-4.5.0/projects/examples/scores/*.ski +stk-4.5.0/src/include/asio.cpp +stk-4.5.0/src/include/asio.h +stk-4.5.0/src/include/asiodrivers.cpp +stk-4.5.0/src/include/asiodrivers.h +stk-4.5.0/src/include/asiodrvr.h +stk-4.5.0/src/include/asiolist.cpp +stk-4.5.0/src/include/asiolist.h +stk-4.5.0/src/include/asiosys.h +stk-4.5.0/src/include/dsound.h +stk-4.5.0/src/include/iasiodrv.h +stk-4.5.0/src/include/iasiothiscallresolver.cpp +stk-4.5.0/src/include/iasiothiscallresolver.h +stk-4.5.0/src/include/soundcard.h diff --git a/repack.sh b/repack.sh index 093a9c9..081b7c8 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=4.6.1 +version=4.5.0 src=stk-${version}.tar.gz dst=${src%.tar.gz}.stripped.tar.gz diff --git a/sources b/sources index d0a86e3..aaae1df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stk-4.6.1.stripped.tar.gz) = 3d016ca9494cabe331e8582d57db369493f6d01e12a00732672218dd4b9d3b59125d4aa407b9c4e0f29908b37952846c4db62d8b36059f8df50255645510d41e +e09915a13d5fe41d6a0f5a2cfee3abb9 stk-4.5.0.stripped.tar.gz diff --git a/stk-4.6.1-cflags-lib.patch b/stk-4.5.0-cflags-lib.patch similarity index 70% rename from stk-4.6.1-cflags-lib.patch rename to stk-4.5.0-cflags-lib.patch index 69743f0..2841784 100644 --- a/stk-4.6.1-cflags-lib.patch +++ b/stk-4.5.0-cflags-lib.patch @@ -1,12 +1,5 @@ -From: Thomas Moschny -Subject: [PATCH] t/cflags-lib - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/configure.ac b/configure.ac -index 80c8c79..1edc256 100644 +index 0616428..d88faa9 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ if test "$debug" = "yes"; then @@ -27,6 +20,3 @@ index 80c8c79..1edc256 100644 # Check compiler and use -Wall if gnu. if [test $GXX = "yes" ;] then - --- -tg: (67475d5..) t/cflags-lib (depends on: master) diff --git a/stk-4.6.1-header.patch b/stk-4.5.0-header.patch similarity index 77% rename from stk-4.6.1-header.patch rename to stk-4.5.0-header.patch index 9a6bfd2..77a3e55 100644 --- a/stk-4.6.1-header.patch +++ b/stk-4.5.0-header.patch @@ -1,28 +1,10 @@ -From: Thomas Moschny -Subject: [PATCH] t/header - ---- - projects/demo/Md2Skini.cpp | 7 ++++--- - projects/demo/demo.cpp | 2 +- - projects/demo/utilities.cpp | 1 + - projects/effects/effects.cpp | 2 +- - projects/examples/controlbee.cpp | 2 +- - projects/examples/play.cpp | 2 +- - projects/examples/playsmf.cpp | 2 +- - projects/ragamatic/ragamat.cpp | 2 +- - src/Messager.cpp | 2 +- - src/Noise.cpp | 2 +- - src/RtAudio.cpp | 6 +++--- - src/Stk.cpp | 2 +- - 12 files changed, 17 insertions(+), 15 deletions(-) - diff --git a/projects/demo/Md2Skini.cpp b/projects/demo/Md2Skini.cpp -index dc32e4b..a5848da 100644 +index be0e569..12a486c 100644 --- a/projects/demo/Md2Skini.cpp +++ b/projects/demo/Md2Skini.cpp @@ -13,8 +13,9 @@ #include "RtMidi.h" - #include "SKINImsg.h" + #include "SKINI.msg" #include -#include -#include @@ -42,7 +24,7 @@ index dc32e4b..a5848da 100644 bool parseSkiniControl = true; diff --git a/projects/demo/demo.cpp b/projects/demo/demo.cpp -index c877b4a..52f8ae9 100644 +index e2f6e2a..a847679 100644 --- a/projects/demo/demo.cpp +++ b/projects/demo/demo.cpp @@ -19,7 +19,7 @@ @@ -55,7 +37,7 @@ index c877b4a..52f8ae9 100644 #include #include diff --git a/projects/demo/utilities.cpp b/projects/demo/utilities.cpp -index 9d4fd78..202d11b 100644 +index 7013396..bb5fdd9 100644 --- a/projects/demo/utilities.cpp +++ b/projects/demo/utilities.cpp @@ -2,6 +2,7 @@ @@ -67,7 +49,7 @@ index 9d4fd78..202d11b 100644 #include "utilities.h" diff --git a/projects/effects/effects.cpp b/projects/effects/effects.cpp -index 6bbd9b9..7dea921 100644 +index f57e60c..ab48a25 100644 --- a/projects/effects/effects.cpp +++ b/projects/effects/effects.cpp @@ -14,7 +14,7 @@ @@ -80,20 +62,20 @@ index 6bbd9b9..7dea921 100644 #include #include diff --git a/projects/examples/controlbee.cpp b/projects/examples/controlbee.cpp -index 42e4d41..7133be1 100644 +index ff5b8f7..e601e98 100644 --- a/projects/examples/controlbee.cpp +++ b/projects/examples/controlbee.cpp @@ -4,7 +4,7 @@ #include "RtAudio.h" #include "Messager.h" - #include "SKINImsg.h" + #include "SKINI.msg" -#include +#include #include using std::min; diff --git a/projects/examples/play.cpp b/projects/examples/play.cpp -index 5863823..439193c 100644 +index 3706fcf..52e4bf1 100644 --- a/projects/examples/play.cpp +++ b/projects/examples/play.cpp @@ -16,7 +16,7 @@ @@ -119,7 +101,7 @@ index 777e8e2..871a7fb 100644 bool done = false; diff --git a/projects/ragamatic/ragamat.cpp b/projects/ragamatic/ragamat.cpp -index b706e2e..dde1be8 100644 +index 463092f..7b9343f 100644 --- a/projects/ragamatic/ragamat.cpp +++ b/projects/ragamatic/ragamat.cpp @@ -10,7 +10,7 @@ @@ -132,7 +114,7 @@ index b706e2e..dde1be8 100644 #include #include diff --git a/src/Messager.cpp b/src/Messager.cpp -index 3c0cbb0..3ed9135 100644 +index 929f7e7..ef9c2a1 100644 --- a/src/Messager.cpp +++ b/src/Messager.cpp @@ -309,7 +309,7 @@ bool Messager :: startSocketInput( int port ) @@ -145,7 +127,7 @@ index 3c0cbb0..3ed9135 100644 THREAD_RETURN THREAD_TYPE socketHandler(void *ptr) diff --git a/src/Noise.cpp b/src/Noise.cpp -index 1fb8c93..0201c87 100644 +index 1fdc41e..9a2caf7 100644 --- a/src/Noise.cpp +++ b/src/Noise.cpp @@ -11,7 +11,7 @@ @@ -158,33 +140,33 @@ index 1fb8c93..0201c87 100644 namespace stk { diff --git a/src/RtAudio.cpp b/src/RtAudio.cpp -index 0837d98..2bf5313 100644 +index af7d205..546d3f4 100644 --- a/src/RtAudio.cpp +++ b/src/RtAudio.cpp -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - #include - - // Static variable definitions. -@@ -8963,11 +8964,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, - - #include - #include --#include - #include - #include --#include --#include -+#include -+#include - - static void *ossCallbackHandler(void * ptr); - +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + // Static variable definitions. + const unsigned int RtApi::MAX_SAMPLE_RATES = 14; +@@ -8496,11 +8497,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, + + #include + #include +-#include + #include + #include +-#include +-#include ++#include ++#include + + static void *ossCallbackHandler(void * ptr); + diff --git a/src/Stk.cpp b/src/Stk.cpp -index 8126285..d6e51c8 100644 +index 2224df1..4fd383d 100644 --- a/src/Stk.cpp +++ b/src/Stk.cpp @@ -51,7 +51,7 @@ @@ -196,6 +178,3 @@ index 8126285..d6e51c8 100644 namespace stk { - --- -tg: (67475d5..) t/header (depends on: master) diff --git a/stk-4.5.0-projects.patch b/stk-4.5.0-projects.patch new file mode 100644 index 0000000..9cdfcf6 --- /dev/null +++ b/stk-4.5.0-projects.patch @@ -0,0 +1,10 @@ +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/stk-4.5.0-sharedlib.patch b/stk-4.5.0-sharedlib.patch new file mode 100644 index 0000000..56e9866 --- /dev/null +++ b/stk-4.5.0-sharedlib.patch @@ -0,0 +1,20 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 64da6bf..f57f5c7 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -91,7 +91,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) + + install-headers: + install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk +@@ -114,4 +114,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 7bd3788..27cefde 100644 --- a/stk.spec +++ b/stk.spec @@ -1,18 +1,19 @@ Name: stk -Version: 4.6.1 -Release: 11%{?dist} +Version: 4.5.0 +Release: 9%{?dist} Summary: Synthesis ToolKit in C++ +Group: System Environment/Libraries License: MIT -URL: https://ccrma.stanford.edu/software/stk/ +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 as well as accidentally packed # object files. Source1: README.fedora -Patch0: stk-4.6.1-header.patch -Patch1: stk-4.6.1-cflags-lib.patch -BuildRequires: make -BuildRequires: gcc-c++ +Patch0: stk-4.5.0-header.patch +Patch1: stk-4.5.0-cflags-lib.patch +Patch2: stk-4.5.0-sharedlib.patch +Patch3: stk-4.5.0-projects.patch BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: symlinks @@ -39,6 +40,7 @@ should work with any standard C++ compiler. %package devel Summary: Development files for %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -48,6 +50,7 @@ developing applications that use %{name}. %package demo Summary: Demo applications for %{name} +Group: System Environment/Libraries Requires: tk Requires: %{name} = %{version}-%{release} @@ -57,24 +60,31 @@ C++ Sound Synthesis ToolKit. %prep -%autosetup -p1 +%setup0 -q +%patch0 -p1 -b .header +%patch1 -p1 -b .cflags +%patch2 -p1 -b .sharedlib +%patch3 -p1 -b .projects # we patched configure.ac autoconf cp -a %{SOURCE1} README.fedora -# remove backup and other extra files +# remove backup files find . -name '*~' -exec rm {} \; -find . -name '._*' -exec rm {} \; %build %configure --with-jack --with-alsa \ --disable-static --enable-shared \ RAWWAVE_PATH=%{_datadir}/stk/rawwaves/ -%make_build -%make_build -C projects/demo libMd2Skini +make %{?_smp_mflags} -C src +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 @@ -90,16 +100,17 @@ mkdir -p \ %{buildroot}%{_datadir}/stk/eguitar cp -p include/* %{buildroot}%{_includedir}/stk -cp -pd src/libstk*.so %{buildroot}%{_libdir} +cp -pd src/libstk.* %{buildroot}%{_libdir} cp -p rawwaves/*.raw %{buildroot}%{_datadir}/stk/rawwaves cp -pr projects/demo/tcl %{buildroot}%{_datadir}/stk/demo cp -pr projects/demo/scores %{buildroot}%{_datadir}/stk/demo -cp -p projects/demo/stk-demo %{buildroot}%{_bindir}/stk-demo +cp -p projects/demo/demo %{buildroot}%{_bindir}/stk-demo cp -p projects/demo/Md2Skini %{buildroot}%{_bindir}/Md2Skini for f in Banded Drums Modal Physical Shakers StkDemo Voice ; do chmod +x projects/demo/$f - sed -e '1i#! /bin/sh' -i projects/demo/$f + sed -e 's,\./demo,%{_bindir}/stk-demo,' -e '1i#! /bin/sh' \ + -i projects/demo/$f cp -p projects/demo/$f %{buildroot}%{_datadir}/stk/demo done @@ -142,19 +153,19 @@ mv doc/doxygen/index.txt.tmp doc/doxygen/index.txt # fix symlinks symlinks -crv %{buildroot} -# fix permissions -find %{buildroot} \( -name '*.h' -o -name '*.raw' -o -name '*.tcl' \ - -o -name '*.xbm' -o -name '*.bmp' -o -name 'README' \) -a -exec chmod -x {} \; -find doc README.md README.fedora -type f -exec chmod -x {} \; +# finally, fix permissions chmod -R u=rwX,go=rX %{buildroot} -%ldconfig_scriptlets +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig %files %doc README.md -%{_libdir}/libstk-*.so +%{_libdir}/libstk.so.* %dir %{_datadir}/stk %{_datadir}/stk/rawwaves @@ -177,68 +188,6 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.6.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 4.6.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 4.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 4.6.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 4.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 4.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 4.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 4.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 4.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Sep 12 2020 Thomas Moschny - 4.6.1-1 -- Update to 4.6.1. - -* Sat Sep 12 2020 Thomas Moschny - 4.6.0-1 -- Update to 4.6.0. - -* Sat Sep 12 2020 Thomas Moschny - 4.5.1-1 -- Update to 4.5.1. -- Rebase patches. - -* Sat Aug 01 2020 Fedora Release Engineering - 4.5.0-16 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 4.5.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 4.5.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 4.5.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 4.5.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 4.5.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 4.5.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Thu Aug 03 2017 Fedora Release Engineering - 4.5.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild