Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package amsynth for openSUSE:Factory checked in at 2024-07-18 19:19:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amsynth (Old) and /work/SRC/openSUSE:Factory/.amsynth.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amsynth" Thu Jul 18 19:19:45 2024 rev:20 rq:1188360 version:1.13.4 Changes: -------- --- /work/SRC/openSUSE:Factory/amsynth/amsynth.changes 2024-04-16 20:10:43.415621415 +0200 +++ /work/SRC/openSUSE:Factory/.amsynth.new.17339/amsynth.changes 2024-07-18 19:19:48.479410134 +0200 @@ -1,0 +2,10 @@ +Wed Jul 17 06:38:35 UTC 2024 - Atri Bhattacharya <[email protected]> + +- Update to version 1.13.4: + * Fixed "reference to 'filesystem' is ambiguous" build error + [gh#amsynth/amsynth#233]. +- Drop use of %suse_update_desktop_files. +- Run `make check` as part of %check. +- Drop snippets supporting obsolete openSUSE versions. + +------------------------------------------------------------------- Old: ---- amsynth-1.13.3.tar.gz New: ---- amsynth-1.13.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amsynth.spec ++++++ --- /var/tmp/diff_new_pack.fuspCF/_old 2024-07-18 19:19:49.127436073 +0200 +++ /var/tmp/diff_new_pack.fuspCF/_new 2024-07-18 19:19:49.127436073 +0200 @@ -17,7 +17,7 @@ Name: amsynth -Version: 1.13.3 +Version: 1.13.4 Release: 0 Summary: Analog modelling (a.k.a virtual analog) software synthesizer License: GPL-2.0-or-later @@ -153,27 +153,18 @@ %autosetup -n %{name}-release-%{version} -p1 %build -mkdir -p m4 autoreconf -fiv intltoolize -f %configure -make %{?_smp_mflags} +%make_build %install %make_install -%suse_update_desktop_file %{name} Audio Midi %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir}/%{name}/skins/ -%if 0%{?suse_version} < 1550 -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif +%check +%make_build check %files %license COPYING ++++++ amsynth-1.13.3.tar.gz -> amsynth-1.13.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/NEWS new/amsynth-release-1.13.4/NEWS --- old/amsynth-release-1.13.3/NEWS 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/NEWS 2024-05-02 18:28:58.000000000 +0200 @@ -1,4 +1,9 @@ -amsynth 1.13.3 -- +amsynth 1.13.4 -- 2022-05-02 + + - Fixed "reference to 'filesystem' is ambiguous" build error. + + +amsynth 1.13.3 -- 2022-04-15 - Fixed an error when building DSSI GUI with GCC 14 or Clang. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/configure.ac new/amsynth-release-1.13.4/configure.ac --- old/amsynth-release-1.13.3/configure.ac 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/configure.ac 2024-05-02 18:28:58.000000000 +0200 @@ -20,7 +20,7 @@ AC_COPYRIGHT([Copyright (C) 2001-2024 Nick Dowell]) -AC_INIT([amsynth], [1.13.3], +AC_INIT([amsynth], [1.13.4], [https://github.com/amsynth/amsynth/issues], [amsynth], [https://github.com/amsynth/amsynth]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/Configuration.cpp new/amsynth-release-1.13.4/src/Configuration.cpp --- old/amsynth-release-1.13.3/src/Configuration.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/Configuration.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -28,8 +28,6 @@ #include <cstdlib> #include <sstream> -using namespace std; - Configuration::Configuration() { amsynthrc_fname = filesystem::get().config; @@ -64,9 +62,9 @@ int Configuration::load () { - string buffer; + std::string buffer; - fstream file( amsynthrc_fname.c_str(), ios::in ); + std::fstream file( amsynthrc_fname.c_str(), std::ios::in ); while( file.good() ) { file >> buffer; if( buffer[0]=='#' ){ @@ -87,7 +85,7 @@ oss_midi_device = buffer; } else if (buffer=="midi_channel"){ file >> buffer; - istringstream(buffer) >> midi_channel; + std::istringstream(buffer) >> midi_channel; } else if (buffer=="oss_audio_device"){ file >> buffer; oss_audio_device = buffer; @@ -96,13 +94,13 @@ alsa_audio_device = buffer; } else if (buffer=="sample_rate"){ file >> buffer; - istringstream(buffer) >> sample_rate; + std::istringstream(buffer) >> sample_rate; } else if (buffer=="polyphony"){ file >> buffer; - istringstream(buffer) >> polyphony; + std::istringstream(buffer) >> polyphony; } else if (buffer=="pitch_bend_range"){ file >> buffer; - istringstream(buffer) >> pitch_bend_range; + std::istringstream(buffer) >> pitch_bend_range; } else if (buffer=="tuning_file") { file >> buffer; current_tuning_file = buffer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/PresetController.cpp new/amsynth-release-1.13.4/src/PresetController.cpp --- old/amsynth-release-1.13.3/src/PresetController.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/PresetController.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -44,8 +44,6 @@ #define _(string) gettext (string) -using namespace std; - PresetController::PresetController() { @@ -67,7 +65,7 @@ } bool -PresetController::containsPresetWithName(const string name) +PresetController::containsPresetWithName(const std::string name) { for (int i=0; i<kNumPresets; i++) if (getPreset(i).getName() == name) @@ -151,11 +149,11 @@ } int -PresetController::exportPreset (const string filename) +PresetController::exportPreset (const std::string filename) { try { - ofstream file( filename.c_str(), ios::out ); + std::ofstream file( filename.c_str(), std::ios::out ); file << currentPreset.toString(); file.close(); return 0; @@ -167,11 +165,11 @@ } int -PresetController::importPreset (const string filename) +PresetController::importPreset (const std::string filename) { try { - ifstream ifs( filename.c_str(), ios::in ); + std::ifstream ifs( filename.c_str(), std::ios::in ); std::string str( (std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>() ); if (!currentPreset.fromString( str )) return -1; currentPreset.setName("Imported: " + currentPreset.getName()); @@ -200,21 +198,21 @@ if (filename == nullptr) filename = bank_file.c_str(); - ofstream file( filename, ios::out ); + std::ofstream file( filename, std::ios::out ); - file << "amSynth" << endl; + file << "amSynth\n"; for (int i = 0; i < kNumPresets; i++) { if (presets[i].getName()!="unused"){ - file << "<preset> " << "<name> " << presets[i].getName() << endl; + file << "<preset> " << "<name> " << presets[i].getName() << "\n"; for (int n = 0; n < kAmsynthParameterCount; n++) { file << "<parameter> " << presets[i].getParameter(n).getName() - << " " << presets[i].getParameter(n).getValue() << endl; + << " " << presets[i].getParameter(n).getValue() << "\n"; } } } - file << "EOF" << endl; + file << "EOF" << std::endl; file.close(); lastPresetsFileModifiedTime = mtime(filename); @@ -401,7 +399,7 @@ } else { std::string::size_type pos = bank_name.find_first_of("."); if (pos != std::string::npos) - bank_name.erase(pos, string::npos); + bank_name.erase(pos, std::string::npos); } std::replace(bank_name.begin(), bank_name.end(), '_', ' '); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/TuningMap.cpp new/amsynth-release-1.13.4/src/TuningMap.cpp --- old/amsynth-release-1.13.3/src/TuningMap.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/TuningMap.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -27,8 +27,6 @@ #include "TuningMap.h" -using namespace std; - TuningMap::TuningMap () { defaultScale(); @@ -106,10 +104,10 @@ // Convert a single line of a Scala scale file to a frequency relative to 1/1. static double -parseScalaLine(const string & line) +parseScalaLine(const std::string & line) { - istringstream iss(line); - if (line.find('.') == string::npos) + std::istringstream iss(line); + if (line.find('.') == std::string::npos) { // treat as ratio long n, d; char slash; @@ -133,14 +131,14 @@ } int -TuningMap::loadScale (const string & filename) +TuningMap::loadScale (const std::string & filename) { - ifstream file(filename.c_str()); - string line; + std::ifstream file(filename.c_str()); + std::string line; bool gotDesc = false; int scaleSize = -1; - vector<double> newScale; + std::vector<double> newScale; while (file.good()) { @@ -158,7 +156,7 @@ } else if (scaleSize < 0) { - istringstream iss(line); + std::istringstream iss(line); iss >> scaleSize; if (scaleSize < 0) { @@ -186,10 +184,10 @@ } int -TuningMap::loadKeyMap (const string & filename) +TuningMap::loadKeyMap (const std::string & filename) { - ifstream file(filename.c_str()); - string line; + std::ifstream file(filename.c_str()); + std::string line; int mapSize = -1; int firstNote = -1; @@ -198,7 +196,7 @@ int newRefNote = -1; double newRefPitch = -1.; int newMapRepeatInc = -1; - vector<int> newMapping; + std::vector<int> newMapping; // It makes more sense to manipulate the ActiveRange array directly instead of creating // a temporary container and pointing the actual array to it at the end because @@ -214,10 +212,10 @@ while (i < line.size() && isspace(line[i])) ++i; if (i == line.size()) continue; // skip all-whitespace lines if (line[i] == '!') continue; // skip comment lines - istringstream iss(line); + std::istringstream iss(line); if (line [i] == '<') //An active range should be defined on this line. { - string tag; + std::string tag; int min, max; iss >> tag; iss >> min; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/VoiceAllocationUnit.cpp new/amsynth-release-1.13.4/src/VoiceAllocationUnit.cpp --- old/amsynth-release-1.13.3/src/VoiceAllocationUnit.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/VoiceAllocationUnit.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -32,8 +32,6 @@ #include <math.h> -using namespace std; - const unsigned kBufferSize = 1024; @@ -405,13 +403,13 @@ } int -VoiceAllocationUnit::loadScale (const string & sclFileName) +VoiceAllocationUnit::loadScale (const std::string & sclFileName) { return tuningMap.loadScale(sclFileName); } int -VoiceAllocationUnit::loadKeyMap (const string & kbmFileName) +VoiceAllocationUnit::loadKeyMap (const std::string & kbmFileName) { return tuningMap.loadKeyMap(kbmFileName); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/drivers/ALSAMidiDriver.cpp new/amsynth-release-1.13.4/src/drivers/ALSAMidiDriver.cpp --- old/amsynth-release-1.13.3/src/drivers/ALSAMidiDriver.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/drivers/ALSAMidiDriver.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -36,8 +36,6 @@ #include <iostream> #include <poll.h> -using namespace std; - class ALSAMidiDriver : public MidiDriver { @@ -95,7 +93,7 @@ ev.data.control.param = param; ev.data.control.value = value; ret=snd_seq_event_output_direct(seq_handle, &ev); - if (ret < 0 ) cout << snd_strerror(ret) << endl; + if (ret < 0 ) std::cout << snd_strerror(ret) << std::endl; return ret; } @@ -115,12 +113,12 @@ if (seq_handle) return 0; if (snd_seq_open(&seq_handle, "default", SND_SEQ_OPEN_DUPLEX, SND_SEQ_NONBLOCK) != 0) { - cerr << "Error opening ALSA sequencer.\n"; + std::cerr << "Error opening ALSA sequencer.\n"; return -1; } if (seq_handle == nullptr) { - cerr << "error: snd_seq_open() claimed to succeed but seq_handle is NULL.\n"; + std::cerr << "error: snd_seq_open() claimed to succeed but seq_handle is NULL.\n"; return -1; } @@ -131,14 +129,14 @@ if ((portid = snd_seq_create_simple_port(seq_handle, "MIDI IN", SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_APPLICATION)) < 0) { - cerr << "Error creating sequencer port.\n"; + std::cerr << "Error creating sequencer port.\n"; return -1; } if ((portid_out = snd_seq_create_simple_port(seq_handle, "MIDI OUT", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ, SND_SEQ_PORT_TYPE_APPLICATION)) < 0) { - cerr << "Error creating sequencer port.\n"; + std::cerr << "Error creating sequencer port.\n"; return -1; } @@ -160,7 +158,7 @@ seq_handle = nullptr; memset( &pollfd_in, 0, sizeof(pollfd_in) ); if( snd_midi_event_new( 32, &seq_midi_parser ) ) - cout << "Error creating MIDI event parser\n"; + std::cout << "Error creating MIDI event parser\n"; } ALSAMidiDriver::~ALSAMidiDriver() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/drivers/ALSAmmapAudioDriver.cpp new/amsynth-release-1.13.4/src/drivers/ALSAmmapAudioDriver.cpp --- old/amsynth-release-1.13.3/src/drivers/ALSAmmapAudioDriver.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/drivers/ALSAmmapAudioDriver.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -35,8 +35,6 @@ #include <alsa/asoundlib.h> #include <iostream> -using namespace std; - class ALSAmmapAudioDriver : public AudioDriver { public: @@ -65,7 +63,7 @@ periods = 0; err = snd_pcm_prepare(playback_handle); if (err < 0){ - cerr << "Can't recovery from underrun, prepare failed: " << snd_strerror(err) << "\n"; + std::cerr << "Can't recovery from underrun, prepare failed: " << snd_strerror(err) << "\n"; return -1; } return 0; @@ -76,7 +74,7 @@ periods = 0; err = snd_pcm_prepare(playback_handle); if (err < 0){ - cerr << "Can't recovery from suspend, prepare failed: " << snd_strerror(err) << "\n"; + std::cerr << "Can't recovery from suspend, prepare failed: " << snd_strerror(err) << "\n"; return -1; } } @@ -103,7 +101,7 @@ { // char b[ 80]; // sprintf( b, "%i", err = avail); -// cerr << "snd_pcm_avail_update error " << b << "=\"" +// std::cerr << "snd_pcm_avail_update error " << b << "=\"" // << snd_strerror( err) << "\"\n"; return xrun_recovery(); } @@ -111,7 +109,7 @@ if( (int)avail >= (int)lframes ) break; if( 0 > ( err = snd_pcm_wait( playback_handle, -1))) { -// cerr << "snd_pcm_wait error\n"; +// std::cerr << "snd_pcm_wait error\n"; config.xruns++; return xrun_recovery(); } @@ -119,7 +117,7 @@ if( 0 > ( err = snd_pcm_mmap_begin( playback_handle, &areas, &offset, &lframes))) { - cerr << "snd_pcm_mmap_begin error\n"; + std::cerr << "snd_pcm_mmap_begin error\n"; xrun_recovery(); // Return an error code so we can quickly test during initialisation. // Won't stop playback at runtime because AudioOutput checks for a return code of -1 @@ -133,23 +131,23 @@ if( 0 > ( err = snd_pcm_mmap_commit( playback_handle, offset, lframes))) { - cerr << "snd_pcm_mmap_commit error\n"; + std::cerr << "snd_pcm_mmap_commit error\n"; return xrun_recovery(); } if( periods < 2) if( 2 == ++periods ) -// cerr << "snd_pcm_start soon\n"; +// std::cerr << "snd_pcm_start soon\n"; if( 0 > ( err = snd_pcm_start( playback_handle ) ) ) { - cerr << "snd_pcm_start error\n"; + std::cerr << "snd_pcm_start error\n"; return -1; } /*else{ if( ++periods == 0) periods = 2; if( ! ( periods % 0x100)) - cerr << "( periods % 0x100)\n"; + std::cerr << "( periods % 0x100)\n"; }*/ return 0; } @@ -165,7 +163,7 @@ _rate = config.sample_rate; if(snd_pcm_open(&playback_handle, config.alsa_audio_device.c_str(), SND_PCM_STREAM_PLAYBACK, 0)<0){ - cerr << "ALSA: cannot open audio device " << config.alsa_audio_device << endl; + std::cerr << "ALSA: cannot open audio device " << config.alsa_audio_device << std::endl; return -1; } snd_pcm_hw_params_alloca( &hw_params ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/amsynth-release-1.13.3/src/main.cpp new/amsynth-release-1.13.4/src/main.cpp --- old/amsynth-release-1.13.3/src/main.cpp 2024-04-15 09:09:07.000000000 +0200 +++ new/amsynth-release-1.13.4/src/main.cpp 2024-05-02 18:28:58.000000000 +0200 @@ -69,8 +69,6 @@ #include "gettext.h" #define _(string) gettext (string) -using namespace std; - Configuration & config = Configuration::get(); @@ -169,23 +167,23 @@ if (config.midi_driver == "alsa" || config.midi_driver == "ALSA") { if (!(midiDriver = opened_midi_driver(CreateAlsaMidiDriver(alsa_client_name)))) { - std::cerr << _("error: could not open ALSA MIDI interface") << endl; + std::cerr << _("error: could not open ALSA MIDI interface") << std::endl; } return; } if (config.midi_driver == "oss" || config.midi_driver == "OSS") { if (!(midiDriver = opened_midi_driver(CreateOSSMidiDriver()))) { - std::cerr << _("error: could not open OSS MIDI interface") << endl; + std::cerr << _("error: could not open OSS MIDI interface") << std::endl; } return; } if (config.midi_driver == "auto") { midiDriver = opened_midi_driver(CreateAlsaMidiDriver(alsa_client_name)) ?: - opened_midi_driver(CreateOSSMidiDriver()); + opened_midi_driver(CreateOSSMidiDriver()); if (config.current_midi_driver.empty()) { - std::cerr << _("error: could not open any MIDI interface") << endl; + std::cerr << _("error: could not open any MIDI interface") << std::endl; } return; } @@ -250,38 +248,37 @@ int opt, longindex = -1; while ((opt = getopt_long(argc, argv, "vhsdzxm:c:a:r:p:b:U:P:n:t:", longopts, &longindex)) != -1) { switch (opt) { - case 'v': - cout << PACKAGE_STRING << endl; + case 'v': + std::cout << PACKAGE_STRING << std::endl; return 0; case 'h': - cout << _("usage: ") << PACKAGE << _(" [options]") << endl - << endl - << _("Any options given here override those in the config file ($HOME/.amSynthrc)") << endl - << endl - << _("OPTIONS:") << endl - << endl - << _(" -h show this usage message") << endl - << _(" -v show version information") << endl - << _(" -x run in headless mode (without GUI)") << endl - << endl - << _(" -b <file> use <file> as the bank to store presets") << endl - << _(" -P <int> set preset number to use") << endl - << _(" -t <file> use <file> as a tuning file") << endl - << endl - << _(" -a <string> set the sound output driver to use [alsa/oss/auto(default)]") << endl - << _(" -r <int> set the sampling rate to use") << endl - << _(" -m <string> set the MIDI driver to use [alsa/oss/auto(default)]") << endl - << _(" -c <int> set the MIDI channel to respond to (default=all)") << endl - << _(" -p <int> set the polyphony (maximum active voices)") << endl - << endl - << _(" -n <name> specify the JACK client name to use") << endl - << _(" --jack_autoconnect[=<true|false>]") << endl - << _(" automatically connect jack audio ports to hardware I/O ports. (Default: true)") << endl - << endl - << _(" --force-device-scale-factor <scale>") << endl - << _(" override the default scaling factor for the control panel") << endl - << endl; - + std::cout << _("usage: ") << PACKAGE << _(" [options]") << "\n" + << "\n" + << _("Any options given here override those in the config file ($HOME/.amSynthrc)") << "\n" + << "\n" + << _("OPTIONS:") << "\n" + << "\n" + << _(" -h show this usage message") << "\n" + << _(" -v show version information") << "\n" + << _(" -x run in headless mode (without GUI)") << "\n" + << "\n" + << _(" -b <file> use <file> as the bank to store presets") << "\n" + << _(" -P <int> set preset number to use") << "\n" + << _(" -t <file> use <file> as a tuning file") << "\n" + << "\n" + << _(" -a <string> set the sound output driver to use [alsa/oss/auto(default)]") << "\n" + << _(" -r <int> set the sampling rate to use") << "\n" + << _(" -m <string> set the MIDI driver to use [alsa/oss/auto(default)]") << "\n" + << _(" -c <int> set the MIDI channel to respond to (default=all)") << "\n" + << _(" -p <int> set the polyphony (maximum active voices)") << "\n" + << "\n" + << _(" -n <name> specify the JACK client name to use") << "\n" + << _(" --jack_autoconnect[=<true|false>]") << "\n" + << _(" automatically connect jack audio ports to hardware I/O ports. (Default: true)") << "\n" + << "\n" + << _(" --force-device-scale-factor <scale>") << "\n" + << _(" override the default scaling factor for the control panel") << "\n" + << std::endl; return 0; case 'z': ptest(); @@ -340,7 +337,7 @@ gui_kit_init(&argc, &argv); #endif - string amsynth_bank_file = config.current_bank_file; + std::string amsynth_bank_file = config.current_bank_file; // string amsynth_tuning_file = config.current_tuning_file; GenericOutput *out = open_audio(); @@ -501,7 +498,7 @@ void amsynth_save_bank(const char *filename) { - s_synthesizer->saveBank(filename); + s_synthesizer->saveBank(filename); } void @@ -515,7 +512,7 @@ { int result = s_synthesizer->loadTuningScale(filename); if (result != 0) { - cerr << _("error: could not load tuning file ") << filename << endl; + std::cerr << _("error: could not load tuning file ") << filename << std::endl; } return result; }
