version bump, make it build with fltk 1.3

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

6 files changed, 188 insertions, 7 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index ec55371ae67e..ca0ac2db7f60 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/zynaddsubfx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.35 2009/09/04 07:56:17 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.36 2011/02/26 20:46:15 aballier Exp $
+
+*zynaddsubfx-2.4.1 (26 Feb 2011)
+
+  26 Feb 2011; Alexis Ballier <aballier@gentoo.org> +zynaddsubfx-2.4.1.ebuild,
+  +files/zynaddsubfx-2.4.1-docs.patch, +files/zynaddsubfx-2.4.1-fltk.patch,
+  +files/zynaddsubfx-2.4.1-fltk13.patch:
+  version bump, make it build with fltk 1.3
 
   04 Sep 2009; Alexis Ballier <aballier@gentoo.org>
   zynaddsubfx-2.4.0.ebuild, +files/zynaddsubfx-2.4.0-nullmidiin.patch:
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index f8839bcb7477..cdee2cec3868 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -4,17 +4,22 @@ Hash: SHA1
 AUX zynaddsubfx-2.4.0-ldflags.patch 462 RMD160 f1f32bb7808b03a2aca7ac8f5e0b857077bed2eb SHA1 057cd2d4a9e3252589bb22320319fa40a3d8a7f4 SHA256 d3dac5ee2ef086af35bf1cab6880b7792fb65ae5c2e652f56cb84682708aaa9c
 AUX zynaddsubfx-2.4.0-nullmidiin.patch 1130 RMD160 45e126303f72c4ea4a1b77a2f515eee0828b313b SHA1 50099c1c2c10a6cddd28f476fba50205d250b84b SHA256 d7affb50fc2146c7fde21770359057ff60bfe98e021684ce8b366bb39af9ca9c
 AUX zynaddsubfx-2.4.0-string.patch 819 RMD160 e96db048d3b3c95df0103206a8091d90126b5df4 SHA1 911c56e9c704d41ad0a2343cc74ad0a45effdf2c SHA256 ac2335d4d7deeed23f0b3a879367fd1c811c13e5cf5b5707254f803565e7a215
+AUX zynaddsubfx-2.4.1-docs.patch 420 RMD160 4a47f9fbcd150c19e8e0cb208694cf82e998e5a3 SHA1 ff748a72f2bbac27a4117052ddfb4fb2287fb038 SHA256 379c61a8f911d4794f3369f5b12b46142b46fb771d2cd2877e220c33e6891ec2
+AUX zynaddsubfx-2.4.1-fltk.patch 1492 RMD160 4abefa4db84b5a7663cc4e97e2d119db19773159 SHA1 2a4a8c4eb23bd5093c68a6fcf3f4d5afb5a81c58 SHA256 b4fab50f4fd3f91d655e9c613973b2a50750b73577044301cf6b7017d0714c47
+AUX zynaddsubfx-2.4.1-fltk13.patch 1978 RMD160 9a81931bc5d9fefb045c2d09e29b21f22b2cbbd8 SHA1 a91a54d02e65e271bde6c3b4fca5d66c92cc33a8 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22
 DIST ZynAddSubFX-2.2.1.tar.bz2 927022 RMD160 d21b7988182d2cf9a9c8ee873e708adec33e40fc SHA1 d49294b5e27d4b5a5aad106b0239ef273b583b88 SHA256 dab5dc86e0a2459fa2a870da133c7dda0aa2e1d895839594f4b520ca05cc80d2
 DIST ZynAddSubFX-2.4.0.tar.bz2 1418352 RMD160 a490b7ee3134c9a912d475f07e1e485d8fac578f SHA1 e253e99399590ef2ff7f276f720dc367e2864f10 SHA256 7675a7ac7741dcfce0bed197e2190f2e21b5b0a072458bcb605184b7be246c63
+DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 RMD160 b0cf8e16e17d5db2d2c1976c2c69f8abdf753b13 SHA1 5abffff4ff2710dc427c4888a167c8f8a74d7c7e SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
 EBUILD zynaddsubfx-2.2.1-r2.ebuild 2072 RMD160 50a4a2559c2605248196912285ada0bbe70f932f SHA1 958bebfddaeb427307972e66aef850926a212f69 SHA256 22933b444613e169d76e21d88ee86e9dbe5bbd2581cf7cf21d9c346ea773472b
 EBUILD zynaddsubfx-2.2.1-r4.ebuild 2373 RMD160 c345e41fa2ed6d0f0ab882e3995bd399771db7f5 SHA1 94b9218d32e806ed13f224427ba577f7279d85e6 SHA256 5adb5a647e35474bc704ea8b371dd046cc128005bfcd0cd8f89abd9f3d50dc40
 EBUILD zynaddsubfx-2.4.0.ebuild 2858 RMD160 35b251236762de40ba4f968ec321df9449424de6 SHA1 1339d4fa017534d9869b1c2b3f8cbb04a1bc0a05 SHA256 62287199331447fd68780499ef3bcb03725760bf7bbea6ce0df1e6979c658812
-MISC ChangeLog 6124 RMD160 e52d02bae75025681c71004cc8128c286c3cb793 SHA1 6d16285d66b36068a68a8ce3ae544d4144552674 SHA256 8ef4cd8bcc9b23edb91dba3c98926a2b92aab131859de0b9e3fb6102b08af00c
+EBUILD zynaddsubfx-2.4.1.ebuild 1798 RMD160 38897ac52b90fa8263f088ac7d9828a420e7a2b7 SHA1 db55ec4e5f6f2aac7951b9b164f2217f9498afc9 SHA256 60a11dcf7aa00f9e65d19876896ff96ff9d6e016c99027c6a11308bb58332532
+MISC ChangeLog 6399 RMD160 af7dbb2ebc93e06668fed9405d29a26edd004891 SHA1 5fda89e40d55f1782dcc5d8840221ad76e690b56 SHA256 5e4e5028c83c735f9cd55bce901a495ed2066af8ad2af129f1e4f22faf21c4e4
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkqgyCYACgkQvFcC4BYPU0rrRQCfQsgEZwOUkFFeuNpwEdV32Hr8
-8YkAnjglSqisiFsrB18T3k4hrH2Yb2Nd
-=Leu0
+iEYEARECAAYFAk1pZp0ACgkQvFcC4BYPU0oFRQCggu1TS7ZeOWbdEqaVuzBWjSed
+Y3EAoIKS3gL4JiIF8PKi4OiaXs19M2dd
+=+fxm
 -----END PGP SIGNATURE-----
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
new file mode 100644
index 000000000000..587e4a4219a9
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
@@ -0,0 +1,12 @@
+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
+-	)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
new file mode 100644
index 000000000000..38446d7e11ca
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
@@ -0,0 +1,38 @@
+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)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
new file mode 100644
index 000000000000..72fa30a68145
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
@@ -0,0 +1,58 @@
+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 {} {
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
new file mode 100644
index 000000000000..6ed3586b4fa2
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild,v 1.1 2011/02/26 20:46:15 aballier Exp $
+
+EAPI=4
+inherit eutils cmake-utils
+
+MY_P=ZynAddSubFX-${PV}
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="alsa +fltk jack lash"
+
+RDEPEND="
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=dev-libs/mini-xml-2.2.1
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	fltk? ( >=x11-libs/fltk-1.1.2:1.1 )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-fltk.patch"
+	"${FILESDIR}/${P}-fltk13.patch"
+	"${FILESDIR}/${P}-docs.patch"
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}/src/CMakeLists.txt"
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto "/usr/share/${PN}"
+	doins -r "${S}/banks" "${S}/examples" || die
+}