rpms/stk/devel import.log, 1.1, 1.2 stk-4.3.1-header.patch, 1.1, 1.2 stk.spec, 1.2, 1.3
Thomas Moschny
thm at fedoraproject.org
Tue Feb 3 18:28:26 UTC 2009
Author: thm
Update of /cvs/pkgs/rpms/stk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16152/devel
Modified Files:
import.log stk-4.3.1-header.patch stk.spec
Log Message:
Update header patch for gcc 4.4.0.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/stk/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 19 Sep 2008 10:06:09 -0000 1.1
+++ import.log 3 Feb 2009 18:27:56 -0000 1.2
@@ -1 +1,2 @@
stk-4_3_1-6_fc9:HEAD:stk-4.3.1-6.fc9.src.rpm:1221818741
+stk-4_3_1-8_fc10:HEAD:stk-4.3.1-8.fc10.src.rpm:1233685612
stk-4.3.1-header.patch:
Index: stk-4.3.1-header.patch
===================================================================
RCS file: /cvs/pkgs/rpms/stk/devel/stk-4.3.1-header.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stk-4.3.1-header.patch 19 Sep 2008 10:06:09 -0000 1.1
+++ stk-4.3.1-header.patch 3 Feb 2009 18:27:56 -0000 1.2
@@ -1,5 +1,22 @@
---- stk-4.3.1.orig/projects/effects/effects.cpp 2007-12-07 07:25:42.000000000 +0100
-+++ stk-4.3.1/projects/effects/effects.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/projects/demo/Md2Skini.cpp.orig stk-4.3.1/projects/demo/Md2Skini.cpp
+--- stk-4.3.1/projects/demo/Md2Skini.cpp.orig 2007-12-06 01:58:33.000000000 +0100
++++ stk-4.3.1/projects/demo/Md2Skini.cpp 2009-02-03 18:47:11.000000000 +0100
+@@ -12,9 +12,10 @@
+
+ #include "RtMidi.h"
+ #include "SKINI.msg"
+-#include <stdio.h>
++#include <cstdlib>
+ #include <iostream>
+-#include <string>
++#include <cstring>
++#include <cstdio>
+
+ void usage(void) {
+ std::cout << "\nuseage: Md2Skini <flag(s)>\n\n";
+diff -up stk-4.3.1/projects/effects/effects.cpp.orig stk-4.3.1/projects/effects/effects.cpp
+--- stk-4.3.1/projects/effects/effects.cpp.orig 2007-12-07 07:25:42.000000000 +0100
++++ stk-4.3.1/projects/effects/effects.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -15,6 +15,7 @@
#include <signal.h>
#include <iostream>
@@ -8,8 +25,9 @@
using std::min;
void usage(void) {
---- stk-4.3.1.orig/projects/examples/duplex.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/duplex.cpp 2008-06-16 23:56:00.000000000 +0200
+diff -up stk-4.3.1/projects/examples/duplex.cpp.orig stk-4.3.1/projects/examples/duplex.cpp
+--- stk-4.3.1/projects/examples/duplex.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/duplex.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -10,6 +10,8 @@
#include "RtAudio.h"
@@ -19,8 +37,9 @@
/*
typedef signed long MY_TYPE;
---- stk-4.3.1.orig/projects/examples/foursine.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/foursine.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/projects/examples/foursine.cpp.orig stk-4.3.1/projects/examples/foursine.cpp
+--- stk-4.3.1/projects/examples/foursine.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/foursine.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -2,6 +2,7 @@
#include "SineWave.h"
@@ -29,8 +48,9 @@
int main()
{
---- stk-4.3.1.orig/projects/examples/grains.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/grains.cpp 2008-06-16 23:57:46.000000000 +0200
+diff -up stk-4.3.1/projects/examples/grains.cpp.orig stk-4.3.1/projects/examples/grains.cpp
+--- stk-4.3.1/projects/examples/grains.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/grains.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -4,6 +4,7 @@
#include "Granulate.h"
@@ -39,8 +59,9 @@
// This tick() function handles sample computation only. It will be
// called automatically when the system needs a new buffer of audio
---- stk-4.3.1.orig/projects/examples/inetIn.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/inetIn.cpp 2008-06-16 23:56:18.000000000 +0200
+diff -up stk-4.3.1/projects/examples/inetIn.cpp.orig stk-4.3.1/projects/examples/inetIn.cpp
+--- stk-4.3.1/projects/examples/inetIn.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/inetIn.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -30,6 +30,7 @@
#include "InetWvIn.h"
@@ -49,8 +70,9 @@
void usage(void) {
// Error function in case of incorrect command-line
---- stk-4.3.1.orig/projects/examples/inetOut.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/inetOut.cpp 2008-06-16 23:56:33.000000000 +0200
+diff -up stk-4.3.1/projects/examples/inetOut.cpp.orig stk-4.3.1/projects/examples/inetOut.cpp
+--- stk-4.3.1/projects/examples/inetOut.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/inetOut.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -19,6 +19,7 @@
#include "FileWvIn.h"
@@ -59,8 +81,9 @@
void usage(void) {
// Error function in case of incorrect command-line
---- stk-4.3.1.orig/projects/examples/midiprobe.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/midiprobe.cpp 2008-06-16 23:55:29.000000000 +0200
+diff -up stk-4.3.1/projects/examples/midiprobe.cpp.orig stk-4.3.1/projects/examples/midiprobe.cpp
+--- stk-4.3.1/projects/examples/midiprobe.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/midiprobe.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -6,6 +6,7 @@
#include <iostream>
@@ -69,8 +92,9 @@
int main()
{
---- stk-4.3.1.orig/projects/examples/play.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/play.cpp 2008-06-16 23:54:54.000000000 +0200
+diff -up stk-4.3.1/projects/examples/play.cpp.orig stk-4.3.1/projects/examples/play.cpp
+--- stk-4.3.1/projects/examples/play.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/play.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -18,6 +18,7 @@
#include <signal.h>
@@ -79,8 +103,9 @@
// Eewww ... global variables! :-)
bool done;
---- stk-4.3.1.orig/projects/examples/playsmf.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/playsmf.cpp 2008-06-16 23:57:25.000000000 +0200
+diff -up stk-4.3.1/projects/examples/playsmf.cpp.orig stk-4.3.1/projects/examples/playsmf.cpp
+--- stk-4.3.1/projects/examples/playsmf.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/playsmf.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -7,7 +7,8 @@
#include "MidiFileIn.h"
@@ -91,8 +116,9 @@
bool done = false;
static void finish(int ignore){ done = true; }
---- stk-4.3.1.orig/projects/examples/record.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/record.cpp 2008-06-16 23:55:10.000000000 +0200
+diff -up stk-4.3.1/projects/examples/record.cpp.orig stk-4.3.1/projects/examples/record.cpp
+--- stk-4.3.1/projects/examples/record.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/record.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -24,6 +24,7 @@
#include "RtWvIn.h"
@@ -101,8 +127,9 @@
void usage( void ) {
// Error function in case of incorrect command-line
---- stk-4.3.1.orig/projects/examples/rtsine.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/rtsine.cpp 2008-06-16 23:53:54.000000000 +0200
+diff -up stk-4.3.1/projects/examples/rtsine.cpp.orig stk-4.3.1/projects/examples/rtsine.cpp
+--- stk-4.3.1/projects/examples/rtsine.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/rtsine.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -2,6 +2,7 @@
#include "SineWave.h"
@@ -111,8 +138,9 @@
int main()
{
---- stk-4.3.1.orig/projects/examples/sine.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/sine.cpp 2008-06-16 23:54:20.000000000 +0200
+diff -up stk-4.3.1/projects/examples/sine.cpp.orig stk-4.3.1/projects/examples/sine.cpp
+--- stk-4.3.1/projects/examples/sine.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/sine.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -14,6 +14,7 @@
#include "SineWave.h"
@@ -121,8 +149,9 @@
void usage(void) {
// Error function in case of incorrect command-line
---- stk-4.3.1.orig/projects/examples/sineosc.cpp 2007-12-06 01:58:34.000000000 +0100
-+++ stk-4.3.1/projects/examples/sineosc.cpp 2008-06-16 23:54:38.000000000 +0200
+diff -up stk-4.3.1/projects/examples/sineosc.cpp.orig stk-4.3.1/projects/examples/sineosc.cpp
+--- stk-4.3.1/projects/examples/sineosc.cpp.orig 2007-12-06 01:58:34.000000000 +0100
++++ stk-4.3.1/projects/examples/sineosc.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -2,6 +2,7 @@
#include "WaveLoop.h"
@@ -131,8 +160,9 @@
int main()
{
---- stk-4.3.1.orig/projects/ragamatic/ragamat.cpp 2007-12-07 07:25:42.000000000 +0100
-+++ stk-4.3.1/projects/ragamatic/ragamat.cpp 2008-06-16 23:59:13.000000000 +0200
+diff -up stk-4.3.1/projects/ragamatic/ragamat.cpp.orig stk-4.3.1/projects/ragamatic/ragamat.cpp
+--- stk-4.3.1/projects/ragamatic/ragamat.cpp.orig 2007-12-07 07:25:42.000000000 +0100
++++ stk-4.3.1/projects/ragamatic/ragamat.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -10,9 +10,11 @@
#include "Messager.h"
#include "RtAudio.h"
@@ -146,28 +176,33 @@
using std::min;
StkFloat float_random(StkFloat max) // Return random float between 0.0 and max
---- stk-4.3.1.orig/src/FileRead.cpp 2007-12-06 01:58:27.000000000 +0100
-+++ stk-4.3.1/src/FileRead.cpp 2008-06-16 23:52:34.000000000 +0200
-@@ -33,6 +33,7 @@
+diff -up stk-4.3.1/src/FileRead.cpp.orig stk-4.3.1/src/FileRead.cpp
+--- stk-4.3.1/src/FileRead.cpp.orig 2007-12-06 01:58:27.000000000 +0100
++++ stk-4.3.1/src/FileRead.cpp 2009-02-03 18:45:26.000000000 +0100
+@@ -33,6 +33,8 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <cmath>
+#include <cstring>
++#include <cstdio>
FileRead :: FileRead()
: fd_(0)
---- stk-4.3.1.orig/src/FileWrite.cpp 2007-12-06 01:58:27.000000000 +0100
-+++ stk-4.3.1/src/FileWrite.cpp 2008-06-16 23:52:34.000000000 +0200
-@@ -23,6 +23,7 @@
+diff -up stk-4.3.1/src/FileWrite.cpp.orig stk-4.3.1/src/FileWrite.cpp
+--- stk-4.3.1/src/FileWrite.cpp.orig 2007-12-06 01:58:27.000000000 +0100
++++ stk-4.3.1/src/FileWrite.cpp 2009-02-03 18:45:26.000000000 +0100
+@@ -23,6 +23,8 @@
#include "FileWrite.h"
#include <cmath>
+#include <cstring>
++#include <cstdio>
const FileWrite::FILE_TYPE FileWrite :: FILE_RAW = 1;
const FileWrite::FILE_TYPE FileWrite :: FILE_WAV = 2;
---- stk-4.3.1.orig/src/Messager.cpp 2007-12-06 01:58:27.000000000 +0100
-+++ stk-4.3.1/src/Messager.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/Messager.cpp.orig stk-4.3.1/src/Messager.cpp
+--- stk-4.3.1/src/Messager.cpp.orig 2007-12-06 01:58:27.000000000 +0100
++++ stk-4.3.1/src/Messager.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -34,6 +34,7 @@
#include "Messager.h"
@@ -176,8 +211,9 @@
#include "SKINI.msg"
static const int STK_FILE = 0x1;
---- stk-4.3.1.orig/src/MidiFileIn.cpp 2007-12-06 01:58:27.000000000 +0100
-+++ stk-4.3.1/src/MidiFileIn.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/MidiFileIn.cpp.orig stk-4.3.1/src/MidiFileIn.cpp
+--- stk-4.3.1/src/MidiFileIn.cpp.orig 2007-12-06 01:58:27.000000000 +0100
++++ stk-4.3.1/src/MidiFileIn.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -17,6 +17,7 @@
#include "MidiFileIn.h"
@@ -186,8 +222,9 @@
MidiFileIn :: MidiFileIn( std::string fileName )
{
---- stk-4.3.1.orig/src/Modal.cpp 2007-12-06 01:58:27.000000000 +0100
-+++ stk-4.3.1/src/Modal.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/Modal.cpp.orig stk-4.3.1/src/Modal.cpp
+--- stk-4.3.1/src/Modal.cpp.orig 2007-12-06 01:58:27.000000000 +0100
++++ stk-4.3.1/src/Modal.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -12,6 +12,7 @@
/***************************************************/
@@ -196,20 +233,23 @@
Modal :: Modal(unsigned int modes)
: nModes_(modes)
---- stk-4.3.1.orig/src/RtAudio.cpp 2007-12-07 09:04:43.000000000 +0100
-+++ stk-4.3.1/src/RtAudio.cpp 2008-06-16 23:52:34.000000000 +0200
-@@ -42,6 +42,9 @@
+diff -up stk-4.3.1/src/RtAudio.cpp.orig stk-4.3.1/src/RtAudio.cpp
+--- stk-4.3.1/src/RtAudio.cpp.orig 2007-12-07 09:04:43.000000000 +0100
++++ stk-4.3.1/src/RtAudio.cpp 2009-02-03 18:45:26.000000000 +0100
+@@ -42,6 +42,10 @@
#include "RtAudio.h"
#include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
++#include <cstdio>
// Static variable definitions.
const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
---- stk-4.3.1.orig/src/Shakers.cpp 2007-12-06 01:58:26.000000000 +0100
-+++ stk-4.3.1/src/Shakers.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/Shakers.cpp.orig stk-4.3.1/src/Shakers.cpp
+--- stk-4.3.1/src/Shakers.cpp.orig 2007-12-06 01:58:26.000000000 +0100
++++ stk-4.3.1/src/Shakers.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -54,6 +54,8 @@
#include "Stk.h"
@@ -219,8 +259,9 @@
int my_random(int max) // Return Random Int Between 0 and max
{
---- stk-4.3.1.orig/src/Skini.cpp 2007-12-06 01:58:26.000000000 +0100
-+++ stk-4.3.1/src/Skini.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/Skini.cpp.orig stk-4.3.1/src/Skini.cpp
+--- stk-4.3.1/src/Skini.cpp.orig 2007-12-06 01:58:26.000000000 +0100
++++ stk-4.3.1/src/Skini.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -25,6 +25,7 @@
#include "Skini.h"
@@ -229,8 +270,9 @@
Skini :: Skini()
{
---- stk-4.3.1.orig/src/Stk.cpp 2007-12-06 01:58:28.000000000 +0100
-+++ stk-4.3.1/src/Stk.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/Stk.cpp.orig stk-4.3.1/src/Stk.cpp
+--- stk-4.3.1/src/Stk.cpp.orig 2007-12-06 01:58:28.000000000 +0100
++++ stk-4.3.1/src/Stk.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -51,6 +51,7 @@
/***************************************************/
@@ -239,8 +281,9 @@
StkFloat Stk :: srate_ = (StkFloat) SRATE;
std::string Stk :: rawwavepath_ = RAWWAVE_PATH;
---- stk-4.3.1.orig/src/TcpClient.cpp 2007-12-06 01:58:26.000000000 +0100
-+++ stk-4.3.1/src/TcpClient.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/TcpClient.cpp.orig stk-4.3.1/src/TcpClient.cpp
+--- stk-4.3.1/src/TcpClient.cpp.orig 2007-12-06 01:58:26.000000000 +0100
++++ stk-4.3.1/src/TcpClient.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -24,6 +24,7 @@
/***************************************************/
@@ -249,8 +292,9 @@
TcpClient :: TcpClient(int port, std::string hostname )
{
---- stk-4.3.1.orig/src/UdpSocket.cpp 2007-12-06 01:58:26.000000000 +0100
-+++ stk-4.3.1/src/UdpSocket.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/UdpSocket.cpp.orig stk-4.3.1/src/UdpSocket.cpp
+--- stk-4.3.1/src/UdpSocket.cpp.orig 2007-12-06 01:58:26.000000000 +0100
++++ stk-4.3.1/src/UdpSocket.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -22,6 +22,7 @@
/***************************************************/
@@ -259,8 +303,9 @@
UdpSocket :: UdpSocket(int port )
{
---- stk-4.3.1.orig/src/VoicForm.cpp 2007-12-06 01:58:26.000000000 +0100
-+++ stk-4.3.1/src/VoicForm.cpp 2008-06-16 23:52:34.000000000 +0200
+diff -up stk-4.3.1/src/VoicForm.cpp.orig stk-4.3.1/src/VoicForm.cpp
+--- stk-4.3.1/src/VoicForm.cpp.orig 2007-12-06 01:58:26.000000000 +0100
++++ stk-4.3.1/src/VoicForm.cpp 2009-02-03 18:45:26.000000000 +0100
@@ -30,6 +30,7 @@
#include "SKINI.msg"
@@ -269,15 +314,3 @@
VoicForm :: VoicForm() : Instrmnt()
{
-diff -up stk-4.3.1/projects/demo/Md2Skini.cpp.orig stk-4.3.1/projects/demo/Md2Skini.cpp
---- stk-4.3.1/projects/demo/Md2Skini.cpp.orig 2007-12-06 01:58:33.000000000 +0100
-+++ stk-4.3.1/projects/demo/Md2Skini.cpp 2008-08-07 20:45:08.000000000 +0200
-@@ -12,7 +12,7 @@
-
- #include "RtMidi.h"
- #include "SKINI.msg"
--#include <stdio.h>
-+#include <cstdlib>
- #include <iostream>
- #include <string>
-
Index: stk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stk/devel/stk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stk.spec 1 Dec 2008 19:58:17 -0000 1.2
+++ stk.spec 3 Feb 2009 18:27:56 -0000 1.3
@@ -1,6 +1,6 @@
Name: stk
Version: 4.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Synthesis ToolKit in C++
Group: System Environment/Libraries
License: MIT
@@ -185,6 +185,10 @@
%changelog
+* Tue Feb 3 2009 Thomas Moschny <thomas.moschny at gmx.de> - 4.3.1-8
+- Update header patch: Add more missing includes. Should fix
+ compilation with gcc 4.4.0.
+
* Mon Dec 1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 4.3.1-7
- Include /usr/share/stk directory in main package.
More information about the scm-commits
mailing list