From b380da7678fa6b09eadd84a3d1dbb5e84e77f34e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 10 Oct 2005 21:55:16 +0000 Subject: [PATCH] Fix by R. Bosch to use strsignal as needed by uClibc systems #103189 by Chan Min Wai. Package-Manager: portage-2.0.53_rc4 --- media-sound/alsa-utils/ChangeLog | 10 ++++-- media-sound/alsa-utils/Manifest | 31 +++++++++++++------ .../alsa-utils/alsa-utils-1.0.10_rc1.ebuild | 14 +++++---- .../alsa-utils/alsa-utils-1.0.9a-r1.ebuild | 10 ++++-- .../files/alsa-utils-1.0.9a-strsignal.patch | 17 ++++++++++ 5 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 40aca50f50fe..a680b317897b 100644 --- a/media-sound/alsa-utils/ChangeLog +++ b/media-sound/alsa-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/alsa-utils -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.109 2005/09/14 06:59:10 agriffis Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.110 2005/10/10 21:55:16 vapier Exp $ + + 10 Oct 2005; Mike Frysinger + +files/alsa-utils-1.0.9a-strsignal.patch, alsa-utils-1.0.9a-r1.ebuild, + alsa-utils-1.0.10_rc1.ebuild: + Fix by R. Bosch to use strsignal as needed by uClibc systems #103189 by Chan + Min Wai. 14 Sep 2005; Aron Griffis alsa-utils-1.0.9a.ebuild: Mark 1.0.9a stable on alpha diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 48610aff98a9..2e8c128fc72e 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -1,17 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 024d6714b8f85dc1b274aaf45fd6738f ChangeLog 17086 +MD5 d5f267960c8fcb8ae440810a0efe297c alsa-utils-1.0.10_rc1.ebuild 2678 MD5 a2a37bf9cb817343a6a58e20cfea9bb8 alsa-utils-1.0.7.ebuild 2272 -MD5 b5f6bb65e4a152dd4845975b937c3781 alsa-utils-1.0.9a-r1.ebuild 2428 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 78e6b292416944d569f209dbd5f413c2 ChangeLog 16842 MD5 26f5354615b23de013a20117251274ee alsa-utils-1.0.8.ebuild 2269 -MD5 f13a05df61cb05b5f0a6370996e2be9e alsa-utils-1.0.10_rc1.ebuild 2610 +MD5 d9b19e1fc31acdd0b7091ce79400ce85 alsa-utils-1.0.9a-r1.ebuild 2525 MD5 8bf806386c8a966605549b7a91fd9131 alsa-utils-1.0.9a.ebuild 2343 MD5 954b0951b5fed9bf591abf9e7cc1963e files/alsa-modules.conf-rc 1162 -MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70 -MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69 -MD5 ec6210532acb9b397bacb3eb81f7593a files/digest-alsa-utils-1.0.8 69 -MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a-r1 70 MD5 6945018085dd4204d2f26490fb7b50b6 files/alsa-utils-1.0.10_rc1-largefile.patch 445 -MD5 3fe96c02287b96cbeb720e8d7b6d810a files/digest-alsa-utils-1.0.10_rc1 73 -MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515 MD5 4d2059fdfeeafe53e5d42692d9c2f14e files/alsa-utils-1.0.10_rc1-nls.patch 1959 +MD5 504c2047f55a094833631892ab099ada files/alsa-utils-1.0.9a-strsignal.patch 454 MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106 +MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515 +MD5 3fe96c02287b96cbeb720e8d7b6d810a files/digest-alsa-utils-1.0.10_rc1 73 +MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69 +MD5 ec6210532acb9b397bacb3eb81f7593a files/digest-alsa-utils-1.0.8 69 +MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70 +MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a-r1 70 +MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDSuO1gIKl8Uu19MoRAoovAJsFzb/Z+ysm1VHMT2sKnjrWBpl9oQCfQ7cg +QlryiVhA7ixq0ztRsZOa8yg= +=pibo +-----END PGP SIGNATURE----- diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild index d6ffe2b6900e..3b4a4a01129d 100644 --- a/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild +++ b/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild,v 1.4 2005/09/13 09:50:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild,v 1.5 2005/10/10 21:55:16 vapier Exp $ -inherit flag-o-matic +inherit eutils flag-o-matic MY_P="${P/_rc/rc}" -S="${WORKDIR}/${MY_P}" DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" HOMEPAGE="http://www.alsa-project.org/" @@ -22,11 +21,14 @@ DEPEND=">=sys-libs/ncurses-5.1 RDEPEND="${DEPEND} sys-apps/pciutils" +S=${WORKDIR}/${MY_P} + src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-largefile.patch - epatch ${FILESDIR}/${P}-nls.patch + cd "${S}" + epatch "${FILESDIR}"/${P}-largefile.patch + epatch "${FILESDIR}"/${P}-nls.patch + epatch "${FILESDIR}"/${PN}-1.0.9a-strsignal.patch #103189 aclocal || die "aclocal failed" autoconf || die "autoconf failed" diff --git a/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild index 45207aec3529..8b5ad2ad8d04 100644 --- a/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild +++ b/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild,v 1.4 2005/09/13 09:50:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild,v 1.5 2005/10/10 21:55:16 vapier Exp $ -inherit flag-o-matic +inherit eutils flag-o-matic DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" HOMEPAGE="http://www.alsa-project.org/" @@ -19,6 +19,12 @@ DEPEND=">=sys-libs/ncurses-5.1 RDEPEND="${DEPEND} sys-apps/pciutils" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-strsignal.patch #103189 +} + src_compile() { # Largefile support, bug #91056 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch new file mode 100644 index 000000000000..e61783c984a6 --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch @@ -0,0 +1,17 @@ +Using sys_siglist is deprecated in favor of strsignal + +Patch by R. Bosch + +http://bugs.gentoo.org/103189 + +--- alsa-utils-1.0.9a/alsamixer/alsamixer.c ++++ alsa-utils-1.0.9a/alsamixer/alsamixer.c +@@ -2207,7 +2207,7 @@ + mixer_signal_handler (int signal) + { + if (signal != SIGSEGV) +- mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0); ++ mixer_abort (ERR_SIGNAL, strsignal(signal), 0); + else + { + fprintf (stderr, "\nSegmentation fault.\n"); -- 2.26.2