diff options
author | Alexis Ballier <aballier@gentoo.org> | 2011-02-27 17:16:23 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-27 17:16:23 +0000 |
commit | 9e79a319cf3f04b2ad1e35ffbf647627c4d0df26 (patch) | |
tree | 0695e311abd7052fa8d788e3b8d94834cb30fe84 | |
parent | Fix gnome-python meta DEPEND (bug #352932), bump to eapi3 to drop built_with_... (diff) | |
download | gentoo-2-9e79a319cf3f04b2ad1e35ffbf647627c4d0df26.tar.gz gentoo-2-9e79a319cf3f04b2ad1e35ffbf647627c4d0df26.tar.bz2 gentoo-2-9e79a319cf3f04b2ad1e35ffbf647627c4d0df26.zip |
remove old
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
-rw-r--r-- | media-libs/stk/ChangeLog | 8 | ||||
-rw-r--r-- | media-libs/stk/files/stk-4.3.1-cflags-lib.patch | 46 | ||||
-rw-r--r-- | media-libs/stk/files/stk-4.3.1-fpic.patch | 48 | ||||
-rw-r--r-- | media-libs/stk/files/stk-4.3.1-gcc43.patch | 271 | ||||
-rw-r--r-- | media-libs/stk/files/stk-4.3.1-gcc44.patch | 30 | ||||
-rw-r--r-- | media-libs/stk/files/stk-4.3.1-ldflags.patch | 146 | ||||
-rw-r--r-- | media-libs/stk/files/stk-4.3.1-missing.patch | 4 | ||||
-rw-r--r-- | media-libs/stk/stk-4.3.1.ebuild | 66 |
8 files changed, 7 insertions, 612 deletions
diff --git a/media-libs/stk/ChangeLog b/media-libs/stk/ChangeLog index ae8c16a2a794..168a69e112c0 100644 --- a/media-libs/stk/ChangeLog +++ b/media-libs/stk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/stk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.6 2011/01/02 14:23:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.7 2011/02/27 17:16:22 aballier Exp $ + + 27 Feb 2011; Alexis Ballier <aballier@gentoo.org> -stk-4.3.1.ebuild, + -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-gcc44.patch, + -files/stk-4.3.1-ldflags.patch, -files/stk-4.3.1-missing.patch: + remove old *stk-4.4.2 (02 Jan 2011) diff --git a/media-libs/stk/files/stk-4.3.1-cflags-lib.patch b/media-libs/stk/files/stk-4.3.1-cflags-lib.patch deleted file mode 100644 index 91126d6ec299..000000000000 --- a/media-libs/stk/files/stk-4.3.1-cflags-lib.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up stk-4.3.1/src/Makefile.in.orig stk-4.3.1/src/Makefile.in ---- stk-4.3.1/src/Makefile.in.orig 2007-12-07 07:25:42.000000000 +0100 -+++ stk-4.3.1/src/Makefile.in 2008-07-03 23:31:43.000000000 +0200 -@@ -38,7 +38,7 @@ endif - CC = @CXX@ - DEFS = @byte_order@ - DEFS += @debug@ --CFLAGS = @cflags@ -+CFLAGS = @CFLAGS@ - CFLAGS += @warn@ $(INCLUDE) -Iinclude - - REALTIME = @realtime@ -diff -up stk-4.3.1/projects/demo/Makefile.in.orig stk-4.3.1/projects/demo/Makefile.in ---- stk-4.3.1/projects/demo/Makefile.in.orig 2007-12-07 07:25:42.000000000 +0100 -+++ stk-4.3.1/projects/demo/Makefile.in 2008-07-04 02:02:32.000000000 +0200 -@@ -33,7 +33,7 @@ vpath %.h $(INCLUDE) - CC = @CXX@ - DEFS = @byte_order@ - DEFS += @debug@ --CFLAGS = @cflags@ -+CFLAGS = @CFLAGS@ - CFLAGS += @warn@ -I$(INCLUDE) -I../../src/include - LIBRARY = @LIBS@ - LIBRARY += @frameworks@ ---- stk-4.3.1/projects/effects/Makefile.in.orig 2007-12-07 07:25:42.000000000 +0100 -+++ stk-4.3.1/projects/effects/Makefile.in 2008-07-04 03:08:29.000000000 +0200 -@@ -22,7 +22,7 @@ vpath %.h $(INCLUDE) - CC = @CXX@ - DEFS = @byte_order@ - DEFS += @debug@ --CFLAGS = @cflags@ -+CFLAGS = @CFLAGS@ - CFLAGS += @warn@ -I$(INCLUDE) -I../../src/include - LIBRARY = @LIBS@ - LIBRARY += @frameworks@ ---- stk-4.3.1/projects/ragamatic/Makefile.in.orig 2007-12-07 07:25:42.000000000 +0100 -+++ stk-4.3.1/projects/ragamatic/Makefile.in 2008-07-04 03:10:23.000000000 +0200 -@@ -23,7 +23,7 @@ vpath %.h $(INCLUDE) - CC = @CXX@ - DEFS = @byte_order@ - DEFS += @debug@ --CFLAGS = @cflags@ -+CFLAGS = @CFLAGS@ - CFLAGS += @warn@ -I$(INCLUDE) -I../../src/include - LIBRARY = @LIBS@ - LIBRARY += @frameworks@ diff --git a/media-libs/stk/files/stk-4.3.1-fpic.patch b/media-libs/stk/files/stk-4.3.1-fpic.patch deleted file mode 100644 index e48b10aa6258..000000000000 --- a/media-libs/stk/files/stk-4.3.1-fpic.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up stk-4.3.1/src/Makefile.in.sharedlib stk-4.3.1/src/Makefile.in ---- stk-4.3.1/src/Makefile.in.sharedlib 2008-07-15 21:43:37.000000000 +0200 -+++ stk-4.3.1/src/Makefile.in 2008-07-15 21:51:45.000000000 +0200 -@@ -2,8 +2,13 @@ - ### libstk Makefile - for various flavors of unix - - LIBRARY = libstk.a -+SHAREDLIB = libstk.so -+MAJOR = 4 -+RELEASE = 4.3.1 -+ - AR = ar -rsc - RM = /bin/rm -+LN = /bin/ln - OBJECT_PATH = @object_path@ - vpath %.o $(OBJECT_PATH) - -@@ -40,6 +45,9 @@ DEFS = @byte_order@ - DEFS += @debug@ - CFLAGS = @CFLAGS@ - CFLAGS += @warn@ $(INCLUDE) -Iinclude -+CFLAGS += -fPIC -+LIBS = @LIBS@ -+LIBS += @frameworks@ - - REALTIME = @realtime@ - ifeq ($(REALTIME),yes) -@@ -59,12 +67,18 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\ - %.o : ../src/include/%.cpp - $(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@ - --all : $(LIBRARY) -+all : $(LIBRARY) $(SHAREDLIB).$(RELEASE) - - $(LIBRARY) : $(OBJECTS) -- /bin/rm -f $(LIBRARY) -+ $(RM) -f $(LIBRARY) - $(AR) $(LIBRARY) $(OBJECT_PATH)/*.o - -+$(SHAREDLIB).$(RELEASE) : $(OBJECTS) -+ $(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB) -+ $(CC) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS) -+ $(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR) -+ $(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB) -+ - $(OBJECTS) : Stk.h - - clean : diff --git a/media-libs/stk/files/stk-4.3.1-gcc43.patch b/media-libs/stk/files/stk-4.3.1-gcc43.patch deleted file mode 100644 index 889e9ccab563..000000000000 --- a/media-libs/stk/files/stk-4.3.1-gcc43.patch +++ /dev/null @@ -1,271 +0,0 @@ ---- 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 -@@ -15,6 +15,7 @@ - #include <signal.h> - #include <iostream> - #include <algorithm> -+#include <cstring> - 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 -@@ -10,6 +10,8 @@ - - #include "RtAudio.h" - #include <iostream> -+#include <cstdlib> -+#include <cstring> - - /* - 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 -@@ -2,6 +2,7 @@ - - #include "SineWave.h" - #include "FileWvOut.h" -+#include <cstdlib> - - 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 -@@ -4,6 +4,7 @@ - - #include "Granulate.h" - #include "RtAudio.h" -+#include <cstdlib> - - // 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 -@@ -30,6 +30,7 @@ - - #include "InetWvIn.h" - #include "RtWvOut.h" -+#include <cstdlib> - - 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 -@@ -19,6 +19,7 @@ - - #include "FileWvIn.h" - #include "InetWvOut.h" -+#include <cstdlib> - - 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 -@@ -6,6 +6,7 @@ - - #include <iostream> - #include "RtMidi.h" -+#include <cstdlib> - - 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 -@@ -18,6 +18,7 @@ - - #include <signal.h> - #include <iostream> -+#include <cstdlib> - - // 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 -@@ -7,7 +7,8 @@ - - #include "MidiFileIn.h" - #include "RtMidi.h" --#include <signal.h> -+#include <csignal> -+#include <cstdlib> - - 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 -@@ -24,6 +24,7 @@ - - #include "RtWvIn.h" - #include "FileWvOut.h" -+#include <cstdlib> - - 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 -@@ -2,6 +2,7 @@ - - #include "SineWave.h" - #include "RtWvOut.h" -+#include <cstdlib> - - 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 -@@ -14,6 +14,7 @@ - - #include "SineWave.h" - #include "FileWvOut.h" -+#include <cstdlib> - - 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 -@@ -2,6 +2,7 @@ - - #include "WaveLoop.h" - #include "FileWvOut.h" -+#include <cstdlib> - - 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 -@@ -10,9 +10,11 @@ - #include "Messager.h" - #include "RtAudio.h" - --#include <signal.h> -+#include <csignal> - #include <iostream> - #include <algorithm> -+#include <cstdlib> -+#include <cstring> - 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 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <cmath> -+#include <cstring> - - 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 @@ - - #include "FileWrite.h" - #include <cmath> -+#include <cstring> - - 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 -@@ -34,6 +34,7 @@ - - #include "Messager.h" - #include <iostream> -+#include <algorithm> - #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 -@@ -17,6 +17,7 @@ - - #include "MidiFileIn.h" - #include <iostream> -+#include <cstring> - - 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 -@@ -12,6 +12,7 @@ - /***************************************************/ - - #include "Modal.h" -+#include <cstdlib> - - 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 @@ - - #include "RtAudio.h" - #include <iostream> -+#include <cstdlib> -+#include <cstring> -+#include <climits> - - // 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 -@@ -54,6 +54,8 @@ - - #include "Stk.h" - #include <cmath> -+#include <cstdlib> -+#include <cstring> - - 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 -@@ -25,6 +25,7 @@ - - #include "Skini.h" - #include "SKINI.tbl" -+#include <cstdlib> - - 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 -@@ -51,6 +51,7 @@ - /***************************************************/ - - #include "Stk.h" -+#include <cstdlib> - - 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 -@@ -24,6 +24,7 @@ - /***************************************************/ - - #include "TcpClient.h" -+#include <cstring> - - 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 -@@ -22,6 +22,7 @@ - /***************************************************/ - - #include "UdpSocket.h" -+#include <cstring> - - 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 -@@ -30,6 +30,7 @@ - #include "SKINI.msg" - - #include <cmath> -+#include <cstring> - - VoicForm :: VoicForm() : Instrmnt() - { diff --git a/media-libs/stk/files/stk-4.3.1-gcc44.patch b/media-libs/stk/files/stk-4.3.1-gcc44.patch deleted file mode 100644 index abc8ba1d814a..000000000000 --- a/media-libs/stk/files/stk-4.3.1-gcc44.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- src/FileRead.cpp -+++ src/FileRead.cpp -@@ -32,6 +32,7 @@ - #include "FileRead.h" - #include <sys/stat.h> - #include <sys/types.h> -+#include <cstdio> - #include <cmath> - #include <cstring> - ---- src/FileWrite.cpp -+++ src/FileWrite.cpp -@@ -22,6 +22,7 @@ - /***************************************************/ - - #include "FileWrite.h" -+#include <cstdio> - #include <cmath> - #include <cstring> - ---- src/RtAudio.cpp -+++ src/RtAudio.cpp -@@ -42,6 +42,7 @@ - - #include "RtAudio.h" - #include <iostream> -+#include <cstdio> - #include <cstdlib> - #include <cstring> - #include <climits> diff --git a/media-libs/stk/files/stk-4.3.1-ldflags.patch b/media-libs/stk/files/stk-4.3.1-ldflags.patch deleted file mode 100644 index 2a0b347b545a..000000000000 --- a/media-libs/stk/files/stk-4.3.1-ldflags.patch +++ /dev/null @@ -1,146 +0,0 @@ -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) - diff --git a/media-libs/stk/files/stk-4.3.1-missing.patch b/media-libs/stk/files/stk-4.3.1-missing.patch deleted file mode 100644 index 5604200e4890..000000000000 --- a/media-libs/stk/files/stk-4.3.1-missing.patch +++ /dev/null @@ -1,4 +0,0 @@ ---- /dev/null 2008-06-04 20:47:47.568000746 +0200 -+++ stk-4.3.1/projects/demo/Banded 2008-07-04 03:35:48.000000000 +0200 -@@ -0,0 +1 @@ -+wish < tcl/Banded.tcl | ./demo BandedWG -or -ip diff --git a/media-libs/stk/stk-4.3.1.ebuild b/media-libs/stk/stk-4.3.1.ebuild deleted file mode 100644 index b4f5ae2386af..000000000000 --- a/media-libs/stk/stk-4.3.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/stk-4.3.1.ebuild,v 1.4 2009/07/30 11:28:31 ssuominen Exp $ - -inherit eutils autotools - -DESCRIPTION="Synthesis ToolKit in C++" -HOMEPAGE="http://ccrma.stanford.edu/software/stk/" -SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc jack oss" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - jack? ( media-sound/jack-audio-connection-kit )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-lang/perl" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-cflags-lib.patch" - epatch "${FILESDIR}/${P}-gcc43.patch" - epatch "${FILESDIR}/${P}-fpic.patch" - epatch "${FILESDIR}/${P}-missing.patch" - epatch "${FILESDIR}/${P}-ldflags.patch" - epatch "${FILESDIR}/${P}-gcc44.patch" - eautoreconf -} - -src_compile() { - local myconf - # --without-jack is broken in autofoo, see #232302 - use jack && myconf="--with-jack" - - econf \ - `use_with alsa` \ - `use_with oss` \ - `use_enable debug` \ - RAWWAVE_PATH=/usr/share/stk/rawwaves/ \ - ${myconf} \ - || die "configure failed!" - - # compile libstk - cd src - emake || die "make in src failed!" -} - -src_install() { - dodoc README - # install the lib - 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 docs - if use doc; then - dohtml -r doc/html/* - fi -} |