[pkgsrc/trunk]: pkgsrc/audio/spiralloops Make SpiralLoops build with FLTK 1.1...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e1bbc33f060
branches:  trunk
changeset: 468570:3e1bbc33f060
user:      ben <ben%pkgsrc.org@localhost>
date:      Sun Feb 15 05:13:53 2004 +0000

description:
Make SpiralLoops build with FLTK 1.1.x as well as 1.0.x.

diffstat:

 audio/spiralloops/distinfo         |   6 +++---
 audio/spiralloops/patches/patch-am |  11 ++++++++++-
 audio/spiralloops/patches/patch-ao |  20 +++++++++++++++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diffs (72 lines):

diff -r c982b05fc63b -r 3e1bbc33f060 audio/spiralloops/distinfo
--- a/audio/spiralloops/distinfo        Sun Feb 15 04:14:04 2004 +0000
+++ b/audio/spiralloops/distinfo        Sun Feb 15 05:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/12/19 16:37:54 ben Exp $
+$NetBSD: distinfo,v 1.6 2004/02/15 05:13:53 ben Exp $
 
 SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72
 Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes
@@ -14,7 +14,7 @@
 SHA1 (patch-aj) = 19c1d640a0c9ec3f6f873cd203c9c61e89eb824a
 SHA1 (patch-ak) = 94e4650bc10a7073718a83b27ab47e217cf15f85
 SHA1 (patch-al) = 2189bef16fa9099497667fdfd7b5e54c4fc4bb48
-SHA1 (patch-am) = acf0ff58a76e4e2f813ef17e431012af84cc9e8b
+SHA1 (patch-am) = 25fdb4422dd007d7ebee50a3fb2e2accc72b275b
 SHA1 (patch-an) = f86cb89933e7c1a57d696283e398a40a579c04f1
-SHA1 (patch-ao) = fd5599e331b0966cdf85cf7ad9a7b7fd030827e9
+SHA1 (patch-ao) = f7cd4b43793deeda0231288ca3c7455349d4e64e
 SHA1 (patch-ap) = adde17445fa15afa122dc1addf0c06f6504bef0c
diff -r c982b05fc63b -r 3e1bbc33f060 audio/spiralloops/patches/patch-am
--- a/audio/spiralloops/patches/patch-am        Sun Feb 15 04:14:04 2004 +0000
+++ b/audio/spiralloops/patches/patch-am        Sun Feb 15 05:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1 2003/12/19 16:37:54 ben Exp $
+$NetBSD: patch-am,v 1.2 2004/02/15 05:13:53 ben Exp $
 
 --- GUI/Widgets/Fl_Knob.cxx.orig       2001-04-19 13:48:10.000000000 -0700
 +++ GUI/Widgets/Fl_Knob.cxx
@@ -11,3 +11,12 @@
    a1 = 35;
        a2 = 325;
        _type = DOTLIN;
+@@ -40,7 +40,7 @@ unsigned char rr,gg,bb;
+       int dam = damage();
+       if (dam & FL_DAMAGE_ALL)
+       {
+-              int col = parent()->color();
++              int col = color();
+               fl_color(col);
+               fl_rectf(ox,oy,side,side);
+               Fl::get_color((Fl_Color)col,rr,gg,bb);
diff -r c982b05fc63b -r 3e1bbc33f060 audio/spiralloops/patches/patch-ao
--- a/audio/spiralloops/patches/patch-ao        Sun Feb 15 04:14:04 2004 +0000
+++ b/audio/spiralloops/patches/patch-ao        Sun Feb 15 05:13:53 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1 2003/12/19 16:37:54 ben Exp $
+$NetBSD: patch-ao,v 1.2 2004/02/15 05:13:53 ben Exp $
 
 --- GUI/Widgets/Fl_LED_Button.cxx.orig 2001-04-19 13:48:11.000000000 -0700
 +++ GUI/Widgets/Fl_LED_Button.cxx
@@ -11,3 +11,21 @@
    box(FL_NO_BOX);
        down_box(FL_ROUND_DOWN_BOX);
        selection_color(FL_RED);
+@@ -15,7 +15,7 @@ Fl_LED_Button::~Fl_LED_Button() {
+ void Fl_LED_Button::draw() {
+   uchar r,g,b;
+ 
+-      if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
++      if (box()) draw_box(this==Fl::pushed() ? fl_down(box()) : box(), color());
+       Fl_Color col = value() ? selection_color() : color();
+       Fl::get_color((Fl_Color)selection_color(),r,g,b);
+       int d = h()/6;
+@@ -25,7 +25,7 @@ void Fl_LED_Button::draw() {
+       int y1 = y()+d+3;
+       int ww = W-2*d-6;
+       int hh = W-2*d-6;
+-      Fl::get_color(parent()->color(),r,g,b);
++      Fl::get_color(color(),r,g,b);
+       modulate(-90,r,g,b);
+       fl_pie(x1-1,y1-1,ww+2,hh+2,0,360);
+       Fl::get_color((Fl_Color)selection_color(),r,g,b);