reinit the tree, so we can have metadata

2 files changed, 101 insertions, 0 deletions

diff --git a/media-sound/klick/files/klick-0.12.2-gcc6.patch b/media-sound/klick/files/klick-0.12.2-gcc6.patch
new file mode 100644
index 000000000000..c8c07121e497
--- /dev/null
+++ b/media-sound/klick/files/klick-0.12.2-gcc6.patch
@@ -0,0 +1,44 @@
+--- klick-0.12.2/src/metronome_map.hh.old	2016-09-21 22:17:41.364102201 -0400
++++ klick-0.12.2/src/metronome_map.hh	2016-09-21 22:28:50.611858765 -0400
+@@ -48,7 +48,7 @@
+     virtual void timebase_callback(position_t *);
+ 
+   private:
+-    static double const TICKS_PER_BEAT = 1920.0;
++    static double const TICKS_PER_BEAT;
+ 
+     // transport position
+     nframes_t _current;
+--- klick-0.12.2/src/metronome_map.cc.old	2016-09-21 22:27:01.551067088 -0400
++++ klick-0.12.2/src/metronome_map.cc	2016-09-21 22:28:49.027158380 -0400
+@@ -195,3 +195,5 @@
+         p->beats_per_minute = _pos.map_entry().tempi[n];
+     }
+ }
++
++double const MetronomeMap::TICKS_PER_BEAT = 1920.0;
+--- klick-0.12.2/src/metronome_simple.hh.old	2016-09-21 22:18:57.674628602 -0400
++++ klick-0.12.2/src/metronome_simple.hh	2016-09-21 22:29:04.307859355 -0400
+@@ -58,9 +58,9 @@
+ 
+   private:
+ 
+-    static int const MAX_TAPS = 5;
+-    static float const MAX_TAP_AGE = 3.0;
+-    static float const TAP_DIFF = 0.2;
++    static int const MAX_TAPS;
++    static float const MAX_TAP_AGE;
++    static float const TAP_DIFF;
+ 
+     float _tempo;
+     float _tempo_increment, _tempo_start, _tempo_limit;
+--- klick-0.12.2/src/metronome_simple.cc.old	2016-09-21 22:27:24.883846428 -0400
++++ klick-0.12.2/src/metronome_simple.cc	2016-09-21 22:28:46.015859632 -0400
+@@ -217,3 +217,7 @@
+ 
+     _frame += nframes;
+ }
++
++int const MetronomeSimple::MAX_TAPS = 5;
++float const MetronomeSimple::MAX_TAP_AGE = 3.0;
++float const MetronomeSimple::TAP_DIFF = 0.2;
diff --git a/media-sound/klick/files/klick-0.12.2-sconstruct.patch b/media-sound/klick/files/klick-0.12.2-sconstruct.patch
new file mode 100644
index 000000000000..c142993b1e61
--- /dev/null
+++ b/media-sound/klick/files/klick-0.12.2-sconstruct.patch
@@ -0,0 +1,57 @@
+This patch
+* replaces deprecated calls,
+* makes the build system respect toolchain,
+* avoids underlinking.
+
+--- klick-0.12.2.orig/SConstruct
++++ klick-0.12.2/SConstruct
+@@ -11,24 +11,24 @@
+     ENV = os.environ,
+ )
+ 
+-# build options
+-opts = Options('scache.conf')
+-opts.AddOptions(
+-    PathOption('PREFIX', 'install prefix', '/usr/local'),
+-    PathOption('DESTDIR', 'intermediate install prefix', '', PathOption.PathAccept),
+-    BoolOption('DEBUG', 'debug mode', False),
+-    BoolOption('OSC', 'OSC support', True),
+-    BoolOption('TERMINAL', 'terminal control support', True),
+-    BoolOption('RUBBERBAND', 'use Rubber Band for pitch shifting', False),
++# build variables
++vars = Variables('scache.conf')
++vars.AddVariables(
++    ('CXX', 'C++ compiler'),
++    ('CXXFLAGS', 'C++ compiler flags'),
++    ('LINKFLAGS', 'linker flags'),
++    PathVariable('PREFIX', 'install prefix', '/usr/local'),
++    PathVariable('DESTDIR', 'intermediate install prefix', '', PathVariable.PathAccept),
++    BoolVariable('DEBUG', 'debug mode', False),
++    BoolVariable('OSC', 'OSC support', True),
++    BoolVariable('TERMINAL', 'terminal control support', True),
++    BoolVariable('RUBBERBAND', 'use Rubber Band for pitch shifting', False),
+ )
+-opts.Update(env)
+-opts.Save('scache.conf', env)
+-Help(opts.GenerateHelpText(env))
+-
+-if env['DEBUG']:
+-    env.Append(CCFLAGS = ['-g', '-W', '-Wall'])
+-else:
+-    env.Append(CCFLAGS = ['-O2', '-W', '-Wall'])
++vars.Update(env)
++vars.Save('scache.conf', env)
++Help(vars.GenerateHelpText(env))
++
++if not env['DEBUG']:
+     env.Prepend(CPPDEFINES = 'NDEBUG')
+ 
+ # install paths
+@@ -38,6 +38,7 @@
+ env.Append(CPPDEFINES = ('DATA_DIR', '\\"%s\\"' % prefix_share))
+ 
+ # required libraries
++env.PrependUnique(LIBS = ['stdc++', 'm'])
+ env.ParseConfig(
+     'pkg-config --cflags --libs jack samplerate sndfile'
+ )