gentoo resync : 25.11.2020

3 files changed, 14 insertions, 27 deletions

diff --git a/media-sound/din/files/din-43.0.1-fix-random-constants.patch b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
deleted file mode 100644
index 29f75d35f496..000000000000
--- a/media-sound/din/files/din-43.0.1-fix-random-constants.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/random.h b/include/random.h
-index 99d79fb..91ed250 100644
---- a/include/random.h
-+++ b/include/random.h
-@@ -16,8 +16,8 @@
- const int N = 624;

- const int M = 397;

- const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */

--const int UPPER_MASK = 0x80000000; /* most significant w-r bits */

--const int LOWER_MASK = 0x7fffffff; /* least significant r bits */

-+const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */

-+const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */

- 

- static unsigned int mt[N]; /* the array for the state vector  */

- static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */

diff --git a/media-sound/din/files/din-47.1-makefile.patch b/media-sound/din/files/din-47.1-makefile.patch
deleted file mode 100644
index 62e7229f0f50..000000000000
--- a/media-sound/din/files/din-47.1-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b24e856..a624610 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- AM_CFLAGS = -I ../include
- bin_PROGRAMS = din
diff --git a/media-sound/din/files/din-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch
new file mode 100644
index 000000000000..0a96d894c2c0
--- /dev/null
+++ b/media-sound/din/files/din-49.1-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c7cc5ce..2b07a9b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+ din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp