From 06a0a2085fc7410eb5c20e4aceeef93240ba0806 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 17:45:47 +0000 Subject: [PATCH 01/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 27cefde..1fc9d0c 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Synthesis ToolKit in C++ Group: System Environment/Libraries License: MIT @@ -188,6 +188,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 967f45bdc11014c0a0c7032bac2e4a9d31285013 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:18:31 +0200 Subject: [PATCH 02/23] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- stk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/stk.spec b/stk.spec index 1fc9d0c..66918c9 100644 --- a/stk.spec +++ b/stk.spec @@ -14,6 +14,7 @@ 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: gcc-c++ BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: symlinks From 5be3dbf633c49690919ef903d1f9690185a6e55f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:47:08 +0000 Subject: [PATCH 03/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 66918c9..95c0372 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Synthesis ToolKit in C++ Group: System Environment/Libraries License: MIT @@ -189,6 +189,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From ba08b7979f84720fc3ec76c88390c00888bd8df4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:05 +0100 Subject: [PATCH 04/23] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- stk.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stk.spec b/stk.spec index 95c0372..846f9c2 100644 --- a/stk.spec +++ b/stk.spec @@ -158,10 +158,7 @@ symlinks -crv %{buildroot} chmod -R u=rwX,go=rX %{buildroot} -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From 1b2e6ef00ea28114dbf15e10dd8f0f00ee885602 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:26 +0100 Subject: [PATCH 05/23] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- stk.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/stk.spec b/stk.spec index 846f9c2..07fc5e8 100644 --- a/stk.spec +++ b/stk.spec @@ -2,7 +2,6 @@ Name: stk Version: 4.5.0 Release: 11%{?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 @@ -41,7 +40,6 @@ should work with any standard C++ compiler. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -51,7 +49,6 @@ developing applications that use %{name}. %package demo Summary: Demo applications for %{name} -Group: System Environment/Libraries Requires: tk Requires: %{name} = %{version}-%{release} From 24dabe58b91a1bc93e96da5f7d3f1258dbd050c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 08:41:15 +0000 Subject: [PATCH 06/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 07fc5e8..ce05ac2 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: http://ccrma.stanford.edu/software/stk/ @@ -183,6 +183,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 58cb072e01dcd08b45505131af3ff2dca86f1b8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 00:16:08 +0000 Subject: [PATCH 07/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index ce05ac2..8e1220f 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: http://ccrma.stanford.edu/software/stk/ @@ -183,6 +183,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From a37e4e0a0206d4e39f3e31ad1a62f8245125b153 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:22:41 +0000 Subject: [PATCH 08/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 8e1220f..c1edeb2 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: http://ccrma.stanford.edu/software/stk/ @@ -183,6 +183,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 248e4780f5b28d8985747d834d0905484db59d94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:31:37 +0000 Subject: [PATCH 09/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index c1edeb2..439d5b8 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: http://ccrma.stanford.edu/software/stk/ @@ -183,6 +183,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 03c0779674125acfa6fac7b356a34d38120df870 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:11:00 +0000 Subject: [PATCH 10/23] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 439d5b8..1a250f3 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.5.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: http://ccrma.stanford.edu/software/stk/ @@ -183,6 +183,10 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From a10ef6f82846199438fb6603e5f9577d1ada521a Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 21 Jun 2020 23:24:14 +0200 Subject: [PATCH 11/23] Update to 4.5.1. Rebase patches. --- .gitignore | 4 +- README.fedora | 34 ++++++------ repack.sh | 2 +- sources | 2 +- stk-4.5.0-projects.patch | 10 ---- stk-4.5.0-sharedlib.patch | 20 ------- ...gs-lib.patch => stk-4.5.1-cflags-lib.patch | 12 ++++- ...5.0-header.patch => stk-4.5.1-header.patch | 53 +++++++++++++------ stk.spec | 45 ++++++++-------- 9 files changed, 89 insertions(+), 93 deletions(-) delete mode 100644 stk-4.5.0-projects.patch delete mode 100644 stk-4.5.0-sharedlib.patch rename stk-4.5.0-cflags-lib.patch => stk-4.5.1-cflags-lib.patch (70%) rename stk-4.5.0-header.patch => stk-4.5.1-header.patch (77%) diff --git a/.gitignore b/.gitignore index 2bcf356..34c3874 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -stk-4.4.2.stripped.tar.gz -/stk-4.4.4.stripped.tar.gz -/stk-4.5.0.stripped.tar.gz +/stk-*.stripped.tar.gz diff --git a/README.fedora b/README.fedora index 9e6157d..9807d9b 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.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 +stk-4.5.1/projects/demo/scores/*.ski +stk-4.5.1/projects/eguitar/scores/*.ski +stk-4.5.1/projects/examples/midifiles/*.mid +stk-4.5.1/projects/examples/scores/*.ski +stk-4.5.1/src/include/asio.cpp +stk-4.5.1/src/include/asio.h +stk-4.5.1/src/include/asiodrivers.cpp +stk-4.5.1/src/include/asiodrivers.h +stk-4.5.1/src/include/asiodrvr.h +stk-4.5.1/src/include/asiolist.cpp +stk-4.5.1/src/include/asiolist.h +stk-4.5.1/src/include/asiosys.h +stk-4.5.1/src/include/dsound.h +stk-4.5.1/src/include/iasiodrv.h +stk-4.5.1/src/include/iasiothiscallresolver.cpp +stk-4.5.1/src/include/iasiothiscallresolver.h +stk-4.5.1/src/include/soundcard.h diff --git a/repack.sh b/repack.sh index 081b7c8..e56defb 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=4.5.0 +version=4.5.1 src=stk-${version}.tar.gz dst=${src%.tar.gz}.stripped.tar.gz diff --git a/sources b/sources index aaae1df..1aca897 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e09915a13d5fe41d6a0f5a2cfee3abb9 stk-4.5.0.stripped.tar.gz +SHA256 (stk-4.5.1.stripped.tar.gz) = 0944964b262128a7b14695de9d69e7739af12ca17c2524640f861f8022f7fa6d diff --git a/stk-4.5.0-projects.patch b/stk-4.5.0-projects.patch deleted file mode 100644 index 9cdfcf6..0000000 --- a/stk-4.5.0-projects.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 56e9866..0000000 --- a/stk-4.5.0-sharedlib.patch +++ /dev/null @@ -1,20 +0,0 @@ -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-4.5.0-cflags-lib.patch b/stk-4.5.1-cflags-lib.patch similarity index 70% rename from stk-4.5.0-cflags-lib.patch rename to stk-4.5.1-cflags-lib.patch index 2841784..f158520 100644 --- a/stk-4.5.0-cflags-lib.patch +++ b/stk-4.5.1-cflags-lib.patch @@ -1,5 +1,12 @@ +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 0616428..d88faa9 100644 +index 39fba08..629cf12 100755 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ if test "$debug" = "yes"; then @@ -20,3 +27,6 @@ index 0616428..d88faa9 100644 # Check compiler and use -Wall if gnu. if [test $GXX = "yes" ;] then + +-- +tg: (c16cc9e..) t/cflags-lib (depends on: master) diff --git a/stk-4.5.0-header.patch b/stk-4.5.1-header.patch similarity index 77% rename from stk-4.5.0-header.patch rename to stk-4.5.1-header.patch index 77a3e55..fb57c5e 100644 --- a/stk-4.5.0-header.patch +++ b/stk-4.5.1-header.patch @@ -1,10 +1,28 @@ +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 be0e569..12a486c 100644 +index dc32e4b..a5848da 100755 --- a/projects/demo/Md2Skini.cpp +++ b/projects/demo/Md2Skini.cpp @@ -13,8 +13,9 @@ #include "RtMidi.h" - #include "SKINI.msg" + #include "SKINImsg.h" #include -#include -#include @@ -24,7 +42,7 @@ index be0e569..12a486c 100644 bool parseSkiniControl = true; diff --git a/projects/demo/demo.cpp b/projects/demo/demo.cpp -index e2f6e2a..a847679 100644 +index c877b4a..52f8ae9 100755 --- a/projects/demo/demo.cpp +++ b/projects/demo/demo.cpp @@ -19,7 +19,7 @@ @@ -37,7 +55,7 @@ index e2f6e2a..a847679 100644 #include #include diff --git a/projects/demo/utilities.cpp b/projects/demo/utilities.cpp -index 7013396..bb5fdd9 100644 +index 7013396..bb5fdd9 100755 --- a/projects/demo/utilities.cpp +++ b/projects/demo/utilities.cpp @@ -2,6 +2,7 @@ @@ -49,7 +67,7 @@ index 7013396..bb5fdd9 100644 #include "utilities.h" diff --git a/projects/effects/effects.cpp b/projects/effects/effects.cpp -index f57e60c..ab48a25 100644 +index 6bbd9b9..7dea921 100755 --- a/projects/effects/effects.cpp +++ b/projects/effects/effects.cpp @@ -14,7 +14,7 @@ @@ -62,20 +80,20 @@ index f57e60c..ab48a25 100644 #include #include diff --git a/projects/examples/controlbee.cpp b/projects/examples/controlbee.cpp -index ff5b8f7..e601e98 100644 +index 42e4d41..7133be1 100755 --- a/projects/examples/controlbee.cpp +++ b/projects/examples/controlbee.cpp @@ -4,7 +4,7 @@ #include "RtAudio.h" #include "Messager.h" - #include "SKINI.msg" + #include "SKINImsg.h" -#include +#include #include using std::min; diff --git a/projects/examples/play.cpp b/projects/examples/play.cpp -index 3706fcf..52e4bf1 100644 +index e87bbb8..8d27444 100755 --- a/projects/examples/play.cpp +++ b/projects/examples/play.cpp @@ -16,7 +16,7 @@ @@ -88,7 +106,7 @@ index 3706fcf..52e4bf1 100644 #include diff --git a/projects/examples/playsmf.cpp b/projects/examples/playsmf.cpp -index 777e8e2..871a7fb 100644 +index 777e8e2..871a7fb 100755 --- a/projects/examples/playsmf.cpp +++ b/projects/examples/playsmf.cpp @@ -7,7 +7,7 @@ @@ -101,7 +119,7 @@ index 777e8e2..871a7fb 100644 bool done = false; diff --git a/projects/ragamatic/ragamat.cpp b/projects/ragamatic/ragamat.cpp -index 463092f..7b9343f 100644 +index b706e2e..dde1be8 100755 --- a/projects/ragamatic/ragamat.cpp +++ b/projects/ragamatic/ragamat.cpp @@ -10,7 +10,7 @@ @@ -114,7 +132,7 @@ index 463092f..7b9343f 100644 #include #include diff --git a/src/Messager.cpp b/src/Messager.cpp -index 929f7e7..ef9c2a1 100644 +index f94a92c..2279f74 100755 --- a/src/Messager.cpp +++ b/src/Messager.cpp @@ -309,7 +309,7 @@ bool Messager :: startSocketInput( int port ) @@ -127,7 +145,7 @@ index 929f7e7..ef9c2a1 100644 THREAD_RETURN THREAD_TYPE socketHandler(void *ptr) diff --git a/src/Noise.cpp b/src/Noise.cpp -index 1fdc41e..9a2caf7 100644 +index c2d013b..66365b5 100755 --- a/src/Noise.cpp +++ b/src/Noise.cpp @@ -11,7 +11,7 @@ @@ -140,7 +158,7 @@ index 1fdc41e..9a2caf7 100644 namespace stk { diff --git a/src/RtAudio.cpp b/src/RtAudio.cpp -index af7d205..546d3f4 100644 +index 882fa0e..a995aa7 100755 --- a/src/RtAudio.cpp +++ b/src/RtAudio.cpp @@ -45,6 +45,7 @@ @@ -148,10 +166,10 @@ index af7d205..546d3f4 100644 #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, +@@ -8581,11 +8582,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, #include #include @@ -166,7 +184,7 @@ index af7d205..546d3f4 100644 static void *ossCallbackHandler(void * ptr); diff --git a/src/Stk.cpp b/src/Stk.cpp -index 2224df1..4fd383d 100644 +index 65ff9a5..b46809e 100755 --- a/src/Stk.cpp +++ b/src/Stk.cpp @@ -51,7 +51,7 @@ @@ -178,3 +196,6 @@ index 2224df1..4fd383d 100644 namespace stk { + +-- +tg: (c16cc9e..) t/header (depends on: master) diff --git a/stk.spec b/stk.spec index 1a250f3..6fa5b84 100644 --- a/stk.spec +++ b/stk.spec @@ -1,18 +1,17 @@ Name: stk -Version: 4.5.0 -Release: 16%{?dist} +Version: 4.5.1 +Release: 1%{?dist} Summary: Synthesis ToolKit in C++ License: MIT -URL: http://ccrma.stanford.edu/software/stk/ +URL: https://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.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 +Patch0: stk-4.5.1-header.patch +Patch1: stk-4.5.1-cflags-lib.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel @@ -58,11 +57,7 @@ C++ Sound Synthesis ToolKit. %prep -%setup0 -q -%patch0 -p1 -b .header -%patch1 -p1 -b .cflags -%patch2 -p1 -b .sharedlib -%patch3 -p1 -b .projects +%autosetup -p1 # we patched configure.ac autoconf @@ -77,12 +72,8 @@ find . -name '*~' -exec rm {} \; %configure --with-jack --with-alsa \ --disable-static --enable-shared \ RAWWAVE_PATH=%{_datadir}/stk/rawwaves/ -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 +%make_build +%make_build -C projects/demo libMd2Skini %install @@ -98,17 +89,16 @@ mkdir -p \ %{buildroot}%{_datadir}/stk/eguitar cp -p include/* %{buildroot}%{_includedir}/stk -cp -pd src/libstk.* %{buildroot}%{_libdir} +cp -pd src/libstk*.so %{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/demo %{buildroot}%{_bindir}/stk-demo +cp -p projects/demo/stk-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 's,\./demo,%{_bindir}/stk-demo,' -e '1i#! /bin/sh' \ - -i projects/demo/$f + sed -e '1i#! /bin/sh' -i projects/demo/$f cp -p projects/demo/$f %{buildroot}%{_datadir}/stk/demo done @@ -151,7 +141,10 @@ mv doc/doxygen/index.txt.tmp doc/doxygen/index.txt # fix symlinks symlinks -crv %{buildroot} -# finally, fix permissions +# 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 {} \; chmod -R u=rwX,go=rX %{buildroot} @@ -160,7 +153,7 @@ chmod -R u=rwX,go=rX %{buildroot} %files %doc README.md -%{_libdir}/libstk.so.* +%{_libdir}/libstk-*.so %dir %{_datadir}/stk %{_datadir}/stk/rawwaves @@ -183,6 +176,10 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 450a3f4b8948aab55d8b63c910799cb6b5693a45 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 12 Sep 2020 17:53:15 +0200 Subject: [PATCH 12/23] Update to 4.6.0. --- README.fedora | 34 ++++---- repack.sh | 2 +- sources | 2 +- ...gs-lib.patch => stk-4.6.0-cflags-lib.patch | 4 +- ...5.1-header.patch => stk-4.6.0-header.patch | 80 ++++++++++--------- stk.spec | 12 ++- 6 files changed, 72 insertions(+), 62 deletions(-) rename stk-4.5.1-cflags-lib.patch => stk-4.6.0-cflags-lib.patch (90%) rename stk-4.5.1-header.patch => stk-4.6.0-header.patch (84%) diff --git a/README.fedora b/README.fedora index 9807d9b..f657414 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.5.1/projects/demo/scores/*.ski -stk-4.5.1/projects/eguitar/scores/*.ski -stk-4.5.1/projects/examples/midifiles/*.mid -stk-4.5.1/projects/examples/scores/*.ski -stk-4.5.1/src/include/asio.cpp -stk-4.5.1/src/include/asio.h -stk-4.5.1/src/include/asiodrivers.cpp -stk-4.5.1/src/include/asiodrivers.h -stk-4.5.1/src/include/asiodrvr.h -stk-4.5.1/src/include/asiolist.cpp -stk-4.5.1/src/include/asiolist.h -stk-4.5.1/src/include/asiosys.h -stk-4.5.1/src/include/dsound.h -stk-4.5.1/src/include/iasiodrv.h -stk-4.5.1/src/include/iasiothiscallresolver.cpp -stk-4.5.1/src/include/iasiothiscallresolver.h -stk-4.5.1/src/include/soundcard.h +stk-4.6.0/projects/demo/scores/*.ski +stk-4.6.0/projects/eguitar/scores/*.ski +stk-4.6.0/projects/examples/midifiles/*.mid +stk-4.6.0/projects/examples/scores/*.ski +stk-4.6.0/src/include/asio.cpp +stk-4.6.0/src/include/asio.h +stk-4.6.0/src/include/asiodrivers.cpp +stk-4.6.0/src/include/asiodrivers.h +stk-4.6.0/src/include/asiodrvr.h +stk-4.6.0/src/include/asiolist.cpp +stk-4.6.0/src/include/asiolist.h +stk-4.6.0/src/include/asiosys.h +stk-4.6.0/src/include/dsound.h +stk-4.6.0/src/include/iasiodrv.h +stk-4.6.0/src/include/iasiothiscallresolver.cpp +stk-4.6.0/src/include/iasiothiscallresolver.h +stk-4.6.0/src/include/soundcard.h diff --git a/repack.sh b/repack.sh index e56defb..e4d2dd2 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=4.5.1 +version=4.6.0 src=stk-${version}.tar.gz dst=${src%.tar.gz}.stripped.tar.gz diff --git a/sources b/sources index 1aca897..af831e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA256 (stk-4.5.1.stripped.tar.gz) = 0944964b262128a7b14695de9d69e7739af12ca17c2524640f861f8022f7fa6d +SHA512 (stk-4.6.0.stripped.tar.gz) = 08637140fccdd655d400ae3eaf280060d1b6daa25de7b46018f5cce9f2e57609ff30829cd8b21930b975f20742df40111413a70e358d35f2520700c4cadeca6b diff --git a/stk-4.5.1-cflags-lib.patch b/stk-4.6.0-cflags-lib.patch similarity index 90% rename from stk-4.5.1-cflags-lib.patch rename to stk-4.6.0-cflags-lib.patch index f158520..79bb2aa 100644 --- a/stk-4.5.1-cflags-lib.patch +++ b/stk-4.6.0-cflags-lib.patch @@ -6,7 +6,7 @@ Subject: [PATCH] t/cflags-lib 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 39fba08..629cf12 100755 +index 80a8a0f..0f59928 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ if test "$debug" = "yes"; then @@ -29,4 +29,4 @@ index 39fba08..629cf12 100755 if [test $GXX = "yes" ;] then -- -tg: (c16cc9e..) t/cflags-lib (depends on: master) +tg: (4505f17..) t/cflags-lib (depends on: master) diff --git a/stk-4.5.1-header.patch b/stk-4.6.0-header.patch similarity index 84% rename from stk-4.5.1-header.patch rename to stk-4.6.0-header.patch index fb57c5e..bf7c9df 100644 --- a/stk-4.5.1-header.patch +++ b/stk-4.6.0-header.patch @@ -12,12 +12,12 @@ Subject: [PATCH] t/header projects/ragamatic/ragamat.cpp | 2 +- src/Messager.cpp | 2 +- src/Noise.cpp | 2 +- - src/RtAudio.cpp | 6 +++--- + src/RtAudio.cpp | 8 ++++---- src/Stk.cpp | 2 +- - 12 files changed, 17 insertions(+), 15 deletions(-) + 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/projects/demo/Md2Skini.cpp b/projects/demo/Md2Skini.cpp -index dc32e4b..a5848da 100755 +index dc32e4b..a5848da 100644 --- a/projects/demo/Md2Skini.cpp +++ b/projects/demo/Md2Skini.cpp @@ -13,8 +13,9 @@ @@ -42,7 +42,7 @@ index dc32e4b..a5848da 100755 bool parseSkiniControl = true; diff --git a/projects/demo/demo.cpp b/projects/demo/demo.cpp -index c877b4a..52f8ae9 100755 +index c877b4a..52f8ae9 100644 --- a/projects/demo/demo.cpp +++ b/projects/demo/demo.cpp @@ -19,7 +19,7 @@ @@ -55,7 +55,7 @@ index c877b4a..52f8ae9 100755 #include #include diff --git a/projects/demo/utilities.cpp b/projects/demo/utilities.cpp -index 7013396..bb5fdd9 100755 +index 7013396..bb5fdd9 100644 --- a/projects/demo/utilities.cpp +++ b/projects/demo/utilities.cpp @@ -2,6 +2,7 @@ @@ -67,7 +67,7 @@ index 7013396..bb5fdd9 100755 #include "utilities.h" diff --git a/projects/effects/effects.cpp b/projects/effects/effects.cpp -index 6bbd9b9..7dea921 100755 +index 6bbd9b9..7dea921 100644 --- a/projects/effects/effects.cpp +++ b/projects/effects/effects.cpp @@ -14,7 +14,7 @@ @@ -80,7 +80,7 @@ index 6bbd9b9..7dea921 100755 #include #include diff --git a/projects/examples/controlbee.cpp b/projects/examples/controlbee.cpp -index 42e4d41..7133be1 100755 +index 42e4d41..7133be1 100644 --- a/projects/examples/controlbee.cpp +++ b/projects/examples/controlbee.cpp @@ -4,7 +4,7 @@ @@ -93,7 +93,7 @@ index 42e4d41..7133be1 100755 using std::min; diff --git a/projects/examples/play.cpp b/projects/examples/play.cpp -index e87bbb8..8d27444 100755 +index 5863823..439193c 100644 --- a/projects/examples/play.cpp +++ b/projects/examples/play.cpp @@ -16,7 +16,7 @@ @@ -106,7 +106,7 @@ index e87bbb8..8d27444 100755 #include diff --git a/projects/examples/playsmf.cpp b/projects/examples/playsmf.cpp -index 777e8e2..871a7fb 100755 +index 777e8e2..871a7fb 100644 --- a/projects/examples/playsmf.cpp +++ b/projects/examples/playsmf.cpp @@ -7,7 +7,7 @@ @@ -119,7 +119,7 @@ index 777e8e2..871a7fb 100755 bool done = false; diff --git a/projects/ragamatic/ragamat.cpp b/projects/ragamatic/ragamat.cpp -index b706e2e..dde1be8 100755 +index b706e2e..dde1be8 100644 --- a/projects/ragamatic/ragamat.cpp +++ b/projects/ragamatic/ragamat.cpp @@ -10,7 +10,7 @@ @@ -132,7 +132,7 @@ index b706e2e..dde1be8 100755 #include #include diff --git a/src/Messager.cpp b/src/Messager.cpp -index f94a92c..2279f74 100755 +index fe98573..9e7e98d 100644 --- a/src/Messager.cpp +++ b/src/Messager.cpp @@ -309,7 +309,7 @@ bool Messager :: startSocketInput( int port ) @@ -145,7 +145,7 @@ index f94a92c..2279f74 100755 THREAD_RETURN THREAD_TYPE socketHandler(void *ptr) diff --git a/src/Noise.cpp b/src/Noise.cpp -index c2d013b..66365b5 100755 +index f9e3733..8594c29 100644 --- a/src/Noise.cpp +++ b/src/Noise.cpp @@ -11,7 +11,7 @@ @@ -158,33 +158,39 @@ index c2d013b..66365b5 100755 namespace stk { diff --git a/src/RtAudio.cpp b/src/RtAudio.cpp -index 882fa0e..a995aa7 100755 +index 00d63f0..5361f7b 100644 --- a/src/RtAudio.cpp +++ b/src/RtAudio.cpp -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - - // Static variable definitions. -@@ -8581,11 +8582,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, - - #include - #include --#include - #include - #include --#include --#include -+#include -+#include - - static void *ossCallbackHandler(void * ptr); - +@@ -1,4 +1,4 @@ +-/************************************************************************/ ++/************************************************************************/ + /*! \class RtAudio + \brief Realtime audio i/o C++ classes. + +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include + + // Static variable definitions. +@@ -8677,11 +8678,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 65ff9a5..b46809e 100755 +index 123205d..e9cd342 100644 --- a/src/Stk.cpp +++ b/src/Stk.cpp @@ -51,7 +51,7 @@ @@ -198,4 +204,4 @@ index 65ff9a5..b46809e 100755 -- -tg: (c16cc9e..) t/header (depends on: master) +tg: (4505f17..) t/header (depends on: master) diff --git a/stk.spec b/stk.spec index 6fa5b84..93fb103 100644 --- a/stk.spec +++ b/stk.spec @@ -1,5 +1,5 @@ Name: stk -Version: 4.5.1 +Version: 4.6.0 Release: 1%{?dist} Summary: Synthesis ToolKit in C++ License: MIT @@ -9,8 +9,8 @@ Source0: %{name}-%{version}.stripped.tar.gz # We remove legeally questionable files as well as accidentally packed # object files. Source1: README.fedora -Patch0: stk-4.5.1-header.patch -Patch1: stk-4.5.1-cflags-lib.patch +Patch0: stk-4.6.0-header.patch +Patch1: stk-4.6.0-cflags-lib.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel @@ -64,8 +64,9 @@ autoconf cp -a %{SOURCE1} README.fedora -# remove backup files +# remove backup and other extra files find . -name '*~' -exec rm {} \; +find . -name '._*' -exec rm {} \; %build @@ -176,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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. From d5542deccfc3c0217741974f850bc9c6a09df15c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 12 Sep 2020 18:04:06 +0200 Subject: [PATCH 13/23] Update to 4.6.1. --- README.fedora | 34 +++++++++---------- repack.sh | 2 +- sources | 2 +- ...gs-lib.patch => stk-4.6.1-cflags-lib.patch | 4 +-- ...6.0-header.patch => stk-4.6.1-header.patch | 26 ++++++-------- stk.spec | 9 +++-- 6 files changed, 37 insertions(+), 40 deletions(-) rename stk-4.6.0-cflags-lib.patch => stk-4.6.1-cflags-lib.patch (90%) rename stk-4.6.0-header.patch => stk-4.6.1-header.patch (88%) diff --git a/README.fedora b/README.fedora index f657414..956cd06 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.0/projects/demo/scores/*.ski -stk-4.6.0/projects/eguitar/scores/*.ski -stk-4.6.0/projects/examples/midifiles/*.mid -stk-4.6.0/projects/examples/scores/*.ski -stk-4.6.0/src/include/asio.cpp -stk-4.6.0/src/include/asio.h -stk-4.6.0/src/include/asiodrivers.cpp -stk-4.6.0/src/include/asiodrivers.h -stk-4.6.0/src/include/asiodrvr.h -stk-4.6.0/src/include/asiolist.cpp -stk-4.6.0/src/include/asiolist.h -stk-4.6.0/src/include/asiosys.h -stk-4.6.0/src/include/dsound.h -stk-4.6.0/src/include/iasiodrv.h -stk-4.6.0/src/include/iasiothiscallresolver.cpp -stk-4.6.0/src/include/iasiothiscallresolver.h -stk-4.6.0/src/include/soundcard.h +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 diff --git a/repack.sh b/repack.sh index e4d2dd2..093a9c9 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=4.6.0 +version=4.6.1 src=stk-${version}.tar.gz dst=${src%.tar.gz}.stripped.tar.gz diff --git a/sources b/sources index af831e8..d0a86e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stk-4.6.0.stripped.tar.gz) = 08637140fccdd655d400ae3eaf280060d1b6daa25de7b46018f5cce9f2e57609ff30829cd8b21930b975f20742df40111413a70e358d35f2520700c4cadeca6b +SHA512 (stk-4.6.1.stripped.tar.gz) = 3d016ca9494cabe331e8582d57db369493f6d01e12a00732672218dd4b9d3b59125d4aa407b9c4e0f29908b37952846c4db62d8b36059f8df50255645510d41e diff --git a/stk-4.6.0-cflags-lib.patch b/stk-4.6.1-cflags-lib.patch similarity index 90% rename from stk-4.6.0-cflags-lib.patch rename to stk-4.6.1-cflags-lib.patch index 79bb2aa..69743f0 100644 --- a/stk-4.6.0-cflags-lib.patch +++ b/stk-4.6.1-cflags-lib.patch @@ -6,7 +6,7 @@ Subject: [PATCH] t/cflags-lib 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 80a8a0f..0f59928 100644 +index 80c8c79..1edc256 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ if test "$debug" = "yes"; then @@ -29,4 +29,4 @@ index 80a8a0f..0f59928 100644 if [test $GXX = "yes" ;] then -- -tg: (4505f17..) t/cflags-lib (depends on: master) +tg: (67475d5..) t/cflags-lib (depends on: master) diff --git a/stk-4.6.0-header.patch b/stk-4.6.1-header.patch similarity index 88% rename from stk-4.6.0-header.patch rename to stk-4.6.1-header.patch index bf7c9df..9a6bfd2 100644 --- a/stk-4.6.0-header.patch +++ b/stk-4.6.1-header.patch @@ -12,9 +12,9 @@ Subject: [PATCH] t/header projects/ragamatic/ragamat.cpp | 2 +- src/Messager.cpp | 2 +- src/Noise.cpp | 2 +- - src/RtAudio.cpp | 8 ++++---- + src/RtAudio.cpp | 6 +++--- src/Stk.cpp | 2 +- - 12 files changed, 18 insertions(+), 16 deletions(-) + 12 files changed, 17 insertions(+), 15 deletions(-) diff --git a/projects/demo/Md2Skini.cpp b/projects/demo/Md2Skini.cpp index dc32e4b..a5848da 100644 @@ -55,7 +55,7 @@ index c877b4a..52f8ae9 100644 #include #include diff --git a/projects/demo/utilities.cpp b/projects/demo/utilities.cpp -index 7013396..bb5fdd9 100644 +index 9d4fd78..202d11b 100644 --- a/projects/demo/utilities.cpp +++ b/projects/demo/utilities.cpp @@ -2,6 +2,7 @@ @@ -132,7 +132,7 @@ index b706e2e..dde1be8 100644 #include #include diff --git a/src/Messager.cpp b/src/Messager.cpp -index fe98573..9e7e98d 100644 +index 3c0cbb0..3ed9135 100644 --- a/src/Messager.cpp +++ b/src/Messager.cpp @@ -309,7 +309,7 @@ bool Messager :: startSocketInput( int port ) @@ -145,7 +145,7 @@ index fe98573..9e7e98d 100644 THREAD_RETURN THREAD_TYPE socketHandler(void *ptr) diff --git a/src/Noise.cpp b/src/Noise.cpp -index f9e3733..8594c29 100644 +index 1fb8c93..0201c87 100644 --- a/src/Noise.cpp +++ b/src/Noise.cpp @@ -11,7 +11,7 @@ @@ -158,16 +158,10 @@ index f9e3733..8594c29 100644 namespace stk { diff --git a/src/RtAudio.cpp b/src/RtAudio.cpp -index 00d63f0..5361f7b 100644 +index 0837d98..2bf5313 100644 --- a/src/RtAudio.cpp +++ b/src/RtAudio.cpp -@@ -1,4 +1,4 @@ --/************************************************************************/ -+/************************************************************************/ - /*! \class RtAudio - \brief Realtime audio i/o C++ classes. - -@@ -46,6 +46,7 @@ +@@ -47,6 +47,7 @@ #include #include #include @@ -175,7 +169,7 @@ index 00d63f0..5361f7b 100644 #include // Static variable definitions. -@@ -8677,11 +8678,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, +@@ -8963,11 +8964,10 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, #include #include @@ -190,7 +184,7 @@ index 00d63f0..5361f7b 100644 static void *ossCallbackHandler(void * ptr); diff --git a/src/Stk.cpp b/src/Stk.cpp -index 123205d..e9cd342 100644 +index 8126285..d6e51c8 100644 --- a/src/Stk.cpp +++ b/src/Stk.cpp @@ -51,7 +51,7 @@ @@ -204,4 +198,4 @@ index 123205d..e9cd342 100644 -- -tg: (4505f17..) t/header (depends on: master) +tg: (67475d5..) t/header (depends on: master) diff --git a/stk.spec b/stk.spec index 93fb103..4594d91 100644 --- a/stk.spec +++ b/stk.spec @@ -1,5 +1,5 @@ Name: stk -Version: 4.6.0 +Version: 4.6.1 Release: 1%{?dist} Summary: Synthesis ToolKit in C++ License: MIT @@ -9,8 +9,8 @@ Source0: %{name}-%{version}.stripped.tar.gz # We remove legeally questionable files as well as accidentally packed # object files. Source1: README.fedora -Patch0: stk-4.6.0-header.patch -Patch1: stk-4.6.0-cflags-lib.patch +Patch0: stk-4.6.1-header.patch +Patch1: stk-4.6.1-cflags-lib.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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. From 91f1658f4cdba84009bf804c2451c3e45f4aae9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:05:59 +0000 Subject: [PATCH 14/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 4594d91..3c74de0 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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. From b426b265143de3a459bee5381e6adab279e03ade Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:20:30 +0000 Subject: [PATCH 15/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 3c74de0..26d3017 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From ced1776018278bb62b14fd88a2f2b06703d24e25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:43:26 +0000 Subject: [PATCH 16/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 26d3017..5032c2c 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 3b4858c0d5b42afb70933f4f6230d594099f7183 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:28:56 +0000 Subject: [PATCH 17/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 5032c2c..3725572 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From ff32bd9361085095b294117421bf258979146e5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:07:21 +0000 Subject: [PATCH 18/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 3725572..4d44450 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From c74542e8780f00aec911044dc436604bcbd87a63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:35:00 +0000 Subject: [PATCH 19/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 4d44450..748a2c5 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From b998e46e3c8ad026ef6d9f35a196a9e7c180b85c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:27:13 +0000 Subject: [PATCH 20/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 748a2c5..f204e47 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 0dad74bbeb6576f4877f4a9959deb011b99420ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:30:42 +0000 Subject: [PATCH 21/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index f204e47..141784e 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 3a51c53afb87a162499bd3f3db4e78865bae4844 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:44:13 +0000 Subject: [PATCH 22/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 141784e..7b8464c 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ chmod -R u=rwX,go=rX %{buildroot} %changelog +* 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 From 806626890585f97ba8c19f263b16212309162500 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:46:46 +0000 Subject: [PATCH 23/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- stk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stk.spec b/stk.spec index 7b8464c..7bd3788 100644 --- a/stk.spec +++ b/stk.spec @@ -1,6 +1,6 @@ Name: stk Version: 4.6.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Synthesis ToolKit in C++ License: MIT URL: https://ccrma.stanford.edu/software/stk/ @@ -177,6 +177,9 @@ 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