From 910486d2112b3af32019415d09bc86156cb8a52b Mon Sep 17 00:00:00 2001 From: Santhosh Raju Date: Wed, 14 Jul 2021 08:26:45 +0530 Subject: [PATCH] audio/din: Update distinfo due to upstream change. - Also include the patches to fix the build. --- audio/din/distinfo | 6 +++--- audio/din/files/patch-src_ball.cc | 13 +++++++++++++ audio/din/files/patch-src_modulator.h | 13 +++++++++++++ audio/din/files/patch-src_mondrian.cc | 13 +++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 audio/din/files/patch-src_ball.cc create mode 100644 audio/din/files/patch-src_modulator.h create mode 100644 audio/din/files/patch-src_mondrian.cc diff --git a/audio/din/distinfo b/audio/din/distinfo index 7575e7511f813..8c55751959fcf 100644 --- a/audio/din/distinfo +++ b/audio/din/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626083256 -SHA256 (din-51.1.tar.gz) = 783484ef6e13f1e8da7239d02c2c1f13b0c3c6917dbd200441fb227aa6e3a7e8 -SIZE (din-51.1.tar.gz) = 3700738 +TIMESTAMP = 1626222892 +SHA256 (din-51.1.tar.gz) = 4cdeebba091a8ed298840ccdecf204089d8481c5599bbd8bd526f3466a728e7c +SIZE (din-51.1.tar.gz) = 3700748 diff --git a/audio/din/files/patch-src_ball.cc b/audio/din/files/patch-src_ball.cc new file mode 100644 index 0000000000000..c786baad8a953 --- /dev/null +++ b/audio/din/files/patch-src_ball.cc @@ -0,0 +1,13 @@ +Fixes the redeclaration error. float vs const float. + +--- src/ball.cc.orig 2021-07-12 10:55:38 UTC ++++ src/ball.cc +@@ -14,7 +14,7 @@ + using namespace std; + + extern mondrian mondrian0; +-extern float PI_BY_180; ++extern const float PI_BY_180; + extern float TWO_PI; + extern int TRAILSIZE; + diff --git a/audio/din/files/patch-src_modulator.h b/audio/din/files/patch-src_modulator.h new file mode 100644 index 0000000000000..3f582d51c6cc5 --- /dev/null +++ b/audio/din/files/patch-src_modulator.h @@ -0,0 +1,13 @@ +Fixes the redeclaration error. float vs const float. + +--- src/modulator.h.orig 2021-07-12 11:03:15 UTC ++++ src/modulator.h +@@ -70,7 +70,7 @@ struct autorotator { + inline void setdeg (float d) { + deg = d; + if (deg < 0.0f) deg = 0.0f; +- extern float PI_BY_180; ++ extern const float PI_BY_180; + angle.persec = deg * PI_BY_180; + } + diff --git a/audio/din/files/patch-src_mondrian.cc b/audio/din/files/patch-src_mondrian.cc new file mode 100644 index 0000000000000..18620eac5a2f9 --- /dev/null +++ b/audio/din/files/patch-src_mondrian.cc @@ -0,0 +1,13 @@ +Fixes the redeclaration error. float vs const float. + +--- src/mondrian.cc.orig 2021-07-12 13:10:37 UTC ++++ src/mondrian.cc +@@ -42,7 +42,7 @@ extern gotog _gotomax; + extern int quit; + extern beat2value octave_shift; + extern float GOLDEN_RATIO; +-extern float PI_BY_180; ++extern const float PI_BY_180; + extern int IPS; + extern std::map INTERVALS; + extern oscilloscope scope;