Merge ~mkukri/ubuntu/+source/sidplay:merge into ubuntu/+source/sidplay:debian/sid

[Mate Kukri]

Merge with Debian unstable:
* Debian merge removes reliance on outdated debhelper
* Retained ALSA API update; converted ugly upstream source changes to quilt patch

PPA testbuild: https://launchpad.net/~mkukri/+archive/ubuntu/dev/+packages

[Erich Eickmeyer (eeickmeyer)]

LGTM, and with the ppa build, looks good.

review: Approve

[Simon Quigley (tsimonq2)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 22937fd..172bde8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sidplay (2.0.9-7ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+   - Backport portions of patch from Cybjit resolving failure to play
+     audio due to missing /dev/dsp. This patch adds ALSA support.
+     (LP: #727573)
+
+ -- Mate Kukri <[e-mail]>  Fri, 05 Jan 2024 11:17:52 +0000
+
 sidplay (2.0.9-7) unstable; urgency=medium
 
   * Switch to short debhelper rules format (closes: #999210).
@@ -6,6 +15,47 @@ sidplay (2.0.9-7) unstable; urgency=medium
 
  -- Laszlo Boszormenyi (GCS) <[e-mail]>  Sat, 15 Jan 2022 08:37:32 +0100
 
+sidplay (2.0.9-6ubuntu6) groovy; urgency=medium
+
+  * Fix ftbfs with current alsa.
+  * Bump debhelper version.
+
+ -- Matthias Klose <[e-mail]>  Thu, 21 May 2020 16:23:06 +0200
+
+sidplay (2.0.9-6ubuntu5) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <[e-mail]>  Mon, 23 Mar 2020 08:58:32 +0100
+
+sidplay (2.0.9-6ubuntu4) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <[e-mail]>  Thu, 05 Sep 2019 11:08:56 +0000
+
+sidplay (2.0.9-6ubuntu3) wily; urgency=medium
+
+  * No-change rebuild against libsidplay2v5
+
+ -- Martin Pitt <[e-mail]>  Wed, 12 Aug 2015 10:56:34 +0200
+
+sidplay (2.0.9-6ubuntu2) utopic; urgency=medium
+
+  * Use autotools-dev to update config.{sub,guess} for new arches.
+  * Remove config.{sub,guess} from root.
+
+ -- Logan Rosen <[e-mail]>  Mon, 06 Oct 2014 21:38:56 -0400
+
+sidplay (2.0.9-6ubuntu1) oneiric; urgency=low
+
+  * Backport portions of patch from Cybjit resolving failure to play
+    audio due to missing /dev/dsp. This patch adds ALSA support.
+    (LP: #727573)
+  * Update configure.ac; run autoconf.
+
+ -- Daniel T Chen <[e-mail]>  Sun, 14 Aug 2011 11:59:35 -0400
+
 sidplay (2.0.9-6) unstable; urgency=low
 
   * Fix invalid conversion from 'const char*' to 'char*' compilation errors
diff --git a/debian/control b/debian/control
index 636da9e..b479ed5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: sidplay
 Section: sound
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
-Build-Depends: debhelper-compat (= 13), libsidplay2-dev (>= 2.1.1-4), libresid-builder-dev (>= 2.1.1), libsidutils-dev, libtool-bin, pkg-config
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
+Build-Depends: debhelper-compat (= 13), libsidplay2-dev (>= 2.1.1-4), libresid-builder-dev (>= 2.1.1), libsidutils-dev, libtool-bin, pkg-config, libasound2-dev
 Homepage: http://sidplay2.sourceforge.net/
 Standards-Version: 4.6.0.1
 
diff --git a/debian/patches/alsa_support.patch b/debian/patches/alsa_support.patch
new file mode 100644
index 0000000..73f2d58
--- /dev/null
+++ b/debian/patches/alsa_support.patch
@@ -0,0 +1,470 @@
+Description: Update outdated ALSA API usage
+Author: Daniel T Chen <[e-mail]>
+Last-Update: 2024-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/audio/alsa/audiodrv.cpp
++++ b/src/audio/alsa/audiodrv.cpp
+@@ -3,6 +3,9 @@
+ // --------------------------------------------------------------------------
+ /***************************************************************************
+  *  $Log: audiodrv.cpp,v $
++ *  Revision 1.8  2008/07/19 13:58:04  wnd
++ *  Almost complete rewrite to support new ALSA API.
++ *
+  *  Revision 1.7  2002/03/04 19:07:48  s_a_white
+  *  Fix C++ use of nothrow.
+  *
+@@ -29,171 +32,277 @@
+  ***************************************************************************/
+ 
+ #include "audiodrv.h"
+-#ifdef   HAVE_ALSA
++#ifdef HAVE_ALSA
+ 
+ #include <stdio.h>
+ #ifdef HAVE_EXCEPTIONS
+-#   include <new>
++#include <new>
+ #endif
+ 
++#include <alsa/asoundlib.h>
++#include <string.h>
++
++#define ALSA_DEFAULT "default"
++
+ Audio_ALSA::Audio_ALSA()
+ {
+-    // Reset everything.
+-    outOfOrder();
++	// Reset everything.
++	outOfOrder();
++}
++
++Audio_ALSA::~Audio_ALSA()
++{
++	close ();
+ }
+ 
+-Audio_ALSA::~Audio_ALSA ()
++void
++Audio_ALSA::outOfOrder()
+ {
+-    close ();
++	// Reset everything.
++	_swapEndian = false;
++	_bufShift = 0;
++	_errorString = "None";
++	_audioHandle = NULL;
+ }
+ 
+-void Audio_ALSA::outOfOrder ()
+-{
+-    // Reset everything.
+-    _errorString = "None";
+-    _audioHandle = NULL;
+-}
+-
+-void *Audio_ALSA::open (AudioConfig &cfg, const char *)
+-{
+-    AudioConfig tmpCfg;
+-    int mask, wantedFormat, format;
+-    int rtn;
+-    int card = -1, dev = 0;
+-   
+-    if (_audioHandle != NULL)
+-    {
+-        _errorString = "ERROR: Device already in use";
+-        return NULL;
+-    }
+-
+-    if ((rtn = snd_pcm_open_preferred (&_audioHandle, &card, &dev, SND_PCM_OPEN_PLAYBACK)))
+-    {
+-        _errorString = "ERROR: Could not open audio device.";
+-        goto open_error;
+-    }
+-    
+-    // Transfer input parameters to this object.
+-    // May later be replaced with driver defaults.
+-    tmpCfg = cfg;
+-
+-    snd_pcm_channel_params_t pp;
+-    snd_pcm_channel_setup_t setup;
+- 
+-    snd_pcm_channel_info_t pi;
+-   
+-    memset (&pi, 0, sizeof (pi));
+-    pi.channel = SND_PCM_CHANNEL_PLAYBACK;
+-    if ((rtn = snd_pcm_plugin_info (_audioHandle, &pi)))
+-    {
+-        _errorString = "ALSA: snd_pcm_plugin_info failed.";
+-        goto open_error;
+-    }
+-			
+-    memset(&pp, 0, sizeof (pp));
++bool
++Audio_ALSA::fmt(AudioConfig &cfg, snd_pcm_hw_params_t *hw)
++{
++	struct precinfo {
++		snd_pcm_format_t format;
++		int encoding;
++		int precision;
++		int swap;
++	};
++	struct precinfo info[] = {
++#if defined(WORDS_BIGENDIAN)
++		{ SND_PCM_FORMAT_S16_BE, AUDIO_SIGNED_PCM, 16, false },
++		{ SND_PCM_FORMAT_U16_BE, AUDIO_UNSIGNED_PCM, 16, false },
++		{ SND_PCM_FORMAT_S16_LE, AUDIO_SIGNED_PCM, 16, true },
++		{ SND_PCM_FORMAT_U16_LE, AUDIO_UNSIGNED_PCM, 16, true },
++#else
++		{ SND_PCM_FORMAT_S16_LE, AUDIO_SIGNED_PCM, 16, false },
++		{ SND_PCM_FORMAT_U16_LE, AUDIO_UNSIGNED_PCM, 16, false },
++		{ SND_PCM_FORMAT_S16_BE, AUDIO_SIGNED_PCM, 16, true },
++		{ SND_PCM_FORMAT_U16_BE, AUDIO_UNSIGNED_PCM, 16, true },
++#endif
++		{ SND_PCM_FORMAT_S8, AUDIO_SIGNED_PCM, 8, false },
++		{ SND_PCM_FORMAT_U8, AUDIO_UNSIGNED_PCM, 8, false }
++	};
++
++	switch (cfg.precision) {
++		case 8:
++			for (int i = 0; i < 2; i++) {
++				struct precinfo t;
++				memcpy(&t, &info[i], sizeof(t));
++				memcpy(&info[i + 4], &info[i], sizeof(t));
++				memcpy(&info[i], &t, sizeof(t));
++			}
++			break;
++		case 16:
++			break;
++		default:
++			fprintf(stderr, "Unsupported precision: %d bits\n",
++					cfg.precision);
++			return false;
++	}
++
++	int err;
++	for (int i = 0; i < 6; i++) {
++		err = snd_pcm_hw_params_set_format(_audioHandle, hw,
++				info[i].format);
++		if (err < 0) {
++			continue;
++		}
++
++		cfg.precision = info[i].precision;
++		cfg.encoding = info[i].encoding;
++		_swapEndian = info[i].swap;
++		_bufShift = info[i].precision == 8 ? 0 : 1;
++		return true;
++	}
+ 	
+-    pp.mode = SND_PCM_MODE_BLOCK;
+-    pp.channel = SND_PCM_CHANNEL_PLAYBACK;
+-    pp.start_mode = SND_PCM_START_FULL;
+-    pp.stop_mode = SND_PCM_STOP_STOP;
+-				     
+-    pp.buf.block.frag_size = pi.max_fragment_size;
+-
+-    pp.buf.block.frags_max = 1;
+-    pp.buf.block.frags_min = 1;
+-   
+-    pp.format.interleave = 1;
+-    pp.format.rate = tmpCfg.frequency;
+-    pp.format.voices = tmpCfg.channels;
+-   
+-    // Set sample precision and type of encoding.
+-    if ( tmpCfg.precision == 8 )
+-    {
+-        tmpCfg.encoding = AUDIO_UNSIGNED_PCM;
+-        pp.format.format = SND_PCM_SFMT_U8;
+-    }
+-    if ( tmpCfg.precision == 16 )
+-    {
+-        tmpCfg.encoding = AUDIO_SIGNED_PCM;
+-        pp.format.format = SND_PCM_SFMT_S16_LE;
+-    }
+-
+-    if ((rtn = snd_pcm_plugin_params (_audioHandle, &pp)) < 0)
+-    {
+-        _errorString = "ALSA: snd_pcm_plugin_params failed.";
+-        goto open_error;
+-    }
+-   
+-    if ((rtn = snd_pcm_plugin_prepare (_audioHandle, SND_PCM_CHANNEL_PLAYBACK)) < 0)
+-    {
+-        _errorString = "ALSA: snd_pcm_plugin_prepare failed.";
+-        goto open_error;
+-    }
+-   
+-    memset (&setup, 0, sizeof (setup));
+-    setup.channel = SND_PCM_CHANNEL_PLAYBACK;
+-    if ((rtn = snd_pcm_plugin_setup (_audioHandle, &setup)) < 0)
+-    {
+-        _errorString = "ALSA: snd_pcm_plugin_setup failed.";
+-        goto open_error;
+-    }
++	fprintf(stderr, "Cannot set sample format: %s\n", snd_strerror(err));
++	return false;
++}
++
++
++
++bool
++Audio_ALSA::init(AudioConfig &cfg, snd_pcm_hw_params_t *hw)
++{
++	int err;
++
++	err = snd_pcm_hw_params_any(_audioHandle, hw);
++	if (err < 0) {
++		fprintf(stderr, "Cannot initialize hardware "
++				"parameter structure: %s\n",
++				snd_strerror(err));
++		return false;
++	}
++
++	err = snd_pcm_hw_params_set_access(_audioHandle, hw,
++			SND_PCM_ACCESS_RW_INTERLEAVED);
++	if (err < 0) {
++		fprintf(stderr, "Cannot set access type: %s\n",
++				snd_strerror(err));
++		return false;
++	}
++
++	/* try to find supported format/precision */
++	if (! fmt(cfg, hw)) {
++		return false;
++	}
++
++	/* use closest frequency */
++	unsigned int realFreq = (unsigned int) cfg.frequency;
++	err = snd_pcm_hw_params_set_rate_near(_audioHandle, hw, &realFreq, 0);
++	if (err < 0) {
++		fprintf(stderr, "Cannot set sample rate: %s\n",
++				snd_strerror(err));
++		return false;
++	}
++	cfg.frequency = realFreq;
++
++	switch (cfg.channels) {
++		case 2:
++			_bufShift++;
++			break;
++		case 1:
++			break;
++		default:
++			fprintf(stderr, "Unsupported channel count: %d\n",
++					cfg.channels);
++			return false;
++	}
++	err = snd_pcm_hw_params_set_channels(_audioHandle, hw,
++			cfg.channels);
++	if (err < 0) {
++		fprintf(stderr, "Cannot set channel count: %s\n",
++				snd_strerror(err));
++		return false;
++	}
++
++	err = snd_pcm_hw_params(_audioHandle, hw);
++	if (err < 0) {
++		fprintf(stdout, "Cannot set parameters: %s\n",
++				snd_strerror(err));
++		return false;
++	}
+ 
+-    tmpCfg.bufSize = setup.buf.block.frag_size;
++	return true;
++}
++
++
++
++void *
++Audio_ALSA::open(AudioConfig &cfg, const char *name)
++{
++	AudioConfig tmpCfg = cfg;
++	snd_pcm_hw_params_t *hw;
++	int err;
++
++	if (_audioHandle != NULL) {
++		_errorString = "ERROR: Device already in use";
++		return NULL;
++	}
++
++	err = snd_pcm_open(&_audioHandle, ALSA_DEFAULT,
++			SND_PCM_STREAM_PLAYBACK, 0);
++	if (err < 0) {
++		_errorString = "ERROR: Could not open audio device.";
++		fprintf(stderr, "Cannot open audio device: %s\n",
++				snd_strerror(err));
++		return NULL;
++	}
++
++	err = snd_pcm_hw_params_malloc(&hw);
++	if (err < 0) {
++		_errorString = "ERROR: Cannot initialise ALSA";
++		fprintf(stderr, "Cannot allocate hardware "
++				"parameter structure: %s\n",
++				snd_strerror(err));
++		return NULL;
++	}
++
++	bool init_ok = init(tmpCfg, hw);
++	snd_pcm_hw_params_free(hw);
++	if (! init_ok) {
++		_errorString = "ERROR: Cannot initialise ALSA";
++		return NULL;
++	}
++
++	err = snd_pcm_prepare(_audioHandle);
++	if (err < 0) {
++		_errorString = "Cannot initialise ALSA";
++		fprintf(stderr, "cannot prepare audio interface for use: %s\n",
++				snd_strerror(err));
++		return NULL;
++	}
++
++	tmpCfg.bufSize = 4096;
+ #ifdef HAVE_EXCEPTIONS
+-    _sampleBuffer = new(std::nothrow) int_least8_t[tmpCfg.bufSize];
++	_sampleBuffer = new(std::nothrow) int_least8_t[tmpCfg.bufSize];
+ #else
+-    _sampleBuffer = new int_least8_t[tmpCfg.bufSize];
++	_sampleBuffer = new int_least8_t[tmpCfg.bufSize];
+ #endif
+ 
+-    if (!_sampleBuffer)
+-    {
+-        _errorString = "AUDIO: Unable to allocate memory for sample buffers.";
+-        goto open_error;
+-    }
+-
+-    // Setup internal Config
+-    _settings = tmpCfg;
+-    // Update the users settings
+-    getConfig (cfg);
+-    return _sampleBuffer;
+-
+-open_error:
+-    if (_audioHandle != NULL)
+-    {
+-        close ();
+-    }
+-
+-    perror ("ALSA");
+-return NULL;
++	if (!_sampleBuffer) {
++		_errorString = "Unable to allocate memory for sample buffers";
++		return NULL;
++	}
++
++	// Setup internal Config
++	_settings = tmpCfg;
++	// Update the users settings
++	getConfig (cfg);
++	return _sampleBuffer;
+ }
+ 
++
++
+ // Close an opened audio device, free any allocated buffers and
+ // reset any variables that reflect the current state.
+-void Audio_ALSA::close ()
++void
++Audio_ALSA::close()
+ {
+-    if (_audioHandle != NULL )
+-    {
+-        snd_pcm_close(_audioHandle);
+-        delete [] _sampleBuffer;
+-        outOfOrder ();
+-    }
++	if (_audioHandle != NULL) {
++		snd_pcm_close(_audioHandle);
++		delete [] _sampleBuffer;
++		outOfOrder ();
++	}
+ }
+ 
+-void *Audio_ALSA::reset ()
++
++
++void *
++Audio_ALSA::reset ()
+ {
+-    return (void *) _sampleBuffer;   
++	return (void *) _sampleBuffer;   
+ }
+ 
+-void *Audio_ALSA::write ()
+-{
+-    if (_audioHandle == NULL)
+-    {
+-        _errorString = "ERROR: Device not open.";
+-        return NULL;
+-    }
+ 
+-    snd_pcm_plugin_write (_audioHandle, _sampleBuffer, _settings.bufSize);
+-    return (void *) _sampleBuffer;
++
++void *
++Audio_ALSA::write()
++{
++	if (_audioHandle == NULL)
++	{
++		_errorString = "ERROR: Device not open.";
++		return NULL;
++	}
++
++	if (_swapEndian) {
++		for (int n = 0; n < _settings.bufSize; n += 2) {
++			char t = ((char *) _sampleBuffer)[n];
++			((char *) _sampleBuffer)[n] =
++				((char *) _sampleBuffer)[n + 1];
++			((char *) _sampleBuffer)[n + 1] = t;
++		}
++	}
++	snd_pcm_writei(_audioHandle, _sampleBuffer,
++			_settings.bufSize >> _bufShift);
++	return (void *) _sampleBuffer;
+ }
+ 
+ #endif // HAVE_ALSA
+--- a/src/audio/alsa/audiodrv.h
++++ b/src/audio/alsa/audiodrv.h
+@@ -3,6 +3,9 @@
+ // --------------------------------------------------------------------------
+ /***************************************************************************
+  *  $Log: audiodrv.h,v $
++ *  Revision 1.6  2008/07/19 13:58:04  wnd
++ *  Update to new ALSA API.
++ *
+  *  Revision 1.5  2002/01/10 19:04:00  s_a_white
+  *  Interface changes for audio drivers.
+  *
+@@ -36,7 +39,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+-#include <sys/asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include "../AudioBase.h"
+ 
+ 
+@@ -44,6 +47,8 @@
+ {	
+ private:  // ------------------------------------------------------- private
+     snd_pcm_t * _audioHandle;
++    bool _swapEndian;
++    int _bufShift;
+ 
+     void outOfOrder ();
+ 
+@@ -51,6 +56,8 @@
+     Audio_ALSA();
+     ~Audio_ALSA();
+ 
++    bool  fmt   (AudioConfig &cfg, snd_pcm_hw_params_t *hw);
++    bool  init  (AudioConfig &cfg, snd_pcm_hw_params_t *hw);
+     void *open  (AudioConfig &cfg, const char *name);
+     void  close ();
+     // Rev 1.2 (saw) - Changed, see AudioBase.h	
diff --git a/debian/patches/series b/debian/patches/series
index 6f838cd..84f2f5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ code_update.patch
 manpage_spelling.patch
 modernize.patch
 #use_alsa.patch
+alsa_support.patch
diff --git a/debian/rules b/debian/rules
index 218df65..a71d69b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,3 +6,6 @@
 
 %:
 	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- --with-alsa