[proaudio] [1282] more work on stk sanitizing, update lmms with alexis'

[proaudio] [1282] more work on stk sanitizing, update lmms with alexis' changes

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [1282] more work on stk sanitizing, update lmms with alexis' changes
From: subversion@xxxxxxxxxxxxx
Date: Fri, 08 Aug 2008 17:10:51 +0200

Revision: 1282
Author:   gimpel
Date:     2008-08-08 17:10:51 +0200 (Fri, 08 Aug 2008)

Log Message:
-----------
more work on stk sanitizing, update lmms with alexis' changes

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/stk/ChangeLog
    trunk/overlays/proaudio/media-libs/stk/Manifest
    trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild
    trunk/overlays/proaudio/media-sound/lmms/Manifest
    trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/stk/files/stk-4.3.1-ldflags.patch

Modified: trunk/overlays/proaudio/media-libs/stk/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/stk/ChangeLog	2008-08-08 11:25:39 UTC (rev 1281)
+++ trunk/overlays/proaudio/media-libs/stk/ChangeLog	2008-08-08 15:10:51 UTC (rev 1282)
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Aug 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+  +files/stk-4.3.1-ldflags.patch, stk-4.3.1.ebuild:
+  moved to media-libs
+
   16 Jul 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
   +files/stk-4.3.1-cflags-lib.patch, +files/stk-4.3.1-fpic.patch,
   +files/stk-4.3.1-gcc43.patch, +files/stk-4.3.1-missing.patch,

Modified: trunk/overlays/proaudio/media-libs/stk/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/stk/Manifest	2008-08-08 11:25:39 UTC (rev 1281)
+++ trunk/overlays/proaudio/media-libs/stk/Manifest	2008-08-08 15:10:51 UTC (rev 1282)
@@ -1,8 +1,9 @@
 AUX stk-4.3.1-cflags-lib.patch 1687 RMD160 d81cc35b588f48b3fc0b624efe2871134956c81e SHA1 9176b2a49e45a21d247b184e53ec7a8d1f7aecd4 SHA256 ae1a1bca7d4f4ba0f94e61ef52c525b024e684f1ab4df701f5265b24c0644d92
 AUX stk-4.3.1-fpic.patch 1327 RMD160 f8bb978968cd194e80cb099fb33bd479dcea7fb0 SHA1 86858582fb8d235d0aaa16fc29e0d7c88255be2f SHA256 d1215c76d362298c530dfcd1e0ca3a3b4c19a9b84c60129549919cea2f9c0e95
 AUX stk-4.3.1-gcc43.patch 8066 RMD160 db8cbe250fc36f3855c22a7449e0b90b29e2e372 SHA1 265a9f591b86fcc55e17c625bba82232a79cbf40 SHA256 ddd36ac2a288d363d57ec1960ec9be68f01282131dd7b90b3be2d2e124274d43
+AUX stk-4.3.1-ldflags.patch 14109 RMD160 53aac79e1acd8072436abc226a1a785824a4150e SHA1 c3aa6b7319bdd1ade81ad4514ccfe756c034428d SHA256 b6471df0ffbefbb71e184f84da9df2e7d6647261907d338dab18edcd7efadc18
 AUX stk-4.3.1-missing.patch 184 RMD160 7934473e75e5dfb7a7abbaba321b0ac24d6ad485 SHA1 306fdf8dbe2f265dfc3a983d851c26915ecac413 SHA256 413f49d39320c4c5af3da6c45f2927fc75eac101cd64c8d0fcc1a054907ed3cb
 DIST stk-4.3.1.tar.gz 1952667 RMD160 f0cde3c13af08f4ae58174272bfd09df6f00fec1 SHA1 56922c001f9fc8f7c5cefe5f0c2e64ffa273dffe SHA256 e87fae4fe4e4681185afb752f5ce90cf8fcf16600a0c76d025a3f638be32cee0
-EBUILD stk-4.3.1.ebuild 1966 RMD160 83fecac509753534dfb1014b8721b245130d72dc SHA1 9231f211d0625a0d71d335788a144b6666101010 SHA256 8f17c51826995fa77d13d5d5f81af06f5746fd08ae511da327a82f37edf75723
-MISC ChangeLog 446 RMD160 5c2005e3c70d6e64a157e843d898e42da8a4ce63 SHA1 34353031aa640176fd3e8909f3cb27b100cd58d4 SHA256 12b0f53dbc8c179ba46f27436f461372fd06b72eedfaf4f2612043827d619dfa
+EBUILD stk-4.3.1.ebuild 2978 RMD160 bd35afc2c82de64ceb0f46eec4425edce9c591ad SHA1 ac7188afc0b970ea250a643cfeea82060d365357 SHA256 2a8cf19e13a0f953bfb97b91e2ba8f52b589f49ac3cbf1a2d165d97ad6d30c68
+MISC ChangeLog 576 RMD160 69bec011642b5edf607ce573ba1b2d3e88265e80 SHA1 5b0bcbc98e693fa282a8f68666614c0c2a9fb9ef SHA256 d5e4384ff0c61c3d5b3c3ad4cb38f705dd05c71dcf3adb78b9f30db0ea5a92ae
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-libs/stk/files/stk-4.3.1-ldflags.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/stk/files/stk-4.3.1-ldflags.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/stk/files/stk-4.3.1-ldflags.patch	2008-08-08 15:10:51 UTC (rev 1282)
@@ -0,0 +1,146 @@
+Index: stk-4.3.1/projects/demo/Makefile.in
+===================================================================
+--- stk-4.3.1.orig/projects/demo/Makefile.in
++++ stk-4.3.1/projects/demo/Makefile.in
+@@ -60,16 +60,16 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+ all : $(PROGRAMS)
+ 
+ demo: demo.cpp $(OBJECTS)
+-	$(CC) $(CFLAGS) $(DEFS) -o demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+ 
+ libdemo: demo.cpp
+-	$(CC) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
+ 
+ Md2Skini: Md2Skini.cpp Stk.o RtMidi.o
+-	$(CC) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
+ 
+ libMd2Skini: Md2Skini.cpp
+-	$(CC) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp -L../../src -lstk $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp -L../../src -lstk $(LIBRARY)
+ 
+ $(OBJECTS) : Stk.h
+ 
+Index: stk-4.3.1/projects/effects/Makefile.in
+===================================================================
+--- stk-4.3.1.orig/projects/effects/Makefile.in
++++ stk-4.3.1/projects/effects/Makefile.in
+@@ -49,10 +49,10 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+ all : $(PROGRAMS)
+ 
+ effects: effects.cpp $(OBJECTS)
+-	$(CC) $(CFLAGS) $(DEFS) -o effects effects.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+ 
+ libeffects: effects.cpp
+-	$(CC) $(CFLAGS) $(DEFS) -o effects effects.cpp -L../../src -lstk $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp -L../../src -lstk $(LIBRARY)
+ 
+ $(OBJECTS) : Stk.h
+ 
+Index: stk-4.3.1/projects/examples/Makefile.in
+===================================================================
+--- stk-4.3.1.orig/projects/examples/Makefile.in
++++ stk-4.3.1/projects/examples/Makefile.in
+@@ -51,52 +51,52 @@ strip : 
+ 	strip $(PROGRAMS)
+ 
+ audioprobe: RtAudio.o @objects@
+-	$(CC) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+ 
+ midiprobe: RtMidi.o
+-	$(CC) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
+ 
+ play: play.cpp Stk.o FileRead.o WvIn.o FileWvIn.o RtAudio.o
+-	$(CC) $(CFLAGS) $(DEFS) -o play play.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o play play.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+ 
+ record: record.cpp Stk.o WvIn.o FileWrite.o WvOut.o FileWvOut.o RtWvIn.o RtAudio.o
+-	$(CC) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/RtWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/RtWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+ 
+ sine: sine.cpp Stk.o Generator.o SineWave.o FileWrite.o WvOut.o FileWvOut.o
+-	$(CC) $(CFLAGS) $(DEFS) -o sine sine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sine sine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
+ 
+ duplex: duplex.cpp RtAudio.o
+-	$(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+ 
+ inetIn: inetIn.cpp Stk.o WvIn.o InetWvIn.o WvOut.o RtWvOut.o RtAudio.o Socket.o TcpServer.o UdpSocket.o Thread.o Mutex.o
+-	$(CC) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.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)/WvOut.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.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)/WvOut.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+ 
+ inetOut: inetOut.cpp Stk.o FileRead.o WvIn.o FileWvIn.o WvOut.o InetWvOut.o Socket.o TcpClient.o UdpSocket.o Thread.o Mutex.o
+-	$(CC) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/WvOut.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)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/WvOut.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)
+ 
+ sineosc: sineosc.cpp Stk.o FileRead.o WvIn.o FileWvIn.o WaveLoop.o FileWrite.o WvOut.o FileWvOut.o
+-	$(CC) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/WaveLoop.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/WaveLoop.o $(LIBRARY)
+ 
+ rtsine: rtsine.cpp Stk.o Generator.o SineWave.o WvOut.o RtWvOut.o RtAudio.o
+-	$(CC) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+ 
+ crtsine: crtsine.cpp Stk.o Generator.o SineWave.o RtAudio.o
+-	$(CC) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+ 
+ bethree: bethree.cpp Stk.o WvIn.o FileRead.o FileWvIn.o WaveLoop.o FM.o RtAudio.o Instrmnt.o Filter.o TwoZero.o Generator.o SineWave.o Envelope.o ADSR.o BeeThree.o
+-	$(CC) $(CFLAGS) $(DEFS) -o bethree bethree.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WaveLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Instrmnt.o $(OBJECT_PATH)/Filter.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/Envelope.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o bethree bethree.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WaveLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Instrmnt.o $(OBJECT_PATH)/Filter.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/Envelope.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(LIBRARY)
+ 
+ controlbee: controlbee.cpp Stk.o WvIn.o FileRead.o FileWvIn.o WaveLoop.o FM.o RtAudio.o Instrmnt.o Filter.o TwoZero.o Generator.o SineWave.o Envelope.o ADSR.o BeeThree.o Messager.o RtMidi.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o
+-	$(CC) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WaveLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Instrmnt.o $(OBJECT_PATH)/Filter.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/Envelope.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)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WaveLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Instrmnt.o $(OBJECT_PATH)/Filter.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/Envelope.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)
+ 
+ foursine: foursine.cpp Stk.o Generator.o SineWave.o FileWrite.o WvOut.o FileWvOut.o
+-	$(CC) $(CFLAGS) $(DEFS) -o foursine foursine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o foursine foursine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/WvOut.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
+ 
+ threebees: threebees.cpp Stk.o FileRead.o WvIn.o FileWvIn.o WaveLoop.o FM.o RtAudio.o Instrmnt.o Filter.o TwoZero.o Generator.o SineWave.o Envelope.o ADSR.o BeeThree.o Messager.o RtMidi.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o Voicer.o
+-	$(CC) $(CFLAGS) $(DEFS) -o threebees threebees.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WaveLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Instrmnt.o $(OBJECT_PATH)/Filter.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/Envelope.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)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o threebees threebees.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/WvIn.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/WaveLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Instrmnt.o $(OBJECT_PATH)/Filter.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/Envelope.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)
+ 
+ playsmf: playsmf.cpp Stk.o MidiFileIn.o RtMidi.o
+-	$(CC) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/MidiFileIn.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/MidiFileIn.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
+ 
+ grains: grains.cpp Stk.o Generator.o Granulate.o Noise.o FileRead.o RtAudio.o
+-	$(CC) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Generator.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+Index: stk-4.3.1/projects/ragamatic/Makefile.in
+===================================================================
+--- stk-4.3.1.orig/projects/ragamatic/Makefile.in
++++ stk-4.3.1/projects/ragamatic/Makefile.in
+@@ -50,10 +50,10 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+ all : $(PROGRAMS)
+ 
+ ragamat: ragamat.cpp $(OBJECTS)
+-	$(CC) $(CFLAGS) $(DEFS) -o ragamat ragamat.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat ragamat.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+ 
+ libragamat: ragamat.cpp Tabla.cpp Drone.cpp VoicDrum.cpp
+-	$(CC) $(CFLAGS) $(DEFS) -o ragamat Tabla.cpp Drone.cpp VoicDrum.cpp ragamat.cpp -L../../src $(LIBRARY) -lstk
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat Tabla.cpp Drone.cpp VoicDrum.cpp ragamat.cpp -L../../src $(LIBRARY) -lstk
+ 
+ $(OBJECTS) : Stk.h
+ 
+Index: stk-4.3.1/src/Makefile.in
+===================================================================
+--- stk-4.3.1.orig/src/Makefile.in
++++ stk-4.3.1/src/Makefile.in
+@@ -75,7 +75,7 @@ $(LIBRARY) : $(OBJECTS)
+ 
+ $(SHAREDLIB).$(RELEASE) : $(OBJECTS)
+ 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+-	$(CC) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
++	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+ 	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
+ 	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
+ 

Modified: trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild	2008-08-08 11:25:39 UTC (rev 1281)
+++ trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild	2008-08-08 15:10:51 UTC (rev 1282)
@@ -11,7 +11,7 @@
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="alsa examples jack midi oss"
+IUSE="alsa debug doc examples jack midi oss"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -33,6 +33,7 @@
 	epatch "${FILESDIR}/${P}-gcc43.patch"
 	epatch "${FILESDIR}/${P}-fpic.patch"
 	epatch "${FILESDIR}/${P}-missing.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
 	eautoreconf
 }
 		
@@ -41,6 +42,7 @@
 		`use_with alsa` \
 		`use_with jack` \
 		`use_with oss` \
+		`use_enable debug` \
 		RAWWAVE_PATH=/usr/share/stk/rawwaves/ \
 		|| die "configure failed!"
 
@@ -59,28 +61,58 @@
 			cd ..
 		done
 	fi
-	# fix include paths
-	find . -type f -name Makefile\* -exec \
-		perl -p -i -e "s|../../src|/usr/share/stk/src|g" {} \;
 }
 
 src_install() {
 	dodoc README
 	# install the lib
-	dolib src/libstk.so*
+	dolib src/libstk.*
 	# install headers
 	insinto /usr/include/stk
 	doins include/*.h include/*.msg include/*.tbl
 	# install rawwaves
 	insinto /usr/share/stk/rawwaves
 	doins rawwaves/*.raw
+	# install examples
 	if use examples; then
-		# this one actually sucks, but..
-		for i in *.bat *.cpp *.h Makefile*; do
+		# cleanup
+		for i in *.bat *.cpp *.h *Makefile* *.tcl; do
 			find projects/ -name $i -exec rm -f {} \;
 		done
-		dodir /usr/share/"${PN}"
-		doins -r projects
+		rm -r projects/*/{Debug,Release,tcl}
+		# demo
+		exeinto /usr/libexec/"${PN}"/demo
+		for i in demo* Drums Md2Skini* Modal Physical Shakers StkDemo Voice; do
+			doexe projects/demo/$i
+		done
+		insinto /usr/share/"${PN}"/demo
+		doins -r projects/demo/scores
+		# examples
+		exeinto /usr/libexec/"${PN}"/examples
+		doexe projects/examples/*
+		insinto /usr/share/"${PN}"/examples
+		doins -r projects/examples/{rawwaves,midifiles,scores}
+		# effects
+		exeinto /usr/libexec/"${PN}"/effects
+		doexe projects/effects/effects* projects/effects/StkEffects
+		# ragamatic
+		exeinto /usr/libexec/"${PN}"/ragamatic
+		doexe projects/ragamatic/Raga projects/ragamatic/ragamat*
+		insinto /usr/share/"${PN}"/ragamatic
+		doins -r projects/ragamatic/rawwaves projects/ragamatic/ragamatic.dsw
 	fi
+	# install docs
+	if use doc; then
+		rm doc/html/*.{map,md5}
+		insinto /usr/share/doc/"${PF}"/html
+		doins -r doc/html/*
+	fi
 }
 
+pkg_postinst() {
+	if use examples; then
+		elog "The binaries for the examples have been installed to"
+		elog "/usr/libexec/${PN}, the scores, rawwaves and midifiles"
+		elog "are in /usr/share/${PN}."
+	fi
+}

Modified: trunk/overlays/proaudio/media-sound/lmms/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/Manifest	2008-08-08 11:25:39 UTC (rev 1281)
+++ trunk/overlays/proaudio/media-sound/lmms/Manifest	2008-08-08 15:10:51 UTC (rev 1282)
@@ -5,7 +5,7 @@
 DIST lmms-0.4.0-beta1.tar.bz2 11393116 RMD160 9c0c6bf2793685064624f570a505fe18f27eff79 SHA1 cb9c1a3a2c801904b25a35872089ecfaf6e15d93 SHA256 7191773c89ebe0ff6734445b957d8e92915e0a95dfea5b67ecdf3637b51fffb4
 EBUILD lmms-0.3.1.ebuild 2017 RMD160 6cbe9c5b0d4dcdaa0035e287f6f3aabf29c77dd1 SHA1 d709f4b42187c61e344bd59d7c9d29949482fb8b SHA256 09ce3d64313f9c20c17156d378c1b3215cc7768125de498a47abfdc1acce8f54
 EBUILD lmms-0.3.2.ebuild 1815 RMD160 1497f2d07e768e56388829e5fa199980f0f2742d SHA1 d05ff6b6a52dbd3f3661b66c508b14e2968ab53e SHA256 123a027310b4c66016471f8211bc4dbcb5fc81243751da4b22e1f3c3e30c7fe2
-EBUILD lmms-0.4.0_beta1.ebuild 1609 RMD160 81948953f3f0f88773950a11f23194bc56d9c03d SHA1 8c9587a0b433e0f1ac1ba578575c5e6b9ea4a4b6 SHA256 24edc1fcb320fab4b466cfbfeb79d276f758fb693db6b65e8da36ca75b51426c
+EBUILD lmms-0.4.0_beta1.ebuild 1684 RMD160 c4a744d28a94eff1f9b6735d9862e55e381be5d1 SHA1 0302ad3b6ac940fe48536f7e942b6754ea94a3e7 SHA256 cba6374c944a2f6cc526bcce90ea31c22b09d7efef7fe09cd30dbcbe1a91e41b
 EBUILD lmms-9999-r1.ebuild 1635 RMD160 95907bf2872661e58a84650757281a84a2d3a9eb SHA1 e83d2835075e462206e0d36c335544a395f03d2c SHA256 c71879224172e17742feff4db1b33fb18fab9a6080d260467bc56c2f3e60445f
 MISC ChangeLog 775 RMD160 7e143784d1fd1d4832bc5e248ae5adfb3bac77b3 SHA1 9f87a6d2345cc7ce35566985e69eb050e962836b SHA256 a12f1e47cbf5b45872ecebc2a1e16be4a73c4ef17648a53e166b95dde71c915a
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild	2008-08-08 11:25:39 UTC (rev 1281)
+++ trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild	2008-08-08 15:10:51 UTC (rev 1282)
@@ -12,26 +12,28 @@
 HOMEPAGE="http://lmms.sourceforge.net";
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL"
+LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="alsa debug fftw jack ladspa ogg pch pulseaudio samplerate sdl stk vst"
+IUSE="alsa debug fftw fluidsynth jack ladspa ogg pch pulseaudio sdl stk vst"
 
 RDEPEND="|| ( (
 				x11-libs/qt-core
 				x11-libs/qt-gui
 			) >=x11-libs/qt-4.3.0 )
+	>=media-libs/libsndfile-1.0.11
+	media-libs/libsamplerate
 	alsa? ( media-libs/alsa-lib )
 	fftw? ( =sci-libs/fftw-3* )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
 	ladspa? ( media-libs/ladspa-sdk )
-	ogg? ( media-libs/libvorbis 
-				media-libs/libogg )
+	ogg? ( media-libs/libvorbis
+			media-libs/libogg )
+	fluidsynth? ( media-sound/fluidsynth )
 	pulseaudio? ( media-sound/pulseaudio )
-	samplerate? ( media-libs/libsamplerate )
 	sdl? ( media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1 )
+			>=media-libs/sdl-sound-1.0.1 )
 	stk? ( media-libs/stk )
 	vst? ( app-emulation/wine )"
 DEPEND="${RDEPEND}
@@ -45,12 +47,13 @@
 		$(cmake-utils_use_want ladspa CAPS)
 		$(cmake-utils_use_want ladspa TAP)
 		$(cmake-utils_use_want fftw FFTW3F)
-		$(cmake-utils_use_want fftw JACK)
+		$(cmake-utils_use_want jack JACK)
 		$(cmake-utils_use_want ogg OGGVORBIS)
 		$(cmake-utils_use_want sdl SDL)
 		$(cmake-utils_use_want stk STK)
-		$(cmake-utils_use_want samplerate SYSTEM_SR)
+		-DWANT_SYSTEM_SR=TRUE
 		$(cmake-utils_use_want vst VST)
+		$(cmake-utils_use_want fluidsynth SF2)
 		$(cmake-utils_use_want pch PCH)"
 
 	cmake-utils_src_compile -j1

Messages sorted by: [ date | thread ]
Prev by Date: Re: LMMS 0.4.0-beta (was: Re: [proaudio] ProAudio current state)
Next by Date: Re: LMMS 0.4.0-beta (was: Re: [proaudio] ProAudio current state)
Previous by thread: [proaudio] [1281] omins dep on liblo-0.25
Next by thread: [proaudio] [1283] BIG CLEANUP: removed old ebuilds

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/