zynaddsubfx: bump + DSSI + LASH

zynaddsubfx/PKGBUILD

@@ -1,32 +1,27 @@
 # Maintainer: Daniele Cocca <jmc@chakra-project.org>
+# Contributor: Ernesto Manríquez <alejandronova@gmail.com>
 
 _pkgname=ZynAddSubFX
 pkgname=zynaddsubfx
-pkgver=2.4.1
+pkgver=2.4.3
-pkgrel=3
+pkgrel=1
-pkgdesc="Open source software synthesizer capable of making a countless number of instruments, from some common heard from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds."
+pkgdesc="Open source additive and substractive software synthesizer, with an integrated effect engine."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://zynaddsubfx.sourceforge.net/"
 license=('GPL2')
-depends=('fftw' 'mxml' 'zlib' 'fltk')
+depends=('fftw' 'mxml' 'zlib' 'fltk' 'lash' 'dssi')
 makedepends=('oss' 'jack')
 source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.bz2"
-        'gentoo-zynaddsubfx-2.4.1-docs.patch'
+        'gentoo-zynaddsubfx-2.4.1-docs.patch')
-        'gentoo-zynaddsubfx-2.4.1-fltk.patch'
-        'gentoo-zynaddsubfx-2.4.1-fltk13.patch')
 categories=('multimedia')
-md5sums=('59eb69ce24d6f8c605f8ba43958d0526'
+sha256sums=('b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d'
-         '1cc79aea2033fab472f35a5fec60167e'
+            '379c61a8f911d4794f3369f5b12b46142b46fb771d2cd2877e220c33e6891ec2')
-         'eb95d339ff5deac8c6b54965f04a8c60'
-         '49464a33ab9c4250520eda0df7705663')
 
 build() {
   # Patch it first
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/gentoo-zynaddsubfx-2.4.1-docs.patch"
-  patch -Np1 -i "${srcdir}/gentoo-zynaddsubfx-2.4.1-fltk.patch"
-  patch -Np1 -i "${srcdir}/gentoo-zynaddsubfx-2.4.1-fltk13.patch"
 
   # Then, prepare the build directory
   cd "${srcdir}"
@@ -39,7 +34,8 @@ build() {
   cmake "${srcdir}/${_pkgname}-${pkgver}" \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DGuiModule=fltk
+        -DGuiModule=fltk \
+        -DDssiEnable=true
   
   make
 }
@@ -50,8 +46,8 @@ package() {
 
   # Also copy the data files...
   install -d -m755 "${pkgdir}/usr/share/${pkgname}"
-  cp -a "${srcdir}/${_pkgname}-${pkgver}/banks" "${pkgdir}/usr/share/${pkgname}"
+  cp -a "${srcdir}/${_pkgname}-${pkgver}/instruments/banks" "${pkgdir}/usr/share/${pkgname}"
-  cp -a "${srcdir}/${_pkgname}-${pkgver}/examples" "${pkgdir}/usr/share/${pkgname}"
+  cp -a "${srcdir}/${_pkgname}-${pkgver}/instruments/examples" "${pkgdir}/usr/share/${pkgname}"
 }
 
 # vim:set ts=2 sw=2 et:

zynaddsubfx/gentoo-zynaddsubfx-2.4.1-fltk.patch

@@ -1,38 +0,0 @@
-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)

zynaddsubfx/gentoo-zynaddsubfx-2.4.1-fltk13.patch

@@ -1,58 +0,0 @@
-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 {} {