diff -Nru alsa-oss-1.0.28/aclocal.m4 alsa-oss-1.1.8/aclocal.m4 --- alsa-oss-1.0.28/aclocal.m4 2014-06-13 09:25:15.000000000 +0000 +++ alsa-oss-1.1.8/aclocal.m4 2019-01-07 13:23:48.000000000 +0000 @@ -65,6 +65,8 @@ fi AC_MSG_RESULT($ALSA_CFLAGS) +AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) + dnl add any special lib dirs AC_MSG_CHECKING(for ALSA LDFLAGS) if test "$alsa_prefix" != "" ; then @@ -73,7 +75,7 @@ fi dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" +ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" LIBS="$ALSA_LIBS $LIBS" AC_MSG_RESULT($ALSA_LIBS) diff -Nru alsa-oss-1.0.28/alsa/alsa-oss.c alsa-oss-1.1.8/alsa/alsa-oss.c --- alsa-oss-1.0.28/alsa/alsa-oss.c 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/alsa/alsa-oss.c 2019-01-07 12:55:41.000000000 +0000 @@ -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 -Nru alsa-oss-1.0.28/alsa/alsa-oss-emul.h alsa-oss-1.1.8/alsa/alsa-oss-emul.h --- alsa-oss-1.0.28/alsa/alsa-oss-emul.h 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/alsa/alsa-oss-emul.h 2019-01-07 12:55:41.000000000 +0000 @@ -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 -Nru alsa-oss-1.0.28/alsa/mixer.c alsa-oss-1.1.8/alsa/mixer.c --- alsa-oss-1.0.28/alsa/mixer.c 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/alsa/mixer.c 2019-01-07 12:55:41.000000000 +0000 @@ -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 -Nru alsa-oss-1.0.28/alsa/pcm.c alsa-oss-1.1.8/alsa/pcm.c --- alsa-oss-1.0.28/alsa/pcm.c 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/alsa/pcm.c 2019-01-07 12:55:41.000000000 +0000 @@ -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 -Nru alsa-oss-1.0.28/alsa/stdioemu.c alsa-oss-1.1.8/alsa/stdioemu.c --- alsa-oss-1.0.28/alsa/stdioemu.c 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/alsa/stdioemu.c 2019-01-07 12:55:41.000000000 +0000 @@ -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 */ @@ -37,7 +37,6 @@ #endif #include -#include struct fd_cookie { int fd; diff -Nru alsa-oss-1.0.28/configure alsa-oss-1.1.8/configure --- alsa-oss-1.0.28/configure 2014-06-13 09:25:17.000000000 +0000 +++ alsa-oss-1.1.8/configure 2019-01-07 13:23:50.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for alsa-oss 1.0.28. +# Generated by GNU Autoconf 2.69 for alsa-oss 1.1.8. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='alsa-oss' PACKAGE_TARNAME='alsa-oss' -PACKAGE_VERSION='1.0.28' -PACKAGE_STRING='alsa-oss 1.0.28' +PACKAGE_VERSION='1.1.8' +PACKAGE_STRING='alsa-oss 1.1.8' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1326,7 +1326,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 alsa-oss 1.0.28 to adapt to many kinds of systems. +\`configure' configures alsa-oss 1.1.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alsa-oss 1.0.28:";; + short | recursive ) echo "Configuration of alsa-oss 1.1.8:";; esac cat <<\_ACEOF @@ -1509,7 +1509,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alsa-oss configure 1.0.28 +alsa-oss configure 1.1.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1908,7 +1908,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alsa-oss $as_me 1.0.28, which was +It was created by alsa-oss $as_me 1.1.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2732,7 +2732,7 @@ # Define the identity of the package. PACKAGE='alsa-oss' - VERSION='1.0.28' + VERSION='1.1.8' cat >>confdefs.h <<_ACEOF @@ -15029,6 +15029,88 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5 $as_echo "$ALSA_CFLAGS" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5 +$as_echo_n "checking for dlopen in -lc... " >&6; } +if ${ac_cv_lib_c_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_dlopen=yes +else + ac_cv_lib_c_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_dlopen" >&5 +$as_echo "$ac_cv_lib_c_dlopen" >&6; } +if test "x$ac_cv_lib_c_dlopen" = xyes; then : + LIBDL="" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + LIBDL="-ldl" +fi + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA LDFLAGS" >&5 $as_echo_n "checking for ALSA LDFLAGS... " >&6; } if test "$alsa_prefix" != "" ; then @@ -15036,7 +15118,7 @@ LDFLAGS="$LDFLAGS $ALSA_LIBS" fi -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" +ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" LIBS="$ALSA_LIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 $as_echo "$ALSA_LIBS" >&6; } @@ -15778,7 +15860,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alsa-oss $as_me 1.0.28, which was +This file was extended by alsa-oss $as_me 1.1.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15835,7 +15917,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alsa-oss config.status 1.0.28 +alsa-oss config.status 1.1.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru alsa-oss-1.0.28/configure.ac alsa-oss-1.1.8/configure.ac --- alsa-oss-1.0.28/configure.ac 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/configure.ac 2019-01-07 12:55:41.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(alsa-oss, 1.0.28) +AC_INIT(alsa-oss, 1.1.8) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) diff -Nru alsa-oss-1.0.28/COPYING alsa-oss-1.1.8/COPYING --- alsa-oss-1.0.28/COPYING 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/COPYING 2019-01-07 12:55:41.000000000 +0000 @@ -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 -Nru alsa-oss-1.0.28/debian/changelog alsa-oss-1.1.8/debian/changelog --- alsa-oss-1.0.28/debian/changelog 2014-08-15 07:58:47.000000000 +0000 +++ alsa-oss-1.1.8/debian/changelog 2020-04-21 18:15:43.000000000 +0000 @@ -1,11 +1,46 @@ -alsa-oss (1.0.28-1ubuntu1) utopic; urgency=medium +alsa-oss (1.1.8-1~18.04.sav0) bionic; urgency=medium - * Reintroduce changes dropped in sync, try to fix FTBFS on ppc64el: - - debian/control, debian/rules: - + Use dh-autoreconf to get new libtool macros for ppc64el - and update config.{sub,guess} for new arches. + * Backport to Bionic - -- Artur Rona Fri, 15 Aug 2014 09:55:24 +0200 + -- Rob Savoury Tue, 21 Apr 2020 11:15:43 -0700 + +alsa-oss (1.1.8-1) unstable; urgency=medium + + * New upstream release. + * Removed ftbfs_glibc_2.28.patch. Applied upstream. + * Update to Standards-Version 4.3.0. + + -- Elimar Riesebieter Sat, 26 Jan 2019 11:22:42 +0100 + +alsa-oss (1.1.6-2) unstable; urgency=medium + + * Cherry-pick upstream patch to fix build with glibc 2.28 + (closes: #916052). + + -- Jordi Mallach Tue, 18 Dec 2018 00:27:03 +0100 + +alsa-oss (1.1.6-1) unstable; urgency=medium + + [ Elimar Riesebieter ] + * debian/control, debian/rules: + - Switch to dh-autoreconf to update libtool macros for ppc64el. Thanks to + Artur Rona for the patch (closes: #758255). + + [ Jordi Mallach ] + * New upstream release. + * Update Vcs-* fields to reflect conversion to Git and move to salsa.d.o. + * Add debian/gbp.conf with current git repo layout options. + * Update to debhelper compat v11. + * Drop B-Ds on dh-autoreconf and autotools-dev, now pulled in by + debhelper. + * Switch from dh_install --fail-missing to dh_missing --fail-missing. + * Update to Standards-Version 4.1.4. + * Rewrite debian/copyright in machine-readable format 1.0. + * Use https for Homepage URL. + * Remove obsolete debian/NOTES. + * Drop debian/source/options, just use the defaults. + + -- Jordi Mallach Thu, 03 May 2018 12:27:16 +0200 alsa-oss (1.0.28-1) unstable; urgency=low @@ -40,7 +75,7 @@ alsa-oss (1.0.17-5) unstable; urgency=low - * Switch to architecture wildcard 'linux-any' which incudes armhf + * Switch to architecture wildcard 'linux-any' which incudes armhf (closes: #629486). * Remove old ALSA url from long description and replace with the new one in the copyright file. diff -Nru alsa-oss-1.0.28/debian/compat alsa-oss-1.1.8/debian/compat --- alsa-oss-1.0.28/debian/compat 2013-05-12 10:09:36.000000000 +0000 +++ alsa-oss-1.1.8/debian/compat 2018-05-03 09:37:23.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru alsa-oss-1.0.28/debian/control alsa-oss-1.1.8/debian/control --- alsa-oss-1.0.28/debian/control 2014-08-15 07:58:54.000000000 +0000 +++ alsa-oss-1.1.8/debian/control 2019-01-26 10:22:42.000000000 +0000 @@ -1,15 +1,15 @@ Source: alsa-oss Section: sound Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian ALSA Maintainers +Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , Elimar Riesebieter -Build-Depends: autotools-dev, debhelper (>= 9), libasound2-dev (>= 1.0.15), dh-autoreconf -Standards-Version: 3.9.5 -Homepage: http://www.alsa-project.org/ -Vcs-Svn: svn://anonscm.debian.org/pkg-alsa/trunk/alsa-oss -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-alsa/trunk/alsa-oss/ +Build-Depends: debhelper (>= 11~), + libasound2-dev (>= 1.0.15) +Standards-Version: 4.3.0 +Homepage: https://www.alsa-project.org/ +Vcs-Git: https://salsa.debian.org/alsa-team/alsa-oss.git +Vcs-Browser: https://salsa.debian.org/alsa-team/alsa-oss Package: alsa-oss Architecture: linux-any diff -Nru alsa-oss-1.0.28/debian/copyright alsa-oss-1.1.8/debian/copyright --- alsa-oss-1.0.28/debian/copyright 2013-05-12 10:09:36.000000000 +0000 +++ alsa-oss-1.1.8/debian/copyright 2018-05-03 10:20:18.000000000 +0000 @@ -1,35 +1,35 @@ -This package was debianized by Jordi Mallach on 19 Nov 2003. - -Since September 2002 it has been maintained by the participants in -the pkg-alsa project at alioth.debian.org. - -Bugs in the source code (as opposed to bugs in the packaging) are best -reported to the upstream bug tracking system: - - https://bugtrack.alsa-project.org/alsa-bug - -The source code was downloaded from the ALSA homepage: - - http://www.alsa-project.org/ - -alsa-oss --------- -Copyright (c) 2001 Jarsolav Kysela and others. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - 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., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU GPL can be found in the -/usr/share/common-licenses/GPL-2 file. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: alsa-oss +Upstream-Contact: Jarsolav Kysela +Source: ftp://ftp.alsa-project.org/pub/oss-lib +Comment: This package was debianized by Jordi Mallach on 19 Nov 2003. + Since 13 April 2004 it has been maintained by the participants in + the pkg-alsa project at alioth.debian.org. + +Files: * +Copyright: 1998-2018 Jarsolav Kysela and others +License: GPL-2+ + +Files: debian/* +Copyright: 2003-2004 Jordi Mallach + 2004-2018 Debian ALSA Maintainers +License: GPL-2+ + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + 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., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2. diff -Nru alsa-oss-1.0.28/debian/gbp.conf alsa-oss-1.1.8/debian/gbp.conf --- alsa-oss-1.0.28/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-oss-1.1.8/debian/gbp.conf 2018-04-12 00:18:35.000000000 +0000 @@ -0,0 +1,5 @@ +[DEFAULT] +pristine-tar = True +debian-branch = debian/master +upstream-branch = upstream/latest +upstream-vcs-tag = v%(version)s diff -Nru alsa-oss-1.0.28/debian/NOTES alsa-oss-1.1.8/debian/NOTES --- alsa-oss-1.0.28/debian/NOTES 2013-05-12 10:09:36.000000000 +0000 +++ alsa-oss-1.1.8/debian/NOTES 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ - MAINTAINER NOTES - for alsa-oss - - -TODO for each new upstream release -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Check Ubuntu patches at http://people.ubuntulinux.org/~scott/patches/ -* Update debian/changelog.ALSA from release announcement - diff -Nru alsa-oss-1.0.28/debian/rules alsa-oss-1.1.8/debian/rules --- alsa-oss-1.0.28/debian/rules 2014-08-15 07:34:07.000000000 +0000 +++ alsa-oss-1.1.8/debian/rules 2018-05-03 09:37:23.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ --with autoreconf + dh $@ # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: @@ -10,7 +10,10 @@ override_dh_install: find debian/tmp -name '*.la' -delete find debian/tmp -name '*.a' -delete - dh_install --fail-missing + dh_install + +override_dh_missing: + dh_missing --fail-missing # Install the manually generated upstream ChangeLog override_dh_installchangelogs: diff -Nru alsa-oss-1.0.28/debian/source/options alsa-oss-1.1.8/debian/source/options --- alsa-oss-1.0.28/debian/source/options 2013-05-12 10:09:36.000000000 +0000 +++ alsa-oss-1.1.8/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -compression = "gzip" -compression-level = 9 diff -Nru alsa-oss-1.0.28/oss-redir/oss-redir.c alsa-oss-1.1.8/oss-redir/oss-redir.c --- alsa-oss-1.0.28/oss-redir/oss-redir.c 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/oss-redir/oss-redir.c 2019-01-07 12:55:41.000000000 +0000 @@ -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 -Nru alsa-oss-1.0.28/oss-redir/oss-redir.h alsa-oss-1.1.8/oss-redir/oss-redir.h --- alsa-oss-1.0.28/oss-redir/oss-redir.h 2014-06-12 09:33:37.000000000 +0000 +++ alsa-oss-1.1.8/oss-redir/oss-redir.h 2019-01-07 12:55:41.000000000 +0000 @@ -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 * */