From 0d2ecf45181dce12bf57878ee678b2bd69330c19 Mon Sep 17 00:00:00 2001 From: Zbigniew Baniewski Date: Thu, 19 Feb 2015 18:34:15 +0700 Subject: [PATCH] audio/yoshimi: Updated for version 1.3.2. Signed-off-by: Willy Sudiarto Raharjo --- audio/yoshimi/0001-Fix-for-fltk-1.3.patch | 54 +++++++++++++++++++++++ audio/yoshimi/yoshimi.SlackBuild | 4 +- audio/yoshimi/yoshimi.info | 8 ++-- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 audio/yoshimi/0001-Fix-for-fltk-1.3.patch diff --git a/audio/yoshimi/0001-Fix-for-fltk-1.3.patch b/audio/yoshimi/0001-Fix-for-fltk-1.3.patch new file mode 100644 index 0000000000..22568fcbcf --- /dev/null +++ b/audio/yoshimi/0001-Fix-for-fltk-1.3.patch @@ -0,0 +1,54 @@ +From 86532198f0467c6d29090ce7ad95bcb36cd697f6 Mon Sep 17 00:00:00 2001 +From: Andrew Deryabin +Date: Tue, 3 Feb 2015 06:08:57 +0000 +Subject: [PATCH 1/2] Fix for fltk < 1.3 + +--- + src/main.cpp | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +diff --git a/src/main.cpp b/src/main.cpp +index ab995ad..18a36d2 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -30,6 +30,8 @@ using namespace std; + #include + #include + #include ++#include ++#include + + #include + #include +@@ -97,10 +99,27 @@ static void *mainGuiThread(void *arg) + + map::iterator it; + fl_register_images(); ++#if (FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION < 3) ++ char *fname = tmpnam(NULL); ++ if(fname) ++ { ++ FILE *f = fopen(fname, "wb"); ++ if(f) ++ { ++ fwrite(yoshimi_logo_png, sizeof(yoshimi_logo_png), 1, f); ++ fclose(f); ++ } ++ } ++ Fl_PNG_Image pix(fname); ++ if(fname) ++ unlink(fname); ++#else ++ Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); ++#endif + Fl_Window winSplash(400, 300, "yoshimi splash screen"); + Fl_Box box(0, 0, 400,300); + //Fl_Pixmap pix(yoshimi_logo); +- Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); ++ + box.image(pix); + Fl_Box boxLb(10, 300-30, 400-20, 30); + boxLb.box(FL_NO_BOX); +-- +2.2.2 + diff --git a/audio/yoshimi/yoshimi.SlackBuild b/audio/yoshimi/yoshimi.SlackBuild index e8e909eda4..9108177be7 100644 --- a/audio/yoshimi/yoshimi.SlackBuild +++ b/audio/yoshimi/yoshimi.SlackBuild @@ -5,7 +5,7 @@ # Written by Zbigniew Baniewski, PRGNAM=yoshimi -VERSION=${VERSION:-1.2.5} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,6 +51,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +cat $CWD/0001-Fix-for-fltk-1.3.patch | patch -p1 + cd src # Both "DDefaultAudio/Midi..." lines can be removed for default JACK audio/MIDI cmake \ diff --git a/audio/yoshimi/yoshimi.info b/audio/yoshimi/yoshimi.info index 93024fb5b2..6635219915 100644 --- a/audio/yoshimi/yoshimi.info +++ b/audio/yoshimi/yoshimi.info @@ -1,10 +1,10 @@ PRGNAM="yoshimi" -VERSION="1.2.5" +VERSION="1.3.2" HOMEPAGE="http://yoshimi.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/yoshimi/1.1/yoshimi-1.2.5.tar.bz2" -MD5SUM="068e32213a17047330d1594218de1e48" +DOWNLOAD="http://downloads.sourceforge.net/yoshimi/1.1/yoshimi-1.3.2.tar.bz2" +MD5SUM="48aefa60c1f451b6ea39a4a36583f8ab" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="mxml fltk jack-audio-connection-kit" +REQUIRES="mxml fltk lv2 jack-audio-connection-kit" MAINTAINER="Zbigniew Baniewski" EMAIL="Zbigniew [dot] Baniewski [at] gmail [dot] com"