Revision: 1983
Author: dominique
Date: 2011-05-24 19:40:30 +0200 (Tue, 24 May 2011)
Log Message:
-----------
Zynnaddsubfx-9999...: removed patches that doesn't apply anymore; added portage
patch for build with fltk-1.3
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2011-05-21
00:38:16 UTC (rev 1982)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2011-05-24
17:40:30 UTC (rev 1983)
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 May 2011: Dominique Michel <[email protected]>
+ * version 9999... removed patch that doesn't apply anymore
+ * added portage patch for build with fltk-1.3
+
13 Jan 2010; Marc-Olivier Barre <[email protected]>
* Fixed jack dependency on jack-audio-connection-kit for version 20070707
* Removed the une of unipatch from version 20070707-r1 which doesn't even
work anymore
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2011-05-21
00:38:16 UTC (rev 1982)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2011-05-24
17:40:30 UTC (rev 1983)
@@ -7,6 +7,7 @@
AUX zyn-jackmidi-051205.diff 3875 RMD160
e672b883641f4035e7afc8fd55192065741dea55 SHA1
e506176f79370a31c3a0de96f857a762d4190dc2 SHA256
eeca9f41cb0c100095c90676b224ba09cc2281132633ad1453f1fd5983dc17f2
AUX zyn-lash-and-jackmidi-051205.diff 16615 RMD160
13ecb81aefaeaf90cedba1861d48b90923cef232 SHA1
c33bf7766c61a582ba7c5080ca2c1f0a223709ac SHA256
90a084a3cba4ee178e3f72c025dc66f6203d0f4f7f841e31eff1a2c2642b24c7
AUX zyn_lash-0.5.0pre0.diff 15848 RMD160
497dd23b05d5a3926b115c858bd684ca2dcedb30 SHA1
55a2dd6af130347c93eda2613179efab1e3ffd9a SHA256
b7abccad463f57c04c80bb7a2f442eb90b6de3d2f30918a6da9c8a742a72fe06
+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-20070707.tar.bz2 206680 RMD160
21ce7ef822f5c34fbf2169e42f222d075a14f70b SHA1
bba926c067e5ab41a1eff00ceae3259a583b3704 SHA256
036482f2aa68fc25b9bd8426032c458dcf46052ab9cde12ab30279126b0db4fa
@@ -16,6 +17,6 @@
EBUILD zynaddsubfx-2.4.0.ebuild 2810 RMD160
0346f423bf50e63fcaf3044499d07c789c0049e3 SHA1
24c7a2703afc7192ed1387030cb9a5531c094816 SHA256
61748bfd4f8654768fb66fb8db358e4bf9a3c0f44db16f3934a406d4a7cfa52f
EBUILD zynaddsubfx-20070707-r1.ebuild 3105 RMD160
476db6add6572c00fd3b5a857ba752d2bb5169cb SHA1
ca037562627db6f8068c627ba10613a87397de0b SHA256
3a3acbeefc9575b440a3b346f2ba9c5bf5104baa641026db1771441ad86a1d02
EBUILD zynaddsubfx-20070707.ebuild 3030 RMD160
9e566c022a824597668f21b4119b86581657211c SHA1
9776d866af998b1b5d4726be4e8cce170c2474a6 SHA256
bbf288c0277aa5c75a7a4696fec86a7f21937e513f6d2bc98ec8cced087d4225
-EBUILD zynaddsubfx-99999999.ebuild 3533 RMD160
17a125ca35213f91c9aed5d78cd01b722f3e6616 SHA1
c7c2182bee208d7ae54813a022cb812bec27c00d SHA256
12a881f3ebb2018270e78a217c789e951a7834d11cbc71d43bcd1fe021fb7a39
-MISC ChangeLog 967 RMD160 7a7eb4271767e6dacea0d1e68651c4702c329503 SHA1
377a0bccda46207a75ec22f5086871b74923bdfc SHA256
5a021b8b98bb35462169ebed25826c950b74c7f969c183e2ba8e7e62fa9c8873
+EBUILD zynaddsubfx-99999999.ebuild 3489 RMD160
350135e32f3d0257cba44de1d34dbab2214bc9b0 SHA1
9a7c85e07962d2082e40eaa1273c920fddc72ab5 SHA256
1b3d187ce9cffd3d1946da1b8f1ffd7aff46790c42427d47775d48aec5af7dbd
+MISC ChangeLog 1135 RMD160 c5cf816dd9d128567f98b9df3a5cde57f9c6e0fa SHA1
d7d4a1a5bf6686b4cc1b4da9e516236b81f5b813 SHA256
61303b6b794e85a63f1e96a07cfb4086f9e0ecccd5a1fb803d4cb14aec80a8fc
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added:
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
2011-05-24 17:40:30 UTC (rev 1983)
@@ -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 {} {
Modified:
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
2011-05-21 00:38:16 UTC (rev 1982)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
2011-05-24 17:40:30 UTC (rev 1983)
@@ -45,10 +45,9 @@
src_unpack() {
cvs_src_unpack
cd "${S}"
+ patcher "${FILESDIR}/zynaddsubfx-2.4.1-fltk13.patch" -a -f
patcher "${FILESDIR}/01-mutex-split.patch" -a -f
patcher "${FILESDIR}/02-ifdef-jackmidi.patch" -a -f
- patcher "${FILESDIR}/03-fix_jackmidi.patch" -a -f
- patcher "${FILESDIR}/fix_jack_midi_api.patch" -a -f
#fixup 01-mutex-split patch
esed_check -i -e 's@\(applyparameters(\)true@\1@g'
src/Params/PADnoteParameters.C
