[SCM] zynaddsubfx/master: Remove patches applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Wed Jun 15 07:41:36 UTC 2016
The following commit has been merged in the master branch:
commit 49e84c432da2ac9a80b237527e7a394f8075aff2
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Wed Jun 15 08:57:11 2016 +0200
Remove patches applied upstream.
diff --git a/debian/patches/0001-no_sse_generic.patch b/debian/patches/0001-no_sse_generic.patch
deleted file mode 100644
index 34d95ea..0000000
--- a/debian/patches/0001-no_sse_generic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Stop forcing SSE and x86 compiler options in the generic target.
-Author: Adam Conrad <adconrad at ubuntu.com>
-Forwarded: no
----
- src/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-Index: zynaddsubfx/src/CMakeLists.txt
-===================================================================
---- zynaddsubfx.orig/src/CMakeLists.txt
-+++ zynaddsubfx/src/CMakeLists.txt
-@@ -161,7 +161,7 @@ set (BuildOptions_X86_64Core2
- )
-
- set (BuildOptionsBasic
-- "-std=c++11 -Wno-unused-parameter -O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
-+ "-std=c++11 -Wno-unused-parameter -O3 -ffast-math -fomit-frame-pointer"
- CACHE STRING "basic X86 complier options"
- )
-
diff --git a/debian/patches/0002-misspellings.patch b/debian/patches/0002-misspellings.patch
deleted file mode 100644
index 5a7244b..0000000
--- a/debian/patches/0002-misspellings.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Fix small misspellings.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: mark.d.mccurry at gmail.com
----
- src/UI/ADnoteUI.fl | 2 +-
- src/UI/PADnoteUI.fl | 2 +-
- src/UI/SUBnoteUI.fl | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: zynaddsubfx/src/UI/ADnoteUI.fl
-===================================================================
---- zynaddsubfx.orig/src/UI/ADnoteUI.fl
-+++ zynaddsubfx/src/UI/ADnoteUI.fl
-@@ -580,7 +580,7 @@ o->redraw();}
- }
- Fl_Dial fixedfreqetdial {
- label {Eq.T.}
-- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {405 270 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-+ tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {405 270 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
- code0 {o->init("PfixedfreqET");}
- class Fl_Osc_Dial
- }
-Index: zynaddsubfx/src/UI/PADnoteUI.fl
-===================================================================
---- zynaddsubfx.orig/src/UI/PADnoteUI.fl
-+++ zynaddsubfx/src/UI/PADnoteUI.fl
-@@ -719,7 +719,7 @@ cbwidget->do_callback();}
- }
- Fl_Dial fixedfreqetdial {
- label {Eq.T.}
-- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {420 295 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-+ tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {420 295 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
- code0 {o->init("PfixedfreqET");}
- class Fl_Osc_Dial
- }
-Index: zynaddsubfx/src/UI/SUBnoteUI.fl
-===================================================================
---- zynaddsubfx.orig/src/UI/SUBnoteUI.fl
-+++ zynaddsubfx/src/UI/SUBnoteUI.fl
-@@ -297,7 +297,7 @@ freqsettingsui->redraw();}
- }
- Fl_Dial fixedfreqetdial {
- label {Eq.T.}
-- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {610 53 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-+ tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {610 53 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
- code0 {o->init("PfixedfreqET");}
- class Fl_Osc_Dial
- }
-Index: zynaddsubfx/src/main.cpp
-===================================================================
---- zynaddsubfx.orig/src/main.cpp
-+++ zynaddsubfx/src/main.cpp
-@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
- << " -a , --auto-connect\t\t\t AutoConnect when using JACK\n"
- << " -p , --pid-in-client-name\t\t Append PID to (JACK) "
- "client name\n"
-- << " -P , --prefered-port\t\t\t Prefered OSC Port\n"
-+ << " -P , --preferred-port\t\t\t Preferred OSC Port\n"
- << " -O , --output\t\t\t\t Set Output Engine\n"
- << " -I , --input\t\t\t\t Set Input Engine\n"
- << " -e , --exec-after-init\t\t Run post-initialization script\n"
diff --git a/debian/patches/0004-fix_build.patch b/debian/patches/0004-fix_build.patch
deleted file mode 100644
index 5f8cc09..0000000
--- a/debian/patches/0004-fix_build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix build.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: zynaddsubfx/src/UI/guimain.cpp
-===================================================================
---- zynaddsubfx.orig/src/UI/guimain.cpp
-+++ zynaddsubfx/src/UI/guimain.cpp
-@@ -568,7 +568,7 @@ int main(int argc, char *argv[])
- help = true;
-
- if(help) {
-- printf(help_message);
-+ puts(help_message);
- return 1;
- }
-
diff --git a/debian/patches/0005-desktop_files.patch b/debian/patches/0005-desktop_files.patch
deleted file mode 100644
index f558993..0000000
--- a/debian/patches/0005-desktop_files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Add keywords to desktop files.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: mark.d.mccurry at gmail.com
-
-Index: zynaddsubfx/zynaddsubfx-alsa.desktop
-===================================================================
---- zynaddsubfx.orig/zynaddsubfx-alsa.desktop
-+++ zynaddsubfx/zynaddsubfx-alsa.desktop
-@@ -2,6 +2,7 @@
- Name=ZynAddSubFX - Alsa
- Comment=A powerful realtime software synthesizer
- Comment[fr]=Un synthétiseur logiciel temps-réel puissant
-+Keywords=audio;sound;alsa;midi;synth;synthesizer
- Exec=zynaddsubfx -I alsa -O alsa
- Icon=zynaddsubfx
- Terminal=false
-Index: zynaddsubfx/zynaddsubfx-jack.desktop
-===================================================================
---- zynaddsubfx.orig/zynaddsubfx-jack.desktop
-+++ zynaddsubfx/zynaddsubfx-jack.desktop
-@@ -2,6 +2,7 @@
- Name=ZynAddSubFX - Jack
- Comment=A powerful realtime software synthesizer
- Comment[fr]=Un synthétiseur logiciel temps-réel puissant
-+Keywords=audio;sound;jack;midi;synth;synthesizer
- Exec=zynaddsubfx -I jack -O jack
- Icon=zynaddsubfx
- Terminal=false
diff --git a/debian/patches/0006-misspeling-2.patch b/debian/patches/0006-misspeling-2.patch
deleted file mode 100644
index 78701a1..0000000
--- a/debian/patches/0006-misspeling-2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Fix small misspellings.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: mark.d.mccurry at gmail.com
-
-Index: zynaddsubfx/doc/IT/03-lfo_IT.txt
-===================================================================
---- zynaddsubfx.orig/doc/IT/03-lfo_IT.txt
-+++ zynaddsubfx/doc/IT/03-lfo_IT.txt
-@@ -35,7 +35,7 @@ image:images/lfo2.png[]
-
- Altri parametri sono:
-
--* *Continous mode*: Se si utilizza questa modalità, l'LFO non partirà da "zero"
-+* *Continuous mode*: Se si utilizza questa modalità, l'LFO non partirà da "zero"
- ad ogni nuova nota, ma sarà continuo. E' molto utile applicato sui filtri, per
- fare interessanti 'sweeps'.
- * *Stretch*: Controlla quanto la frequenza dell'LFO cambia in base alla frequenza
-@@ -60,5 +60,5 @@ Se questo knob è al valore più basso,
- * *Delay*: LFO Delay
- * *A.R.*: LFO Amplitude Randomnes
- * *F.R.*: LFO Frequency Randomness
--* *C.*: LFO Continous Mode
-+* *C.*: LFO Continuous Mode
- * *Str.*: LFO Stretch - Nell'immagine sopra LFO Stretch è impostato a zero
-Index: zynaddsubfx/doc/lfo.txt
-===================================================================
---- zynaddsubfx.orig/doc/lfo.txt
-+++ zynaddsubfx/doc/lfo.txt
-@@ -38,7 +38,7 @@ image:images/lfo2.png[]
-
- Other parameters are:
-
--* *Continous mode*: If this mode is used, the LFO will not start from "zero" on each new note, but it will be continuous. This is very useful if you apply on filters to make interesting sweeps.
-+* *Continuous mode*: If this mode is used, the LFO will not start from "zero" on each new note, but it will be continuous. This is very useful if you apply on filters to make interesting sweeps.
- * *Stretch*: It controls how much the LFO frequency changes according to the
- note's frequency.
- It can vary from negative stretch (the LFO frequency is decreased on higher
-@@ -61,5 +61,5 @@ If this knob is at the lowest value, the
- * *Delay*: LFO Delay
- * *A.R.*: LFO Amplitude Randomness
- * *F.R.*: LFO Frequency Randomness
--* *C.*: LFO Continous Mode
-+* *C.*: LFO Continuous Mode
- * *Str.*: LFO Stretch - in the image above the LFO stretch is set to zero
-Index: zynaddsubfx/src/UI/LFOUI.fl
-===================================================================
---- zynaddsubfx.orig/src/UI/LFOUI.fl
-+++ zynaddsubfx/src/UI/LFOUI.fl
-@@ -134,7 +134,7 @@ hide();} {}
- }
- Fl_Check_Button continous {
- label {C.}
-- tooltip {Continous LFO} xywh {165 35 15 15} down_box DOWN_BOX labelsize 10 align 2
-+ tooltip {Continuous LFO} xywh {165 35 15 15} down_box DOWN_BOX labelsize 10 align 2
- code0 {o->init("Pcontinous");}
- class Fl_Osc_Check
- }
-Index: zynaddsubfx/src/UI/PADnoteUI.fl
-===================================================================
---- zynaddsubfx.orig/src/UI/PADnoteUI.fl
-+++ zynaddsubfx/src/UI/PADnoteUI.fl
-@@ -651,7 +651,7 @@ cbwidget->do_callback();}
- xywh {125 125 100 20} labelfont 1 labelsize 11
- }
- MenuItem {} {
-- label Continous
-+ label Continuous
- xywh {115 115 100 20} labelfont 1 labelsize 11
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 85cdc9c..3061f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-0001-no_sse_generic.patch
-0002-misspellings.patch
0003-dont_duplicate_changelog_files.patch
-0004-fix_build.patch
-0005-desktop_files.patch
-0006-misspeling-2.patch
--
zynaddsubfx packaging
More information about the pkg-multimedia-commits
mailing list