Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sidplayfp for openSUSE:Factory checked in at 2024-12-04 15:27:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sidplayfp (Old) and /work/SRC/openSUSE:Factory/.sidplayfp.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sidplayfp" Wed Dec 4 15:27:40 2024 rev:12 rq:1228177 version:2.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sidplayfp/sidplayfp.changes 2024-11-05 16:45:37.104221907 +0100 +++ /work/SRC/openSUSE:Factory/.sidplayfp.new.28523/sidplayfp.changes 2024-12-04 15:27:46.498864974 +0100 @@ -1,0 +2,7 @@ +Tue Dec 3 19:11:09 UTC 2024 - Martin Hauke <mar...@gmx.de> + +- Update to version 2.12.0 + * Avoid crash when not using audio. + * Fixed buffer size on various backends. + +------------------------------------------------------------------- Old: ---- sidplayfp-2.11.0.tar.gz New: ---- sidplayfp-2.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sidplayfp.spec ++++++ --- /var/tmp/diff_new_pack.AajgWM/_old 2024-12-04 15:27:47.230895669 +0100 +++ /var/tmp/diff_new_pack.AajgWM/_new 2024-12-04 15:27:47.230895669 +0100 @@ -18,14 +18,14 @@ Name: sidplayfp -Version: 2.11.0 +Version: 2.12.0 Release: 0 Summary: SID chip music module player License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Players #Git-Clone: https://github.com/libsidplayfp/sidplayfp.git URL: https://sourceforge.net/projects/sidplay-residfp/ -Source0: https://sourceforge.net/projects/sidplay-residfp/files/sidplayfp/2.11/sidplayfp-%{version}.tar.gz +Source0: https://sourceforge.net/projects/sidplay-residfp/files/sidplayfp/2.12/sidplayfp-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) ++++++ sidplayfp-2.11.0.tar.gz -> sidplayfp-2.12.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/configure new/sidplayfp-2.12.0/configure --- old/sidplayfp-2.11.0/configure 2024-11-03 14:32:59.000000000 +0100 +++ new/sidplayfp-2.12.0/configure 2024-12-01 15:10:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sidplayfp 2.11.0. +# Generated by GNU Autoconf 2.71 for sidplayfp 2.12.0. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ # Identity of this package. PACKAGE_NAME='sidplayfp' PACKAGE_TARNAME='sidplayfp' -PACKAGE_VERSION='2.11.0' -PACKAGE_STRING='sidplayfp 2.11.0' +PACKAGE_VERSION='2.12.0' +PACKAGE_STRING='sidplayfp 2.12.0' PACKAGE_BUGREPORT='' PACKAGE_URL='https://github.com/libsidplayfp/sidplayfp/' @@ -1364,7 +1364,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sidplayfp 2.11.0 to adapt to many kinds of systems. +\`configure' configures sidplayfp 2.12.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sidplayfp 2.11.0:";; + short | recursive ) echo "Configuration of sidplayfp 2.12.0:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sidplayfp configure 2.11.0 +sidplayfp configure 2.12.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1837,7 +1837,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sidplayfp $as_me 2.11.0, which was +It was created by sidplayfp $as_me 2.12.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3327,7 +3327,7 @@ # Define the identity of the package. PACKAGE='sidplayfp' - VERSION='2.11.0' + VERSION='2.12.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -10395,7 +10395,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sidplayfp $as_me 2.11.0, which was +This file was extended by sidplayfp $as_me 2.12.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10464,7 +10464,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sidplayfp config.status 2.11.0 +sidplayfp config.status 2.12.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/configure.ac new/sidplayfp-2.12.0/configure.ac --- old/sidplayfp-2.11.0/configure.ac 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/configure.ac 2024-12-01 15:10:44.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([sidplayfp], [2.11.0], [], [], [https://github.com/libsidplayfp/sidplayfp/]) +AC_INIT([sidplayfp], [2.12.0], [], [], [https://github.com/libsidplayfp/sidplayfp/]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/doc/en/sidplayfp.1 new/sidplayfp-2.12.0/doc/en/sidplayfp.1 --- old/sidplayfp-2.11.0/doc/en/sidplayfp.1 2024-11-03 14:33:03.000000000 +0100 +++ new/sidplayfp-2.12.0/doc/en/sidplayfp.1 2024-12-01 15:10:50.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "SIDPLAYFP 1" -.TH SIDPLAYFP 1 "2024-11-03" "perl v5.34.0" "User Programs" +.TH SIDPLAYFP 1 "2024-12-01" "perl v5.34.0" "User Programs" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/doc/en/sidplayfp.ini.5 new/sidplayfp-2.12.0/doc/en/sidplayfp.ini.5 --- old/sidplayfp-2.11.0/doc/en/sidplayfp.ini.5 2024-11-03 14:33:03.000000000 +0100 +++ new/sidplayfp-2.12.0/doc/en/sidplayfp.ini.5 2024-12-01 15:10:50.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "SIDPLAYFP.INI 5" -.TH SIDPLAYFP.INI 5 "2024-11-03" "perl v5.34.0" "File formats" +.TH SIDPLAYFP.INI 5 "2024-12-01" "perl v5.34.0" "File formats" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/doc/en/stilview.1 new/sidplayfp-2.12.0/doc/en/stilview.1 --- old/sidplayfp-2.11.0/doc/en/stilview.1 2024-11-03 14:33:03.000000000 +0100 +++ new/sidplayfp-2.12.0/doc/en/stilview.1 2024-12-01 15:10:50.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "STILVIEW 1" -.TH STILVIEW 1 "2024-11-03" "perl v5.34.0" "User Programs" +.TH STILVIEW 1 "2024-12-01" "perl v5.34.0" "User Programs" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/AudioDrv.cpp new/sidplayfp-2.12.0/src/audio/AudioDrv.cpp --- old/sidplayfp-2.11.0/src/audio/AudioDrv.cpp 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/AudioDrv.cpp 2024-12-01 15:10:44.000000000 +0100 @@ -71,7 +71,6 @@ { audio.reset(new Audio_ALSA()); res = audio->open(cfg); - if (res) std::cerr << "ALSA" << std::endl; } #endif #ifdef HAVE_OSS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/alsa/audiodrv.cpp new/sidplayfp-2.12.0/src/audio/alsa/audiodrv.cpp --- old/sidplayfp-2.11.0/src/audio/alsa/audiodrv.cpp 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/alsa/audiodrv.cpp 2024-12-01 15:10:44.000000000 +0100 @@ -65,9 +65,6 @@ checkResult(snd_pcm_open(&_audioHandle, "default", SND_PCM_STREAM_PLAYBACK, 0)); - // May later be replaced with driver defaults. - AudioConfig tmpCfg = cfg; - checkResult(snd_pcm_hw_params_malloc(&hw_params)); checkResult(snd_pcm_hw_params_any(_audioHandle, hw_params)); @@ -76,17 +73,13 @@ checkResult(snd_pcm_hw_params_set_format(_audioHandle, hw_params, SND_PCM_FORMAT_S16_LE)); - checkResult(snd_pcm_hw_params_set_channels(_audioHandle, hw_params, tmpCfg.channels)); + checkResult(snd_pcm_hw_params_set_channels(_audioHandle, hw_params, cfg.channels)); - { // Gentoo bug #98769, comment 4 - unsigned int rate = tmpCfg.frequency; - checkResult(snd_pcm_hw_params_set_rate_near(_audioHandle, hw_params, &rate, nullptr)); - tmpCfg.frequency = rate; - } + checkResult(snd_pcm_hw_params_set_rate_near(_audioHandle, hw_params, &cfg.frequency, nullptr)); - snd_pcm_uframes_t buffer_size = tmpCfg.bufSize; + snd_pcm_uframes_t buffer_size = cfg.bufSize; checkResult(snd_pcm_hw_params_set_buffer_size_near(_audioHandle, hw_params, &buffer_size)); - tmpCfg.bufSize = buffer_size; + cfg.bufSize = buffer_size; snd_pcm_uframes_t period_size = buffer_size / 3; checkResult(snd_pcm_hw_params_set_period_size_near(_audioHandle, hw_params, &period_size, nullptr)); @@ -98,7 +91,7 @@ try { - _sampleBuffer = new short[snd_pcm_frames_to_bytes(_audioHandle, tmpCfg.bufSize)]; + _sampleBuffer = new short[snd_pcm_frames_to_bytes(_audioHandle, buffer_size)/2]; } catch (std::bad_alloc const &ba) { @@ -106,9 +99,7 @@ } // Setup internal Config - _settings = tmpCfg; - // Update the users settings - getConfig (cfg); + _settings = cfg; return true; } catch(error const &e) @@ -144,7 +135,7 @@ return false; } - int err = snd_pcm_writei(_audioHandle, _sampleBuffer, frames); + snd_pcm_sframes_t err = snd_pcm_writei(_audioHandle, _sampleBuffer, frames); if (err < 0) { err = snd_pcm_recover(_audioHandle, err, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/au/auFile.cpp new/sidplayfp-2.12.0/src/audio/au/auFile.cpp --- old/sidplayfp-2.11.0/src/audio/au/auFile.cpp 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/au/auFile.cpp 2024-12-01 15:10:44.000000000 +0100 @@ -213,7 +213,7 @@ // We need to make a buffer for the user try { - _sampleBuffer = new short[bufSize]; + _sampleBuffer = new short[bufSize/2]; } catch (std::bad_alloc const &ba) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/null/null.h new/sidplayfp-2.12.0/src/audio/null/null.h --- old/sidplayfp-2.11.0/src/audio/null/null.h 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/null/null.h 2024-12-01 15:10:44.000000000 +0100 @@ -52,6 +52,7 @@ void reset () override {} bool write (uint_least32_t frames) override; void pause () override {} + void clearBuffer() override {} }; #endif // AUDIO_NULL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/out123/audiodrv.cpp new/sidplayfp-2.12.0/src/audio/out123/audiodrv.cpp --- old/sidplayfp-2.11.0/src/audio/out123/audiodrv.cpp 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/out123/audiodrv.cpp 2024-12-01 15:10:44.000000000 +0100 @@ -81,7 +81,7 @@ try { - _sampleBuffer = new short[cfg.bufSize * m_frameSize]; + _sampleBuffer = new short[cfg.bufSize * cfg.channels]; } catch (std::bad_alloc const &ba) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/pulse/audiodrv.cpp new/sidplayfp-2.12.0/src/audio/pulse/audiodrv.cpp --- old/sidplayfp-2.11.0/src/audio/pulse/audiodrv.cpp 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/pulse/audiodrv.cpp 2024-12-01 15:10:44.000000000 +0100 @@ -73,7 +73,7 @@ try { - _sampleBuffer = new short[cfg.bufSize]; + _sampleBuffer = new short[cfg.bufSize * cfg.channels]; } catch (std::bad_alloc const &ba) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sidplayfp-2.11.0/src/audio/wav/WavFile.cpp new/sidplayfp-2.12.0/src/audio/wav/WavFile.cpp --- old/sidplayfp-2.11.0/src/audio/wav/WavFile.cpp 2024-11-03 14:32:57.000000000 +0100 +++ new/sidplayfp-2.12.0/src/audio/wav/WavFile.cpp 2024-12-01 15:10:44.000000000 +0100 @@ -153,7 +153,7 @@ // We need to make a buffer for the user try { - _sampleBuffer = new short[bufSize]; + _sampleBuffer = new short[bufSize/2]; } catch (std::bad_alloc const &ba) {
