[SCM] stk/master: Don't compile local copies of rt{audio, midi} objects, link against the system-wide ones instead.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Jan 22 15:33:15 UTC 2012
The following commit has been merged in the master branch:
commit 7458b68b746db58dcb3b55ffa9e539c9ba5c7ab7
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Jan 22 16:32:35 2012 +0100
Don't compile local copies of rt{audio,midi} objects, link against the system-wide ones instead.
diff --git a/debian/control b/debian/control
index 7538af3..78275ed 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Build-Depends:
debhelper (>= 7.0.50~),
libasound2-dev [linux-any],
libjack-dev [linux-any],
- libreadline-dev
+ libreadline-dev,
+ librtaudio-dev [linux-any],
+ librtmidi-dev [linux-any]
Standards-Version: 3.9.2
Homepage: http://ccrma.stanford.edu/software/stk/
Vcs-Git: git://git.debian.org/pkg-multimedia/stk.git
diff --git a/debian/patches/03-system_rtaudio_rtmidi.patch b/debian/patches/03-system_rtaudio_rtmidi.patch
new file mode 100644
index 0000000..5d50bf0
--- /dev/null
+++ b/debian/patches/03-system_rtaudio_rtmidi.patch
@@ -0,0 +1,161 @@
+Description: Link against system's shared copies of rtaudio and rtmidi.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ projects/demo/Makefile.in | 3 +-
+ projects/effects/Makefile.in | 3 +-
+ projects/examples/Makefile.in | 52 ++++++++++++++++++++---------------------
+ projects/ragamatic/Makefile.in | 3 +-
+ src/Makefile.in | 3 +-
+ 5 files changed, 34 insertions(+), 30 deletions(-)
+
+--- stk.orig/src/Makefile.in 2012-01-22 16:21:02.548386269 +0100
++++ stk/src/Makefile.in 2012-01-22 16:21:02.644386758 +0100
+@@ -49,7 +49,8 @@
+
+ REALTIME = @realtime@
+ ifeq ($(REALTIME),yes)
+- OBJECTS += RtMidi.o RtAudio.o RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
++ OBJECTS += RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
++ LIBS += -lrtaudio -lrtmidi
+ endif
+
+ RAWWAVES = @rawwaves@
+--- stk.orig/projects/demo/Makefile.in 2012-01-22 16:21:02.548386269 +0100
++++ stk/projects/demo/Makefile.in 2012-01-22 16:21:02.648386772 +0100
+@@ -40,7 +40,8 @@
+ REALTIME = @realtime@
+ ifeq ($(REALTIME),yes)
+ PROGRAMS += demo
+- OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
++ OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
++ LIBRARY += -lrtaudio -lrtmidi
+ endif
+
+ RAWWAVES = @rawwaves@
+--- stk.orig/projects/examples/Makefile.in 2012-01-22 16:20:58.512366257 +0100
++++ stk/projects/examples/Makefile.in 2012-01-22 16:21:02.648386772 +0100
+@@ -52,26 +52,26 @@
+ strip :
+ strip $(PROGRAMS)
+
+-audioprobe: RtAudio.o @objects@
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++audioprobe: @objects@
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY) -lrtaudio
+
+-midiprobe: RtMidi.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
++midiprobe:
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(LIBRARY) -lrtmidi
+
+-play: play.cpp Stk.o FileRead.o FileWvIn.o RtAudio.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o play play.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++play: play.cpp Stk.o FileRead.o FileWvIn.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o play play.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(LIBRARY) -lrtaudio
+
+-record: record.cpp Stk.o FileWrite.o FileWvOut.o RtWvIn.o RtAudio.o Mutex.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/RtWvIn.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++record: record.cpp Stk.o FileWrite.o FileWvOut.o RtWvIn.o Mutex.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/RtWvIn.o $(OBJECT_PATH)/Mutex.o $(LIBRARY) -lrtaudio
+
+ sine: sine.cpp Stk.o SineWave.o FileWrite.o FileWvOut.o
+ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sine sine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
+
+-duplex: duplex.cpp RtAudio.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++duplex: duplex.cpp
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(LIBRARY) -lrtaudio
+
+-inetIn: inetIn.cpp Stk.o InetWvIn.o RtWvOut.o RtAudio.o Socket.o TcpServer.o UdpSocket.o Thread.o Mutex.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/InetWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++inetIn: inetIn.cpp Stk.o InetWvIn.o RtWvOut.o Socket.o TcpServer.o UdpSocket.o Thread.o Mutex.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/InetWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtWvOut.o $(LIBRARY) -lrtaudio
+
+ inetOut: inetOut.cpp Stk.o FileRead.o FileWvIn.o InetWvOut.o Socket.o TcpClient.o UdpSocket.o Thread.o Mutex.o
+ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpClient.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/InetWvOut.o $(LIBRARY)
+@@ -79,26 +79,26 @@
+ sineosc: sineosc.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FileWrite.o FileWvOut.o
+ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/FileLoop.o $(LIBRARY)
+
+-rtsine: rtsine.cpp Stk.o SineWave.o RtWvOut.o RtAudio.o Mutex.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Mutex.o $(LIBRARY)
++rtsine: rtsine.cpp Stk.o SineWave.o RtWvOut.o Mutex.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/Mutex.o $(LIBRARY) -lrtaudio
+
+-crtsine: crtsine.cpp Stk.o SineWave.o RtAudio.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++crtsine: crtsine.cpp Stk.o SineWave.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(LIBRARY) -lrtaudio
+
+-bethree: bethree.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o RtAudio.o TwoZero.o SineWave.o ADSR.o BeeThree.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o bethree bethree.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(LIBRARY)
++bethree: bethree.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o TwoZero.o SineWave.o ADSR.o BeeThree.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o bethree bethree.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(LIBRARY) -lrtaudio
+
+-controlbee: controlbee.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o RtAudio.o TwoZero.o SineWave.o ADSR.o BeeThree.o Messager.o RtMidi.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/RtMidi.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(LIBRARY)
++controlbee: controlbee.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o TwoZero.o SineWave.o ADSR.o BeeThree.o Messager.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(LIBRARY) -lrtaudio -lrtmidi
+
+ foursine: foursine.cpp Stk.o SineWave.o FileWrite.o FileWvOut.o
+ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o foursine foursine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
+
+-threebees: threebees.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o RtAudio.o TwoZero.o SineWave.o ADSR.o BeeThree.o Messager.o RtMidi.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o Voicer.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o threebees threebees.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/RtMidi.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(OBJECT_PATH)/Voicer.o $(LIBRARY)
++threebees: threebees.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o TwoZero.o SineWave.o ADSR.o BeeThree.o Messager.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o Voicer.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o threebees threebees.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(OBJECT_PATH)/Voicer.o $(LIBRARY) -lrtaudio -lrtmidi
+
+-playsmf: playsmf.cpp Stk.o MidiFileIn.o RtMidi.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/MidiFileIn.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
++playsmf: playsmf.cpp Stk.o MidiFileIn.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/MidiFileIn.o $(LIBRARY) -lrtmidi
+
+-grains: grains.cpp Stk.o Granulate.o Noise.o FileRead.o RtAudio.o
+- $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++grains: grains.cpp Stk.o Granulate.o Noise.o FileRead.o
++ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(LIBRARY) -lrtaudio
+--- stk.orig/projects/effects/Makefile.in 2012-01-22 16:20:58.548366446 +0100
++++ stk/projects/effects/Makefile.in 2012-01-22 16:21:02.652386786 +0100
+@@ -29,7 +29,8 @@
+ REALTIME = @realtime@
+ ifeq ($(REALTIME),yes)
+ PROGRAMS += effects
+- OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
++ OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
++ LIBRARY += -lrtaudio -lrtmidi
+ endif
+
+ RAWWAVES = @rawwaves@
+--- stk.orig/projects/ragamatic/Makefile.in 2012-01-22 16:20:58.476366076 +0100
++++ stk/projects/ragamatic/Makefile.in 2012-01-22 16:21:02.652386786 +0100
+@@ -30,7 +30,8 @@
+ REALTIME = @realtime@
+ ifeq ($(REALTIME),yes)
+ PROGRAMS = ragamat
+- OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
++ OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
++ LIBRARY += -lrtaudio -lrtmidi
+ endif
+
+ RAWWAVES = @rawwaves@
+--- stk.orig/projects/examples/libMakefile.in 2012-01-22 16:24:23.261381555 +0100
++++ stk/projects/examples/libMakefile.in 2012-01-22 16:25:16.525645676 +0100
+@@ -19,6 +19,7 @@
+ REALTIME = @realtime@
+ ifeq ($(REALTIME),yes)
+ PROGRAMS += audioprobe midiprobe duplex play record inetIn inetOut rtsine crtsine bethree controlbee threebees playsmf grains
++ LIBRARY += -lrtaudio -lrtmidi
+ endif
+
+ RAWWAVES = @rawwaves@
+--- stk.orig/projects/examples/libMakefile 2012-01-22 16:25:45.221787974 +0100
++++ stk/projects/examples/libMakefile 2012-01-22 16:26:16.157941376 +0100
+@@ -19,6 +19,7 @@
+ REALTIME = yes
+ ifeq ($(REALTIME),yes)
+ PROGRAMS += audioprobe midiprobe duplex play record inetIn inetOut rtsine crtsine bethree controlbee threebees playsmf grains
++ LIBRARY += -lrtaudio -lrtmidi
+ endif
+
+ RAWWAVES =
diff --git a/debian/patches/series b/debian/patches/series
index 8a5fca4..40121de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-makefile.patch
02-realtime.patch
+03-system_rtaudio_rtmidi.patch
--
stk packaging
More information about the pkg-multimedia-commits
mailing list