Date: Sunday, April 24, 2022 @ 10:44:20 Author: dvzrv Revision: 1189555
upgpkg: din 54-1: Upgrade to 54. Update patch to devendor rtaudio/rtmidi. Remove unneeded quotes and curly braces. Simplify calls to make. Added: din/trunk/din-54-devendor_rtaudio_rtmidi.patch Modified: din/trunk/PKGBUILD Deleted: din/trunk/din-52-devendor_rtaudio_rtmidi.patch --------------------------------------+ PKGBUILD | 33 ++++++------- din-52-devendor_rtaudio_rtmidi.patch | 81 --------------------------------- din-54-devendor_rtaudio_rtmidi.patch | 77 +++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 97 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-24 10:26:22 UTC (rev 1189554) +++ PKGBUILD 2022-04-24 10:44:20 UTC (rev 1189555) @@ -2,7 +2,7 @@ # Contributor: muzhed <[email protected]> pkgname=din -pkgver=53.1 +pkgver=54 pkgrel=1 pkgdesc="A sound synthesizer and musical instrument." arch=(x86_64) @@ -12,27 +12,29 @@ depends=(gcc-libs glibc hicolor-icon-theme libglvnd sdl tcl) makedepends=(boost glu rtaudio rtmidi) options=(debug) -source=("https://archive.org/download/dinisnoise_source_code/${pkgname}-${pkgver}.tar.gz"; - "${pkgname}-52-devendor_rtaudio_rtmidi.patch" +source=( + https://archive.org/download/dinisnoise_source_code/$pkgname-$pkgver.tar.gz + $pkgname-54-devendor_rtaudio_rtmidi.patch ) -sha512sums=('42058b00402e726869af8a5cb8eb9b34e7b1709185c972d3f3b633a980ad7de57a143ca0ce854ce681ec67b81cd6dd2b2b06023a15d3f1b1bd54c4ac643b6096' - '56aaa4f2e39297d3b64d254ddbf53ae7c7d0ea7df462a7f9ab3071ce3a21c997874b8a39065422b012a10e8ecd90b5373c887e924a8843134a6b095f588ffd26') -b2sums=('882d4ae6cbe24c3d7fc326df3f3630d7ea7cd65b5d53c4751844dc3edcf9d533cd7cfe58fed4c46766fab6b4983e75f75145206b5362bceb27382d02705b9a36' - 'f38ddc9c92a025fe1e361e8c1e48fd2fced13e19894c117f5e79f00eb5444fd4861562895dbef9884bd9996e2248923b511e3879655bb6cb87a1242b7fbb6042') +sha512sums=('8831e6d838ba06373b13574701929f96a508f2899618509b3e79f23cb0aa11c34b347fa00b4fa765a7668c7db54733be2c9146b8e783d3fe07e3ea4ce2707bd8' + '151613648d4da638835a1d5eceb3c6db78aea801e8f2bd385120a4b7bdfaadb707849a3ec9745b7e1e5f2a600ab13fe6fc3b2abe78c2783461deffb291787f1d') +b2sums=('2a7540d9a413c0f83b2cfc7373b1c0fdd40012ae725f162810e4d3165e3bc669661860fd653eaed8c7f2eeed7f015ff50ce6082ce8de04bd035bf395ca018d6a' + 'a80851871f075971139a1eb82144fa05aaad4e7892eb80c5a045d12f59dd8a25f76fabd6eaa435409c5db2ea5e40615117a9016c50160594590fd434af9a87b0') prepare() { - cd "${pkgname}-${pkgver}" # use system rtaudio/rtmidi, instead of vendored versions - patch -Np1 -i "../${pkgname}-52-devendor_rtaudio_rtmidi.patch" + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-54-devendor_rtaudio_rtmidi.patch + + cd $pkgname-$pkgver rm -fv src/{RtAudio,RtMidi}.* autoreconf -fiv } build() { - cd "${pkgname}-${pkgver}" - export CXXFLAGS="${CXXFLAGS} -D__UNIX_JACK__ $(pkg-config --cflags rtaudio rtmidi)" - export CFLAGS="${CFLAGS} -D__UNIX_JACK__ $(pkg-config --cflags rtaudio rtmidi)" - export LIBS="${LIBS} $(pkg-config --libs rtaudio rtmidi)" + cd $pkgname-$pkgver + export CXXFLAGS+=" -D__UNIX_JACK__ $(pkg-config --cflags rtaudio rtmidi)" + export CFLAGS+=" -D__UNIX_JACK__ $(pkg-config --cflags rtaudio rtmidi)" + export LIBS+=" $(pkg-config --libs rtaudio rtmidi)" ./configure --prefix='/usr' make } @@ -40,8 +42,7 @@ package() { depends+=(librtaudio.so librtmidi.so) - cd "${pkgname}-${pkgver}" - make install DESTDIR="${pkgdir}" + make install DESTDIR="$pkgdir" -C $pkgname-$pkgver # docs - install -vDm 644 {AUTHORS,BUGS,CHANGELOG,NEWS,README,TODO} -t "${pkgdir}/usr/share/doc/${pkgname}/" + install -vDm 644 $pkgname-$pkgver/{AUTHORS,BUGS,CHANGELOG,NEWS,README,TODO} -t "$pkgdir/usr/share/doc/$pkgname/" } Deleted: din-52-devendor_rtaudio_rtmidi.patch =================================================================== --- din-52-devendor_rtaudio_rtmidi.patch 2022-04-24 10:26:22 UTC (rev 1189554) +++ din-52-devendor_rtaudio_rtmidi.patch 2022-04-24 10:44:20 UTC (rev 1189555) @@ -1,81 +0,0 @@ -diff -ruN a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2021-12-04 03:58:55.000000000 +0100 -+++ b/src/Makefile.am 2021-12-11 13:10:50.180542659 +0100 -@@ -4,8 +4,8 @@ - LIBS += -ltcl8.6 -lSDL -lGL -lpthread -lasound - - bin_PROGRAMS = din --din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autorotator.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 defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.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 p lus_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 -+din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autorotator.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 defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.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 p lus_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 - --dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h binaural_drones.h bit_display.h box.h box_selector.h button.h capturer.h checkbutton.h chrono.h circler.h color.h command.h compressor.h console.h console_iterator.h constant_radius.h container.h cosine.h countries.h cross_button.h crvpt.h curve.h curve_display.h curve_editor.h curve_library.h curve_listener.h curve_mixer.h curve_picker.h curve_samples.h custom_periodic.h delay.h din.h din_info.h dingl.h drawrrow.h drone.h fader.h fft.h field.h file-utils.h filled_button.h font.h font_editor.h fractaliser.h funktion.h globals.h glyph.h gravity.h help.h hit.h input.h instrument.h item_list.h keyboard_keyboard.h kiss_fft.h label.h label_field.h label_field_slider.h levels.h line.h lissajous.h listeners.h log.h main.h menu.h mesh.h midi_in.h minus_button.h mocap.h modulator.h mondrian.h morpher.h morse_code.h mouse_slider.h multi_curve.h note.h number.h o ctave_shift_data.h options_list.h osc.h oscilloscope.h phrasor.h play.h plugin.h plugin_browser.h plus_button.h point.h point_modulator.h random.h range.h recorder.h rect.h rose_milker.h scale_info.h scale_notes.h scalelist.h separator.h settings.h sine.h sine_mixer.h slider.h slit.h solver.h spinner.h spinner2.h spiraler.h starrer.h state_button.h strength_editor.h superformula.h tap_bpm.h tcl_interp.h textboard.h tick.h tokenizer.h trail.h triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h vector2d.h viewwin.h warper.h wav.h widget.h RtAudio.h RtError.h RtMidi.h _kiss_fft_guts.h noiser.h mod_params.h autoflip.h autorotator.h defvelaccel.h -+dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h binaural_drones.h bit_display.h box.h box_selector.h button.h capturer.h checkbutton.h chrono.h circler.h color.h command.h compressor.h console.h console_iterator.h constant_radius.h container.h cosine.h countries.h cross_button.h crvpt.h curve.h curve_display.h curve_editor.h curve_library.h curve_listener.h curve_mixer.h curve_picker.h curve_samples.h custom_periodic.h delay.h din.h din_info.h dingl.h drawrrow.h drone.h fader.h fft.h field.h file-utils.h filled_button.h font.h font_editor.h fractaliser.h funktion.h globals.h glyph.h gravity.h help.h hit.h input.h instrument.h item_list.h keyboard_keyboard.h kiss_fft.h label.h label_field.h label_field_slider.h levels.h line.h lissajous.h listeners.h log.h main.h menu.h mesh.h midi_in.h minus_button.h mocap.h modulator.h mondrian.h morpher.h morse_code.h mouse_slider.h multi_curve.h note.h number.h o ctave_shift_data.h options_list.h osc.h oscilloscope.h phrasor.h play.h plugin.h plugin_browser.h plus_button.h point.h point_modulator.h random.h range.h recorder.h rect.h rose_milker.h scale_info.h scale_notes.h scalelist.h separator.h settings.h sine.h sine_mixer.h slider.h slit.h solver.h spinner.h spinner2.h spiraler.h starrer.h state_button.h strength_editor.h superformula.h tap_bpm.h tcl_interp.h textboard.h tick.h tokenizer.h trail.h triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h vector2d.h viewwin.h warper.h wav.h widget.h RtError.h _kiss_fft_guts.h noiser.h mod_params.h autoflip.h autorotator.h defvelaccel.h - - EXTRA_DIST = $(dist_include) -diff -ruN a/src/Makefile.in b/src/Makefile.in ---- a/src/Makefile.in 2021-12-11 10:16:34.000000000 +0100 -+++ b/src/Makefile.in 2021-12-11 13:11:51.783090977 +0100 -@@ -140,8 +140,7 @@ - textboard.$(OBJEXT) tokenizer.$(OBJEXT) trail.$(OBJEXT) \ - triggered_note.$(OBJEXT) ui.$(OBJEXT) \ - ui_sin_cos_radius.$(OBJEXT) viewwin.$(OBJEXT) warper.$(OBJEXT) \ -- widget.$(OBJEXT) kiss_fft.$(OBJEXT) RtAudio.$(OBJEXT) \ -- RtMidi.$(OBJEXT) -+ widget.$(OBJEXT) kiss_fft.$(OBJEXT) - din_OBJECTS = $(am_din_OBJECTS) - din_LDADD = $(LDADD) - AM_V_P = $(am__v_P_@AM_V@) -@@ -331,8 +330,7 @@ - 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 -+ ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c - dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h \ - ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h \ - binaural_drones.h bit_display.h box.h box_selector.h button.h \ -@@ -359,8 +357,8 @@ - state_button.h strength_editor.h superformula.h tap_bpm.h \ - tcl_interp.h textboard.h tick.h tokenizer.h trail.h \ - triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h \ -- vector2d.h viewwin.h warper.h wav.h widget.h RtAudio.h \ -- RtError.h RtMidi.h _kiss_fft_guts.h noiser.h mod_params.h \ -+ vector2d.h viewwin.h warper.h wav.h widget.h \ -+ RtError.h _kiss_fft_guts.h noiser.h mod_params.h \ - autoflip.h autorotator.h defvelaccel.h - EXTRA_DIST = $(dist_include) - all: all-am -@@ -449,8 +447,6 @@ - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RtAudio.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RtMidi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alarm.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arrow_button.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio.Po@am__quote@ -diff -ruN a/src/audio.h b/src/audio.h ---- a/src/audio.h 2021-03-10 06:31:12.000000000 +0100 -+++ b/src/audio.h 2021-12-11 13:12:20.126103539 +0100 -@@ -9,7 +9,7 @@ - #ifndef __AUDIO - #define __AUDIO - --#include "RtAudio.h" -+#include <RtAudio.h> - - #include <vector> - #include <string> -diff -ruN a/src/midi_in.h b/src/midi_in.h ---- a/src/midi_in.h 2021-03-10 06:31:17.000000000 +0100 -+++ b/src/midi_in.h 2021-12-11 13:12:32.132641512 +0100 -@@ -8,7 +8,7 @@ - #ifndef __midi_in - #define __midi_in - --#include "RtMidi.h" -+#include <RtMidi.h> - #include <vector> - #include <string> - Added: din-54-devendor_rtaudio_rtmidi.patch =================================================================== --- din-54-devendor_rtaudio_rtmidi.patch (rev 0) +++ din-54-devendor_rtaudio_rtmidi.patch 2022-04-24 10:44:20 UTC (rev 1189555) @@ -0,0 +1,77 @@ +diff -ruN a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2022-04-11 20:02:12.000000000 +0200 ++++ b/src/Makefile.am 2022-04-24 12:37:47.624486267 +0200 +@@ -5,8 +5,8 @@ + + bin_PROGRAMS = din + +-din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autorotator.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 defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc help.cc hit.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 noiser.cc note.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin_browser.cc plugin.cc p lus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scalelist.cc scale_notes.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 RtAudio.cpp RtMidi.cpp kiss_fft.c ++din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autorotator.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 defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc help.cc hit.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 noiser.cc note.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin_browser.cc plugin.cc p lus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scalelist.cc scale_notes.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 + +-dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h autoflip.h autorotator.h ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h binaural_drones.h bit_display.h box.h box_selector.h button.h capturer.h checkbutton.h chrono.h circler.h color.h command.h compressor.h console.h console_iterator.h constant_radius.h container.h cosine.h countries.h cross_button.h crvpt.h curve_display.h curve_editor.h curve.h curve_library.h curve_listener.h curve_mixer.h curve_picker.h curve_samples.h custom_periodic.h defvelaccel.h delay.h dingl.h din.h din_info.h drawrrow.h drone.h fader.h fft.h field.h file-utils.h filled_button.h font_editor.h font.h fractaliser.h funktion.h globals.h glyph.h gravity.h help.h hit.h input.h instrument.h item_list.h keyboard_keyboard.h _kiss_fft_guts.h kiss_fft.h label_field.h label_field_slider.h label.h levels.h line.h lissajous.h listeners.h log.h main.h menu.h mesh.h midi_in.h minus_button.h mocap.h mod_params.h modulator.h mondrian.h morpher.h morse_code.h mouse_slider.h multi_curve.h noiser.h note.h number.h octave_shift_data.h options_list.h osc.h oscilloscope.h phrasor.h play.h plugin_browser.h plugin.h plus_button.h point.h point_modulator.h random.h range.h recorder.h rect.h rose_milker.h RtAudio.h RtError.h RtMidi.h scale_info.h scalelist.h scale_notes.h separator.h settings.h sine.h sine_mixer.h slider.h slit.h solver.h spinner2.h spinner.h spiraler.h starrer.h state_button.h strength_editor.h superformula.h tap_bpm.h tcl_interp.h textboard.h tick.h tokenizer.h trail.h triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h vector2d.h viewwin.h warper.h wav.h widget.h ++dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h autoflip.h autorotator.h ball.h ball_ops.h basic_editor.h beat2value.h binaural_drone.h binaural_drones.h bit_display.h box.h box_selector.h button.h capturer.h checkbutton.h chrono.h circler.h color.h command.h compressor.h console.h console_iterator.h constant_radius.h container.h cosine.h countries.h cross_button.h crvpt.h curve_display.h curve_editor.h curve.h curve_library.h curve_listener.h curve_mixer.h curve_picker.h curve_samples.h custom_periodic.h defvelaccel.h delay.h dingl.h din.h din_info.h drawrrow.h drone.h fader.h fft.h field.h file-utils.h filled_button.h font_editor.h font.h fractaliser.h funktion.h globals.h glyph.h gravity.h help.h hit.h input.h instrument.h item_list.h keyboard_keyboard.h _kiss_fft_guts.h kiss_fft.h label_field.h label_field_slider.h label.h levels.h line.h lissajous.h listeners.h log.h main.h menu.h mesh.h midi_in.h minus_button.h mocap.h mod_params.h modulator.h mondrian.h morpher.h morse_code.h mouse_slider.h multi_curve.h noiser.h note.h number.h octave_shift_data.h options_list.h osc.h oscilloscope.h phrasor.h play.h plugin_browser.h plugin.h plus_button.h point.h point_modulator.h random.h range.h recorder.h rect.h rose_milker.h RtError.h scale_info.h scalelist.h scale_notes.h separator.h settings.h sine.h sine_mixer.h slider.h slit.h solver.h spinner2.h spinner.h spiraler.h starrer.h state_button.h strength_editor.h superformula.h tap_bpm.h tcl_interp.h textboard.h tick.h tokenizer.h trail.h triggered_note.h ui.h ui_list.h ui_sin_cos_radius.h utils.h vector2d.h viewwin.h warper.h wav.h widget.h + + EXTRA_DIST = $(dist_include) +diff -ruN a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in 2022-04-24 04:38:02.000000000 +0200 ++++ b/src/Makefile.in 2022-04-24 12:38:49.774496284 +0200 +@@ -140,7 +140,7 @@ + textboard.$(OBJEXT) tokenizer.$(OBJEXT) trail.$(OBJEXT) \ + triggered_note.$(OBJEXT) ui.$(OBJEXT) \ + ui_sin_cos_radius.$(OBJEXT) viewwin.$(OBJEXT) warper.$(OBJEXT) \ +- widget.$(OBJEXT) RtAudio.$(OBJEXT) RtMidi.$(OBJEXT) \ ++ widget.$(OBJEXT) \ + kiss_fft.$(OBJEXT) + din_OBJECTS = $(am_din_OBJECTS) + din_LDADD = $(LDADD) +@@ -331,7 +331,7 @@ + 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 RtAudio.cpp RtMidi.cpp kiss_fft.c ++ warper.cc widget.cc kiss_fft.c + dist_include = alarm.h angle.h arrow_button.h audio.h authors_note.h \ + autoflip.h autorotator.h ball.h ball_ops.h basic_editor.h \ + beat2value.h binaural_drone.h binaural_drones.h bit_display.h \ +@@ -353,7 +353,7 @@ + note.h number.h octave_shift_data.h options_list.h osc.h \ + oscilloscope.h phrasor.h play.h plugin_browser.h plugin.h \ + plus_button.h point.h point_modulator.h random.h range.h \ +- recorder.h rect.h rose_milker.h RtAudio.h RtError.h RtMidi.h \ ++ recorder.h rect.h rose_milker.h RtError.h \ + scale_info.h scalelist.h scale_notes.h separator.h settings.h \ + sine.h sine_mixer.h slider.h slit.h solver.h spinner2.h \ + spinner.h spiraler.h starrer.h state_button.h \ +@@ -448,8 +448,6 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RtAudio.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RtMidi.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alarm.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arrow_button.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio.Po@am__quote@ +diff -ruN a/src/audio.h b/src/audio.h +--- a/src/audio.h 2022-01-12 05:04:49.000000000 +0100 ++++ b/src/audio.h 2022-04-24 12:39:13.894505995 +0200 +@@ -9,7 +9,7 @@ + #ifndef __AUDIO + #define __AUDIO + +-#include "RtAudio.h" ++#include <RtAudio.h> + + #include <vector> + #include <string> +diff -ruN a/src/midi_in.h b/src/midi_in.h +--- a/src/midi_in.h 2022-01-12 05:04:49.000000000 +0100 ++++ b/src/midi_in.h 2022-04-24 12:39:40.117853331 +0200 +@@ -8,7 +8,7 @@ + #ifndef __midi_in + #define __midi_in + +-#include "RtMidi.h" ++#include <RtMidi.h> + #include <vector> + #include <string> +
