[gentoo-commits] gentoo-x86 commit in media-sound/zynaddsubfx/files: zynaddsubfx-2.4.1-fltk.patch zynaddsubfx-2.4.1-docs.patch zynaddsubfx-2.4.1-fltk13.patch

[Alexis Ballier (aballier)]

aballier    11/02/26 20:46:15

  Added:                zynaddsubfx-2.4.1-fltk.patch
                        zynaddsubfx-2.4.1-docs.patch
                        zynaddsubfx-2.4.1-fltk13.patch
  Log:
  version bump, make it build with fltk 1.3
  
  (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch?rev=1.1&content-type=text/plain

Index: zynaddsubfx-2.4.1-fltk.patch
===================================================================
Index: ZynAddSubFX-2.4.1/src/CMakeLists.txt
===================================================================
--- ZynAddSubFX-2.4.1.orig/src/CMakeLists.txt
+++ ZynAddSubFX-2.4.1/src/CMakeLists.txt
@@ -96,24 +96,7 @@ if(FltkGui)
     #message(STATUS "FLTK_LIBRARIES: ${FLTK_LIBRARIES}")
     #message(STATUS "FLTK_MATH_LIBRARY: ${FLTK_MATH_LIBRARY}")
 
-    #UGLY WORKAROUND
-    find_program (MYFLTK_CONFIG fltk-config)
-    if (MYFLTK_CONFIG)
-        execute_process (COMMAND ${MYFLTK_CONFIG} --ldflags OUTPUT_VARIABLE MYFLTK_LDFLAGS)
-        string(STRIP ${MYFLTK_LDFLAGS} MYFLTK_LIBRARIES)
-    endif()
-    mark_as_advanced(FORCE FLTK_BASE_LIBRARY)
-    mark_as_advanced(FORCE FLTK_CONFIG_SCRIPT)
-    mark_as_advanced(FORCE FLTK_DIR)
-    mark_as_advanced(FORCE FLTK_FLUID_EXECUTABLE)
-    mark_as_advanced(FORCE FLTK_FORMS_LIBRARY)
-    mark_as_advanced(FORCE FLTK_GL_LIBRARY)
-    mark_as_advanced(FORCE FLTK_IMAGES_LIBRARY)
-    mark_as_advanced(FORCE FLTK_INCLUDE_DIR)
-    mark_as_advanced(FORCE FLTK_MATH_LIBRARY)
-
-
-    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${MYFLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
+    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
     add_definitions(-DFLTK_GUI)
 
     message(STATUS "Will build fltk gui")
@@ -121,6 +104,7 @@ if(FltkGui)
 	include_directories(
 			"${CMAKE_CURRENT_SOURCE_DIR}/UI"
 			"${CMAKE_CURRENT_BINARY_DIR}/UI"
+                        ${FLTK_INCLUDE_DIR}
 			)
 
 	add_subdirectory(UI)



1.1                  media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch?rev=1.1&content-type=text/plain

Index: zynaddsubfx-2.4.1-docs.patch
===================================================================
Index: ZynAddSubFX-2.4.1/CMakeLists.txt
===================================================================
--- ZynAddSubFX-2.4.1.orig/CMakeLists.txt
+++ ZynAddSubFX-2.4.1/CMakeLists.txt
@@ -5,7 +5,3 @@ project(zynaddsubfx)
 enable_testing()
 #Currently the only directory that uses cmake
 add_subdirectory(src)
-
-install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
-	DESTINATION share/doc/zynaddsubfx
-	)



1.1                  media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch?rev=1.1&content-type=text/plain

Index: zynaddsubfx-2.4.1-fltk13.patch
===================================================================
Sounds hackish but that's the only way I found to force it to generate the
functions in the .cxx files with fluid 1.3...

Index: ZynAddSubFX-2.4.1/src/UI/BankUI.fl
===================================================================
--- ZynAddSubFX-2.4.1.orig/src/UI/BankUI.fl
+++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl
@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub
 
 class BankProcess_ {} {
   Function {process()} {open return_type {virtual void}
-  } {}
+  } {code{;}}
   decl {Bank *bank;} {public
   }
 } 
Index: ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
===================================================================
--- ZynAddSubFX-2.4.1.orig/src/UI/OscilGenUI.fl
+++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
@@ -129,7 +129,7 @@ delete [] spc;} {selected
 
 class PSlider {: {public Fl_Slider}
 } {
-  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
+  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
   Function {handle(int event)} {return_type int
   } {
     code {int X=x(),Y=y(),W=w(),H=h();
Index: ZynAddSubFX-2.4.1/src/UI/PartUI.fl
===================================================================
--- ZynAddSubFX-2.4.1.orig/src/UI/PartUI.fl
+++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl
@@ -85,7 +85,7 @@ end();} {}
 
 class PartUI_ {} {
   Function {showparameters(int kititem,int engine)} {return_type virtual
-  } {}
+  } {code{;}}
 } 
 
 class PartKitItem {: {public Fl_Group}
Index: ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
===================================================================
--- ZynAddSubFX-2.4.1.orig/src/UI/PresetsUI.fl
+++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {
 
 class PresetsUI_ {} {
   Function {refresh()} {open return_type {virtual void}
-  } {}
+  } {code{;}}
   Function {~PresetsUI_()} {open return_type virtual
-  } {}
+  } {code{;}}
 } 
 
 class PresetsUI {} {