[SCM] zynaddsubfx/master: Refresh patches
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sun Jul 5 00:12:14 UTC 2015
The following commit has been merged in the master branch:
commit 12240a3b68621270f59a287440ea88d74b0a637c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sun Jul 5 01:35:37 2015 +0200
Refresh patches
diff --git a/debian/patches/0001-no_sse_generic.patch b/debian/patches/0001-no_sse_generic.patch
index 8a43aa9..3cd8bfc 100644
--- a/debian/patches/0001-no_sse_generic.patch
+++ b/debian/patches/0001-no_sse_generic.patch
@@ -5,24 +5,16 @@ 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
-@@ -116,8 +116,8 @@ set (BuildOptions_X86_64Core2
+@@ -143,7 +143,7 @@ set (BuildOptions_X86_64Core2
)
set (BuildOptionsBasic
-- "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
-- CACHE STRING "basic X86 complier options"
-+ "-O3 -ffast-math -fomit-frame-pointer"
-+ CACHE STRING "basic complier options"
+- "-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"
)
- set (BuildOptionsDebug
-@@ -173,7 +173,6 @@ endif()
- include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS})
-
- add_definitions(
-- -DASM_F2I_YES
- -g #TODO #todo put in a better location
- -Wall
- -Wextra
diff --git a/debian/patches/0002-misspellings.patch b/debian/patches/0002-misspellings.patch
index 1e7cdd9..afe17b1 100644
--- a/debian/patches/0002-misspellings.patch
+++ b/debian/patches/0002-misspellings.patch
@@ -7,36 +7,55 @@ Forwarded: no
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
-@@ -481,7 +481,7 @@ if (x==0) fixedfreqetdial->deactivate();
+@@ -487,7 +487,7 @@ o->redraw();}
+ }
Fl_Dial fixedfreqetdial {
label {Eq.T.}
- callback {pars->VoicePar[nvoice].PfixedfreqET=(int) o->value();}
-- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {405 255 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 255 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
- code0 {o->value(pars->VoicePar[nvoice].PfixedfreqET);}
- code1 {if (pars->VoicePar[nvoice].Pfixedfreq==0) o->deactivate();}
- class WidgetPDial
+- 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
-@@ -842,7 +842,7 @@ if (x==0) fixedfreqetdial->deactivate();
+@@ -688,7 +688,7 @@ cbwidget->do_callback();}
+ }
Fl_Dial fixedfreqetdial {
label {Eq.T.}
- callback {pars->PfixedfreqET=(int) o->value();}
- 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->value(pars->PfixedfreqET);}
- code1 {if (pars->Pfixedfreq==0) o->deactivate();}
- class WidgetPDial
+ 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
-@@ -276,7 +276,7 @@ if (x==0) fixedfreqetdial->deactivate();
+@@ -340,7 +340,7 @@ freqsettingsui->redraw();}
+ }
Fl_Dial fixedfreqetdial {
label {Eq.T.}
- callback {pars->PfixedfreqET=(int) o->value();}
-- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {610 45 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 45 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
- code0 {o->value(pars->PfixedfreqET);}
- code1 {if (pars->Pfixedfreq==0) o->deactivate();}
- class WidgetPDial
+- 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
+@@ -365,7 +365,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/03-dont_duplicate_changelog_files.patch b/debian/patches/03-dont_duplicate_changelog_files.patch
index b08c6b0..2a800d8 100644
--- a/debian/patches/03-dont_duplicate_changelog_files.patch
+++ b/debian/patches/03-dont_duplicate_changelog_files.patch
@@ -6,11 +6,12 @@ Index: zynaddsubfx/CMakeLists.txt
===================================================================
--- zynaddsubfx.orig/CMakeLists.txt
+++ zynaddsubfx/CMakeLists.txt
-@@ -8,6 +8,6 @@ include(CTestConfig.cmake)
+@@ -28,7 +28,7 @@ include(CTestConfig.cmake)
#Currently the only directory that uses cmake
add_subdirectory(src)
--install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
-+install(FILES AUTHORS.txt COPYING FAQ.txt README.txt
+-install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.adoc
++install(FILES AUTHORS.txt COPYING FAQ.txt README.adoc
DESTINATION share/doc/zynaddsubfx
)
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
--
zynaddsubfx packaging
More information about the pkg-multimedia-commits
mailing list