summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Shattow <jnc@gentoo.org>2005-05-03 23:09:41 +0000
committerEric Shattow <jnc@gentoo.org>2005-05-03 23:09:41 +0000
commit62667ad2a019a60061c44ac7c0ec3ce2e1326165 (patch)
treecab3b3201c3a07c0be83c32e66596f22103b2e36 /media-sound/zynaddsubfx/files
parentbug 91287 (diff)
downloadhistorical-62667ad2a019a60061c44ac7c0ec3ce2e1326165.tar.gz
historical-62667ad2a019a60061c44ac7c0ec3ce2e1326165.tar.bz2
historical-62667ad2a019a60061c44ac7c0ec3ce2e1326165.zip
<maintainer>
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-sound/zynaddsubfx/files')
-rw-r--r--media-sound/zynaddsubfx/files/digest-zynaddsubfx-1.4.31
-rw-r--r--media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.11
-rw-r--r--media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r11
-rw-r--r--media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.11
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-1.4.0.patch47
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-1.4.2.patch47
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-1.4.3.patch47
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-2.0.0.patch247
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch32
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch200
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch12
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch86
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch11
13 files changed, 1 insertions, 732 deletions
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-1.4.3 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-1.4.3
deleted file mode 100644
index 3995bdea7b5b..000000000000
--- a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-1.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d89e2f469f48ba046deeec8e38ed02f ZynAddSubFX-1.4.3.tar.gz 189524
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1
deleted file mode 100644
index 9b2441e6179d..000000000000
--- a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a078a85fc140bad8da6dd8114b9e5f41 ZynAddSubFX-2.1.1.tar.bz2 784495
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r1 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r1
deleted file mode 100644
index 9b2441e6179d..000000000000
--- a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a078a85fc140bad8da6dd8114b9e5f41 ZynAddSubFX-2.1.1.tar.bz2 784495
diff --git a/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.1 b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.1
new file mode 100644
index 000000000000..b736a97954c4
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/digest-zynaddsubfx-2.2.1
@@ -0,0 +1 @@
+MD5 fca8560e37d799bd20d17e22b11674d6 ZynAddSubFX-2.2.1.tar.bz2 927022
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.0.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.0.patch
deleted file mode 100644
index c58d91d83a92..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh
---- ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh 2003-03-19 00:11:42.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh 2003-03-23 14:37:47.000000000 +0900
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c ControllerUI.fl
--gcc -c ControllerUI.cxx -o ControllerUI.o
--gcc -c Controller.C -o Controller.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
-
-
-diff -ur ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh
---- ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh 2003-03-19 00:11:42.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh 2003-03-23 14:34:18.000000000 +0900
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c SpliterUI.fl
--gcc -c SpliterUI.cxx -o SpliterUI.o
--gcc -c Spliter.C -o Spliter.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
- gcc -o spliter *.o `fltk-config --ldflags` -lasound
-
-diff -ur ZynAddSubFX-1.4.0/src/Makefile.inc /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/src/Makefile.inc
---- ZynAddSubFX-1.4.0/src/Makefile.inc 2003-03-19 23:25:12.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/src/Makefile.inc 2003-03-23 14:38:10.000000000 +0900
-@@ -12,9 +12,9 @@
- #LINUX_MIDIIN=NONE
-
- #Next line sets the audio output (OSS/JACK/PA)
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.2.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.2.patch
deleted file mode 100644
index c58d91d83a92..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh
---- ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh 2003-03-19 00:11:42.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh 2003-03-23 14:37:47.000000000 +0900
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c ControllerUI.fl
--gcc -c ControllerUI.cxx -o ControllerUI.o
--gcc -c Controller.C -o Controller.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
-
-
-diff -ur ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh
---- ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh 2003-03-19 00:11:42.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh 2003-03-23 14:34:18.000000000 +0900
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c SpliterUI.fl
--gcc -c SpliterUI.cxx -o SpliterUI.o
--gcc -c Spliter.C -o Spliter.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
- gcc -o spliter *.o `fltk-config --ldflags` -lasound
-
-diff -ur ZynAddSubFX-1.4.0/src/Makefile.inc /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/src/Makefile.inc
---- ZynAddSubFX-1.4.0/src/Makefile.inc 2003-03-19 23:25:12.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/src/Makefile.inc 2003-03-23 14:38:10.000000000 +0900
-@@ -12,9 +12,9 @@
- #LINUX_MIDIIN=NONE
-
- #Next line sets the audio output (OSS/JACK/PA)
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.3.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.3.patch
deleted file mode 100644
index c58d91d83a92..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-1.4.3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh
---- ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh 2003-03-19 00:11:42.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Controller/compile.sh 2003-03-23 14:37:47.000000000 +0900
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c ControllerUI.fl
--gcc -c ControllerUI.cxx -o ControllerUI.o
--gcc -c Controller.C -o Controller.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
-
-
-diff -ur ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh
---- ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh 2003-03-19 00:11:42.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/ExternalPrograms/Spliter/compile.sh 2003-03-23 14:34:18.000000000 +0900
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c SpliterUI.fl
--gcc -c SpliterUI.cxx -o SpliterUI.o
--gcc -c Spliter.C -o Spliter.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
- gcc -o spliter *.o `fltk-config --ldflags` -lasound
-
-diff -ur ZynAddSubFX-1.4.0/src/Makefile.inc /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/src/Makefile.inc
---- ZynAddSubFX-1.4.0/src/Makefile.inc 2003-03-19 23:25:12.000000000 +0900
-+++ /var/tmp/portage/zynaddsubfx-1.4.0/work/ZynAddSubFX-1.4.0/src/Makefile.inc 2003-03-23 14:38:10.000000000 +0900
-@@ -12,9 +12,9 @@
- #LINUX_MIDIIN=NONE
-
- #Next line sets the audio output (OSS/JACK/PA)
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.0.0.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.0.0.patch
deleted file mode 100644
index e8b6bf867d36..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.0.0.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Controller/ControllerUI.fl ZynAddSubFX-2.0.0/ExternalPrograms/Controller/ControllerUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Controller/ControllerUI.fl 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.0.0/ExternalPrograms/Controller/ControllerUI.fl 2004-09-06 20:28:10.060118190 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0103
-+#version 1.0103
- header_name {.h}
- code_name {.cxx}
- decl {\#include <FL/Fl_Box.h>} {public
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Controller/compile.sh ZynAddSubFX-2.0.0/ExternalPrograms/Controller/compile.sh
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Controller/compile.sh 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.0.0/ExternalPrograms/Controller/compile.sh 2004-09-06 20:29:06.231239382 -0500
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c ControllerUI.fl
--gcc -c ControllerUI.cxx -o ControllerUI.o
--gcc -c Controller.C -o Controller.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
-
-
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/SpliterUI.fl ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/SpliterUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/SpliterUI.fl 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/SpliterUI.fl 2004-09-06 20:28:10.062118162 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0102
-+#version 1.0102
- header_name {.h}
- code_name {.cxx}
- decl {//Copyright (c) 2002-2003 Nasca Octavian Paul} {selected
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/compile.sh ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/compile.sh
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/compile.sh 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.0.0/ExternalPrograms/Spliter/compile.sh 2004-09-06 20:29:45.103528359 -0500
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c SpliterUI.fl
--gcc -c SpliterUI.cxx -o SpliterUI.o
--gcc -c Spliter.C -o Spliter.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
- gcc -o spliter *.o `fltk-config --ldflags` -lasound
-
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/Makefile.inc ZynAddSubFX-2.0.0/src/Makefile.inc
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/Makefile.inc 2004-02-10 13:50:59.000000000 -0600
-+++ ZynAddSubFX-2.0.0/src/Makefile.inc 2004-09-06 20:30:47.344231720 -0500
-@@ -19,9 +19,9 @@
- #LINUX_MIDIIN=NONE
-
- #Next line sets the audio output (OSS/JACK/PA)
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/ADnoteUI.fl ZynAddSubFX-2.0.0/src/UI/ADnoteUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/ADnoteUI.fl 2004-08-17 18:57:17.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/ADnoteUI.fl 2004-09-06 20:28:10.097117672 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/BankUI.fl ZynAddSubFX-2.0.0/src/UI/BankUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/BankUI.fl 2004-08-27 15:57:24.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/BankUI.fl 2004-09-06 20:28:10.101117616 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/ConfigUI.fl ZynAddSubFX-2.0.0/src/UI/ConfigUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/ConfigUI.fl 2004-08-27 15:50:55.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/ConfigUI.fl 2004-09-06 20:28:10.105117560 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/EffUI.fl ZynAddSubFX-2.0.0/src/UI/EffUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/EffUI.fl 2004-08-15 10:39:36.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/EffUI.fl 2004-09-06 20:28:10.116117406 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/EnvelopeUI.fl ZynAddSubFX-2.0.0/src/UI/EnvelopeUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/EnvelopeUI.fl 2004-08-17 18:56:44.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/EnvelopeUI.fl 2004-09-06 20:28:10.123117308 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/FilterUI.fl ZynAddSubFX-2.0.0/src/UI/FilterUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/FilterUI.fl 2004-08-17 18:58:54.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/FilterUI.fl 2004-09-06 20:28:10.129117224 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/LFOUI.fl ZynAddSubFX-2.0.0/src/UI/LFOUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/LFOUI.fl 2004-08-17 15:13:05.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/LFOUI.fl 2004-09-06 20:28:10.132117182 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/MasterUI.fl ZynAddSubFX-2.0.0/src/UI/MasterUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/MasterUI.fl 2004-08-24 16:21:09.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/MasterUI.fl 2004-09-06 20:28:10.140117070 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/MicrotonalUI.fl ZynAddSubFX-2.0.0/src/UI/MicrotonalUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/MicrotonalUI.fl 2004-08-22 08:51:24.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/MicrotonalUI.fl 2004-09-06 20:28:10.144117014 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/OscilGenUI.fl ZynAddSubFX-2.0.0/src/UI/OscilGenUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/OscilGenUI.fl 2004-08-15 12:00:56.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/OscilGenUI.fl 2004-09-06 20:28:10.152116902 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/PADnoteUI.fl ZynAddSubFX-2.0.0/src/UI/PADnoteUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/PADnoteUI.fl 2004-08-17 14:08:34.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/PADnoteUI.fl 2004-09-06 20:28:10.160116790 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {\#include "../Params/PADnoteParameters.h"} {public
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/PartUI.fl ZynAddSubFX-2.0.0/src/UI/PartUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/PartUI.fl 2004-08-22 06:12:53.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/PartUI.fl 2004-09-06 20:28:10.169116663 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/PresetsUI.fl ZynAddSubFX-2.0.0/src/UI/PresetsUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/PresetsUI.fl 2004-08-22 16:11:15.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/PresetsUI.fl 2004-09-06 20:28:10.173116607 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {\#include <FL/fl_ask.h>} {public
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/ResonanceUI.fl ZynAddSubFX-2.0.0/src/UI/ResonanceUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/ResonanceUI.fl 2004-08-15 09:07:09.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/ResonanceUI.fl 2004-09-06 20:28:10.176116565 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/SUBnoteUI.fl ZynAddSubFX-2.0.0/src/UI/SUBnoteUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/SUBnoteUI.fl 2004-08-16 18:48:23.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/SUBnoteUI.fl 2004-09-06 20:28:10.181116495 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/SeqUI.fl ZynAddSubFX-2.0.0/src/UI/SeqUI.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/SeqUI.fl 2004-07-15 17:00:10.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/SeqUI.fl 2004-09-06 20:28:10.183116467 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/VirKeyboard.fl ZynAddSubFX-2.0.0/src/UI/VirKeyboard.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/VirKeyboard.fl 2004-07-03 10:11:58.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/VirKeyboard.fl 2004-09-06 20:28:10.188116397 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/WidgetPDial.fl ZynAddSubFX-2.0.0/src/UI/WidgetPDial.fl
---- /var/tmp/portage/zynaddsubfx-2.0.0/work/ZynAddSubFX-2.0.0/src/UI/WidgetPDial.fl 2004-07-28 15:41:51.000000000 -0500
-+++ ZynAddSubFX-2.0.0/src/UI/WidgetPDial.fl 2004-09-06 20:28:10.190116369 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2004 Nasca Octavian Paul} {}
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch
deleted file mode 100644
index 25e02dc9454a..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.1.1/ExternalPrograms/Controller/compile.sh 2004-10-12 17:37:01.049827687 -0500
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c ControllerUI.fl
--gcc -c ControllerUI.cxx -o ControllerUI.o
--gcc -c Controller.C -o Controller.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
-
-
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/compile.sh 2004-10-12 17:37:04.809589979 -0500
-@@ -1,8 +1,8 @@
--clean.sh
-+./clean.sh
- fluid -c SpliterUI.fl
--gcc -c SpliterUI.cxx -o SpliterUI.o
--gcc -c Spliter.C -o Spliter.o
--gcc -c main.C -o main.o
-+gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc `fltk-config --cflags` -c main.C -o main.o
-
- gcc -o spliter *.o `fltk-config --ldflags` -lasound
-
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch
deleted file mode 100644
index 714eb03f1a7e..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-fltk_version.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.1.1/ExternalPrograms/Controller/ControllerUI.fl 2004-10-13 02:10:17.574969844 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0103
-+#version 1.0103
- header_name {.h}
- code_name {.cxx}
- decl {\#include <FL/Fl_Box.h>} {public
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl 2003-11-28 14:45:03.000000000 -0600
-+++ ZynAddSubFX-2.1.1/ExternalPrograms/Spliter/SpliterUI.fl 2004-10-13 02:10:17.572970503 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0102
-+#version 1.0102
- header_name {.h}
- code_name {.cxx}
- decl {//Copyright (c) 2002-2003 Nasca Octavian Paul} {selected
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl 2004-09-27 11:11:47.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/ADnoteUI.fl 2004-10-13 02:10:17.567972148 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0104
-+#version 1.0104
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/BankUI.fl ZynAddSubFX-2.1.1/src/UI/BankUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/BankUI.fl 2004-10-01 12:46:51.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/BankUI.fl 2004-10-13 02:10:17.483000122 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0104
-+#version 1.0104
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl 2004-08-27 15:50:55.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/ConfigUI.fl 2004-10-13 02:10:17.539981363 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EffUI.fl ZynAddSubFX-2.1.1/src/UI/EffUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EffUI.fl 2004-09-30 15:08:07.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/EffUI.fl 2004-10-13 02:10:17.561974123 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0104
-+#version 1.0104
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl 2004-08-17 18:56:44.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/EnvelopeUI.fl 2004-10-13 02:10:17.550977743 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/FilterUI.fl ZynAddSubFX-2.1.1/src/UI/FilterUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/FilterUI.fl 2004-08-17 18:58:54.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/FilterUI.fl 2004-10-13 02:10:17.570971161 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/LFOUI.fl ZynAddSubFX-2.1.1/src/UI/LFOUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/LFOUI.fl 2004-08-17 15:13:05.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/LFOUI.fl 2004-10-13 02:10:17.508991565 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MasterUI.fl ZynAddSubFX-2.1.1/src/UI/MasterUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MasterUI.fl 2004-10-02 15:09:57.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/MasterUI.fl 2004-10-13 02:10:17.500994198 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0104
-+#version 1.0104
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl 2004-08-22 08:51:24.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/MicrotonalUI.fl 2004-10-13 02:10:17.510990907 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl 2004-08-15 12:00:56.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/OscilGenUI.fl 2004-10-13 02:10:17.516988932 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl 2004-08-17 14:08:34.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/PADnoteUI.fl 2004-10-13 02:10:17.536982350 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {\#include "../Params/PADnoteParameters.h"} {public
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PartUI.fl ZynAddSubFX-2.1.1/src/UI/PartUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PartUI.fl 2004-09-30 14:59:25.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/PartUI.fl 2004-10-13 02:10:17.506992223 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0104
-+#version 1.0104
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl 2004-08-22 16:11:15.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/PresetsUI.fl 2004-10-13 02:10:17.541980705 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {\#include <FL/fl_ask.h>} {public
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl 2004-08-15 09:07:09.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/ResonanceUI.fl 2004-10-13 02:10:17.544979717 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl 2004-08-16 18:48:23.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/SUBnoteUI.fl 2004-10-13 02:10:17.520987616 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SeqUI.fl ZynAddSubFX-2.1.1/src/UI/SeqUI.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/SeqUI.fl 2004-07-15 17:00:10.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/SeqUI.fl 2004-10-13 02:10:17.517988603 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl 2004-07-03 10:11:58.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/VirKeyboard.fl 2004-10-13 02:10:17.530984325 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl 2004-07-28 15:41:51.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/UI/WidgetPDial.fl 2004-10-13 02:10:17.546979059 -0500
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0105
-+#version 1.0105
- header_name {.h}
- code_name {.cc}
- decl {//Copyright (c) 2004 Nasca Octavian Paul} {}
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch
deleted file mode 100644
index 834b55ca06bb..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -burN portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile ZynAddSubFX-2.1.1/src/Makefile
---- portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile 2004-10-20 18:09:29.786226273 -0500
-+++ ZynAddSubFX-2.1.1/src/Makefile 2004-10-20 19:20:34.940269677 -0500
-@@ -1,7 +1,7 @@
- include Makefile.inc
-
- ifneq ($(MAKECMDGOALS),debug)
-- CXXFLAGS= -O6 -ggdb -Wall
-+ CXXFLAGS= -O6 -ggdb -Wall -mno-sse
- else
- CXXFLAGS= -O0 -ggdb -Wall -Wpointer-arith -Wstrict-prototypes
- endif
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch
deleted file mode 100644
index 76b7b9e60249..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc_subscript_warning.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C 2004-07-30 19:15:30.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C 2004-10-13 02:05:05.836598554 -0500
-@@ -231,7 +231,7 @@
- ///test
- // ntrack=0;
-
-- me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
-+ me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
-
- };
-
-@@ -251,7 +251,7 @@
- me->tmpevent.par1=note;
- me->tmpevent.par2=vel;
- me->tmpevent.channel=chan;
-- me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
-+ me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
-
-
-
-@@ -271,7 +271,7 @@
- me->tmpevent.par1=control;//???????????? ma uit la Sequencer::recordnote() din varianele vechi de zyn
- me->tmpevent.par2=value;
- me->tmpevent.channel=chan;
-- me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
-+ me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
-
- };
-
-@@ -304,7 +304,7 @@
- me->tmpevent.par1=0;
- me->tmpevent.par2=0;
- me->tmpevent.channel=0;
-- me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
-+ me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
- };
-
-
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/Sequencer.C ZynAddSubFX-2.1.1/src/Seq/Sequencer.C
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/Sequencer.C 2004-07-20 15:17:56.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/Seq/Sequencer.C 2004-10-13 02:03:54.829973000 -0500
-@@ -101,30 +101,30 @@
- //test
- // if (ntrack!=0) return(-1);
-
-- updatecounter(&playtime[ntrack]);
-+ updatecounter(&playtime[(int)ntrack]);
-
--// printf("%g %g\n",nextevent[ntrack].time,playtime[ntrack].abs);
-+// printf("%g %g\n",nextevent[(int)ntrack].time,playtime[(int)ntrack].abs);
-
-- if (nextevent[ntrack].time<playtime[ntrack].abs) readevent(&miditrack[ntrack].track,&nextevent[ntrack].ev);
-+ if (nextevent[(int)ntrack].time<playtime[(int)ntrack].abs) readevent(&miditrack[(int)ntrack].track,&nextevent[(int)ntrack].ev);
- else return(-1);
-- if (nextevent[ntrack].ev.type==-1) return(-1);
-+ if (nextevent[(int)ntrack].ev.type==-1) return(-1);
- // printf("********************************\n");
-
- //sa pun aici o protectie. a.i. daca distanta dintre timpul curent si eveliment e prea mare (>1sec) sa elimin nota
-
-- if (ntrack==1) printf("_ %f %.2f (%d)\n",nextevent[ntrack].time,playtime[ntrack].abs,nextevent[ntrack].ev.par2);
-+ if (ntrack==1) printf("_ %f %.2f (%d)\n",nextevent[(int)ntrack].time,playtime[(int)ntrack].abs,nextevent[(int)ntrack].ev.par2);
-
-- *type=nextevent[ntrack].ev.type;
-- *par1=nextevent[ntrack].ev.par1;
-- *par2=nextevent[ntrack].ev.par2;
-- *midich=nextevent[ntrack].ev.channel;
-+ *type=nextevent[(int)ntrack].ev.type;
-+ *par1=nextevent[(int)ntrack].ev.par1;
-+ *par2=nextevent[(int)ntrack].ev.par2;
-+ *midich=nextevent[(int)ntrack].ev.channel;
-
-
-- double dt=nextevent[ntrack].ev.deltatime*0.0001*realplayspeed;
-- printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[ntrack].ev.deltatime);
-- nextevent[ntrack].time+=dt;
-+ double dt=nextevent[(int)ntrack].ev.deltatime*0.0001*realplayspeed;
-+ printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[(int)ntrack].ev.deltatime);
-+ nextevent[(int)ntrack].time+=dt;
-
--// printf("%f - %d %d \n",nextevent[ntrack].time,par1,par2);
-+// printf("%f - %d %d \n",nextevent[(int)ntrack].time,par1,par2);
- return(0);//?? sau 1
- };
-
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch
deleted file mode 100644
index 829cb5cf3383..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-sanitize_makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile ZynAddSubFX-2.1.1/src/Makefile
---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile 2004-09-30 15:57:48.000000000 -0500
-+++ ZynAddSubFX-2.1.1/src/Makefile 2004-10-13 02:50:11.923823045 -0500
-@@ -63,7 +63,6 @@
- .PHONY: subdirs $(SUBDIRS)
-
- all:
-- yes " " | head
- $(MAKE) -C UI $@
- # @sh -c "cd UI ; $(CXX) -MM -MG -w *.cc >> ../Make.deps ; cd .."
- @for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done