From 158a2125e46f65e18d6777864843fd6788bd388f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 29 May 2008 13:21:12 +0200 Subject: [PATCH 01/16] gitcompile: HGCOMPILE_NO_MAKE -> GITCOMPILE_NO_MAKE --- gitcompile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitcompile b/gitcompile index 8b5109b..6e089f8 100755 --- a/gitcompile +++ b/gitcompile @@ -9,6 +9,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$HGCOMPILE_NO_MAKE" ]; then +if [ -z "$GITCOMPILE_NO_MAKE" ]; then make fi -- 2.47.3 From b848f008d300500399129e6616e160d05e46476e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 14 Jul 2008 10:58:00 +0200 Subject: [PATCH 02/16] Release v1.0.17 Signed-off-by: Jaroslav Kysela --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index e17c027..c73f03b 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_PREREQ(2.59) AC_INIT(alsa/alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 1.0.15) +AM_INIT_AUTOMAKE(alsa-oss, 1.0.17) LIBTOOL_VERSION_INFO="0:0:0" AC_SUBST(LIBTOOL_VERSION_INFO) -- 2.47.3 From 537ebb941107ad8c3c51e559eea865bd5348d1de Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 15 Mar 2011 17:59:00 +0100 Subject: [PATCH 03/16] select: better check for null bit arrays Signed-off-by: Jaroslav Kysela --- alsa/alsa-oss.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/alsa/alsa-oss.c b/alsa/alsa-oss.c index 632679f..8294344 100644 --- a/alsa/alsa-oss.c +++ b/alsa/alsa-oss.c @@ -687,19 +687,23 @@ static int select_with_pcm(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, int result = lib_oss_pcm_select_result(fd, rfds1, wfds1, efds1); r1 = w1 = e1 = 0; if (result < 0 && e) { - FD_SET(fd, efds); + if (efds) + FD_SET(fd, efds); e1 = 1; } else { if (result & OSS_WAIT_EVENT_ERROR) { - FD_SET(fd, efds); + if (efds) + FD_SET(fd, efds); e1 = 1; } if (result & OSS_WAIT_EVENT_READ) { - FD_SET(fd, rfds); + if (rfds) + FD_SET(fd, rfds); r1 = 1; } if (result & OSS_WAIT_EVENT_WRITE) { - FD_SET(fd, wfds); + if (wfds) + FD_SET(fd, wfds); w1 = 1; } } @@ -708,11 +712,11 @@ static int select_with_pcm(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, w1 = (w && FD_ISSET(fd, wfds1)); e1 = (e && FD_ISSET(fd, efds1)); } - if (r && !r1) + if (r && !r1 && rfds) FD_CLR(fd, rfds); - if (w && !w1) + if (w && !w1 && wfds) FD_CLR(fd, wfds); - if (e && !e1) + if (e && !e1 && efds) FD_CLR(fd, efds); if (r1 || w1 || e1) count++; -- 2.47.3 From 1dfe1bb78a48077b699fe96a834ce0e78df386e3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 17 Mar 2011 15:22:21 +0100 Subject: [PATCH 04/16] pcm: check for XRUN state for GETxSPACE and GETxPTR ioctls Signed-off-by: Jaroslav Kysela --- alsa/pcm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/alsa/pcm.c b/alsa/pcm.c index bfb0ccf..19b67e0 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -1096,6 +1096,12 @@ int lib_oss_pcm_ioctl(int fd, unsigned long cmd, ...) break; } state = snd_pcm_state(pcm); + if (state == SND_PCM_STATE_XRUN) { + err = xrun(pcm); + if (err < 0) + break; + state = snd_pcm_state(pcm); + } if (state == SND_PCM_STATE_SUSPENDED) { err = resume(pcm); if (err < 0) @@ -1135,6 +1141,12 @@ int lib_oss_pcm_ioctl(int fd, unsigned long cmd, ...) break; } state = snd_pcm_state(pcm); + if (state == SND_PCM_STATE_XRUN) { + err = xrun(pcm); + if (err < 0) + break; + state = snd_pcm_state(pcm); + } if (state == SND_PCM_STATE_SUSPENDED) { err = resume(pcm); if (err < 0) @@ -1174,6 +1186,12 @@ int lib_oss_pcm_ioctl(int fd, unsigned long cmd, ...) break; } state = snd_pcm_state(pcm); + if (state == SND_PCM_STATE_XRUN) { + err = xrun(pcm); + if (err < 0) + break; + state = snd_pcm_state(pcm); + } if (state == SND_PCM_STATE_SUSPENDED) { err = resume(pcm); if (err < 0) @@ -1221,6 +1239,12 @@ int lib_oss_pcm_ioctl(int fd, unsigned long cmd, ...) err = -EINVAL; break; } + if (state == SND_PCM_STATE_XRUN) { + err = xrun(pcm); + if (err < 0) + break; + state = snd_pcm_state(pcm); + } state = snd_pcm_state(pcm); if (state == SND_PCM_STATE_SUSPENDED) { err = resume(pcm); -- 2.47.3 From 4e319b390828108a394c5320a412385fb55fa18c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 25 Jan 2012 08:57:09 +0100 Subject: [PATCH 05/16] Release v1.0.25 Signed-off-by: Jaroslav Kysela --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index c73f03b..d0318e7 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_PREREQ(2.59) AC_INIT(alsa/alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 1.0.17) +AM_INIT_AUTOMAKE(alsa-oss, 1.0.25) LIBTOOL_VERSION_INFO="0:0:0" AC_SUBST(LIBTOOL_VERSION_INFO) -- 2.47.3 From 53e8f2dace57cd428e046059ac7172e58d206429 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Wed, 15 May 2013 18:58:05 +0200 Subject: [PATCH 06/16] Fix path to libaoss.so. Fix path to libaoss.so using ${libdir} instead of ${exec_prefix}. ${libdir} has the value given at configure time and works with Debian's Multiarch implementation. Signed-off-by: Jordi Mallach Signed-off-by: Takashi Iwai --- alsa/aoss.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/aoss.in b/alsa/aoss.in index c551431..d8e1d6d 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -6,8 +6,8 @@ if [ -d /proc/asound ]; then prefix=@prefix@ - exec_prefix=@exec_prefix@ - LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" + libdir=@libdir@ + LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else exec "$@" fi -- 2.47.3 From 39df15865875c005ca13714ca464833162a2a24d Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Wed, 15 May 2013 18:58:07 +0200 Subject: [PATCH 07/16] Add AM_MAINTAINER_MODE([enable]) to configure.in. Signed-off-by: Jordi Mallach Signed-off-by: Takashi Iwai --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index d0318e7..0afeb8a 100644 --- a/configure.in +++ b/configure.in @@ -2,6 +2,8 @@ AC_PREREQ(2.59) AC_INIT(alsa/alsa-oss.c) AM_INIT_AUTOMAKE(alsa-oss, 1.0.25) +AM_MAINTAINER_MODE([enable]) + LIBTOOL_VERSION_INFO="0:0:0" AC_SUBST(LIBTOOL_VERSION_INFO) -- 2.47.3 From 61046ff874dc793f3591727e7c44f91f2f1ffaa7 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 28 Apr 2014 11:46:02 +0200 Subject: [PATCH 08/16] Revert "Fix path to libaoss.so." This reverts commit 53e8f2dace57cd428e046059ac7172e58d206429. This breaks the multi-arch usage. The original code uses ${exec_prefix} intentionally together with \$LIB (note the backslash here), so that ld.so itself expands the right path for both 32 and 64bit archs. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=874331 Signed-off-by: Takashi Iwai --- alsa/aoss.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/aoss.in b/alsa/aoss.in index d8e1d6d..c551431 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -6,8 +6,8 @@ if [ -d /proc/asound ]; then prefix=@prefix@ - libdir=@libdir@ - LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" + exec_prefix=@exec_prefix@ + LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else exec "$@" fi -- 2.47.3 From 40357524a04019173d7073b683ebc2465c3db30a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 28 Apr 2014 16:54:29 +0200 Subject: [PATCH 09/16] Fix the argument passed to snd_pcm_dump_setup() Although it's currently disabled via ifdef, better to fix it so that any other people won't fall into the same hole like me. Signed-off-by: Takashi Iwai --- alsa/pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index 19b67e0..fdf9933 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -308,8 +308,8 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; #if 0 - if (alsa_oss_debug) - snd_pcm_dump_setup(pcm, stderr); + if (alsa_oss_debug && alsa_oss_debug_out) + snd_pcm_dump_setup(pcm, alsa_oss_debug_out); #endif if (err < 0) return err; -- 2.47.3 From 22dc53a906f3550b4ad0ce82684d98228d95713c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 28 Apr 2014 16:57:18 +0200 Subject: [PATCH 10/16] Workaround for aoss + dmix with unaligned rates When an OSS stream is setup (e.g. two periods) with a rate that doesn't align with the fixed rate of the slave PCM, dmix can't establish the hw_params properly. As a dirty workaround, set either only min or max periods so that they don't conflict with each other. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=874342 Signed-off-by: Takashi Iwai --- alsa/pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index fdf9933..c23d042 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -263,10 +263,11 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; periods_min = 2; - err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); - if (err < 0) - return err; - if (dsp->maxfrags > 0) { + if (!dsp->maxfrags) { + err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); + if (err < 0) + return err; + } else { unsigned int periods_max = periods_min > dsp->maxfrags ? periods_min : dsp->maxfrags; err = snd_pcm_hw_params_set_periods_max(pcm, hw, -- 2.47.3 From d7b7fa341632df56e3990fb42c4303f878a3683e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 12 Jun 2014 11:33:29 +0200 Subject: [PATCH 11/16] Modernize configure.ac --- configure.in => configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename configure.in => configure.ac (92%) diff --git a/configure.in b/configure.ac similarity index 92% rename from configure.in rename to configure.ac index 0afeb8a..7d0923a 100644 --- a/configure.in +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT(alsa/alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 1.0.25) +AC_INIT(alsa-oss, 1.0.25) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) -- 2.47.3 From ad6f16d2c951b4ca76709bd205baef721484b71b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 12 Jun 2014 11:33:37 +0200 Subject: [PATCH 12/16] Release v1.0.28 Signed-off-by: Jaroslav Kysela --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7d0923a..b8227d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(alsa-oss, 1.0.25) +AC_INIT(alsa-oss, 1.0.28) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) -- 2.47.3 From 01edd4eb5e9583e2eb1a427f8dbedefe9d3bbeca Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 14 Nov 2017 14:50:54 +0100 Subject: [PATCH 13/16] Change FSF address (Franklin Street) Signed-off-by: Jaroslav Kysela --- COPYING | 3 ++- alsa/alsa-oss-emul.h | 2 +- alsa/alsa-oss.c | 2 +- alsa/mixer.c | 2 +- alsa/pcm.c | 2 +- alsa/stdioemu.c | 4 ++-- oss-redir/oss-redir.c | 2 +- oss-redir/oss-redir.h | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/COPYING b/COPYING index 5b6e7c6..b411c8b 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,8 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/alsa/alsa-oss-emul.h b/alsa/alsa-oss-emul.h index de42f66..44396a4 100644 --- a/alsa/alsa-oss-emul.h +++ b/alsa/alsa-oss-emul.h @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/alsa/alsa-oss.c b/alsa/alsa-oss.c index 8294344..1922755 100644 --- a/alsa/alsa-oss.c +++ b/alsa/alsa-oss.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/alsa/mixer.c b/alsa/mixer.c index 251a08a..41d51be 100644 --- a/alsa/mixer.c +++ b/alsa/mixer.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/alsa/pcm.c b/alsa/pcm.c index c23d042..0ccb0ed 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/alsa/stdioemu.c b/alsa/stdioemu.c index 54e46f6..670892b 100644 --- a/alsa/stdioemu.c +++ b/alsa/stdioemu.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA Modified to add support for 64 bit fopen by Mike Hearn */ diff --git a/oss-redir/oss-redir.c b/oss-redir/oss-redir.c index 7ae594f..8d2beb3 100644 --- a/oss-redir/oss-redir.c +++ b/oss-redir/oss-redir.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/oss-redir/oss-redir.h b/oss-redir/oss-redir.h index e518746..b8f5b78 100644 --- a/oss-redir/oss-redir.h +++ b/oss-redir/oss-redir.h @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -- 2.47.3 From 069d5190897a96a233675acd18f4866024aace13 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Apr 2018 09:01:38 +0200 Subject: [PATCH 14/16] Release v1.1.6 Signed-off-by: Jaroslav Kysela --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b8227d4..2f11853 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(alsa-oss, 1.0.28) +AC_INIT(alsa-oss, 1.1.6) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) -- 2.47.3 From 8564df1c8d114de6ddbc082004c2a74719a46717 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Thu, 13 Dec 2018 07:11:59 +0900 Subject: [PATCH 15/16] fix FTBFS with glibc v3.28 In glibc upstream, libio/libio.h had been deprecated for applications and became internal header in its v2.28 release. We can see below message in its release note[1]. * The nonstandard header files and <_G_config.h> are no longer installed. Software that was using either header should be updated to use standard interfaces instead. This brings FTBFS with glibc v2.28 due to missing . This commit fixes it. [1] https://www.sourceware.org/ml/libc-alpha/2018-08/msg00003.html Reported-by: Adrian Bunk Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916052 Signed-off-by: Takashi Sakamoto Signed-off-by: Takashi Iwai --- alsa/stdioemu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/alsa/stdioemu.c b/alsa/stdioemu.c index 670892b..f7f9ab5 100644 --- a/alsa/stdioemu.c +++ b/alsa/stdioemu.c @@ -37,7 +37,6 @@ #endif #include -#include struct fd_cookie { int fd; -- 2.47.3 From df7b0691e75ee939894e8f1a260ae3684f415d1c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 7 Jan 2019 13:55:41 +0100 Subject: [PATCH 16/16] Release v1.1.8 Signed-off-by: Jaroslav Kysela --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2f11853..583b95f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(alsa-oss, 1.1.6) +AC_INIT(alsa-oss, 1.1.8) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) -- 2.47.3