From aa26dd139a95da8773d160813cf9f035e5d6e62c Mon Sep 17 00:00:00 2001 From: Arcady Genkin Date: Tue, 15 Jul 2003 16:35:22 +0000 Subject: Fix compilation with gcc 3.3. Closes bug #22324. --- media-sound/alsa-tools/ChangeLog | 8 ++- media-sound/alsa-tools/Manifest | 5 +- media-sound/alsa-tools/alsa-tools-0.9.5-r1.ebuild | 60 ++++++++++++++++++++++ media-sound/alsa-tools/alsa-tools-0.9.5.ebuild | 60 ---------------------- .../alsa-tools/files/alsa-tools-0.9.5-gcc3.3.patch | 54 +++++++++++++++++++ .../alsa-tools/files/digest-alsa-tools-0.9.5 | 1 - .../alsa-tools/files/digest-alsa-tools-0.9.5-r1 | 1 + 7 files changed, 126 insertions(+), 63 deletions(-) create mode 100644 media-sound/alsa-tools/alsa-tools-0.9.5-r1.ebuild delete mode 100644 media-sound/alsa-tools/alsa-tools-0.9.5.ebuild create mode 100644 media-sound/alsa-tools/files/alsa-tools-0.9.5-gcc3.3.patch delete mode 100644 media-sound/alsa-tools/files/digest-alsa-tools-0.9.5 create mode 100644 media-sound/alsa-tools/files/digest-alsa-tools-0.9.5-r1 (limited to 'media-sound') diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog index 6409012bca8f..b7715052da1a 100644 --- a/media-sound/alsa-tools/ChangeLog +++ b/media-sound/alsa-tools/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for media-sound/alsa-tools # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.24 2003/07/11 20:19:09 agenkin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.25 2003/07/15 16:35:21 agenkin Exp $ 04 Jul 2003; jje alsa-tools-0.9.4.ebuild: Added alsa-driver to DEPEND. See #23613. Most people follow the instructions @@ -15,6 +15,12 @@ 05 Jun 2003; Daniel Ahlberg alsa-tools-0.9.4.ebuild : Switched to mirror://alsaproject in SRC_URI. +*alsa-tools-0.9.5-r1 (15 Jul 2003) + + 15 Jul 2003; Arcady Geknin : + Enabled patch by Jason Rhinelander + (bug #22324) to fix compilation with gcc 3.3. + *alsa-tools-0.9.5 (11 Jul 2003) 11 Jul 2003; Arcady Genkin : diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index 13cc13c5ef1d..68bf63edfd6b 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -1,12 +1,15 @@ MD5 3549f3e434bec636ea7f5824f870694f alsa-tools-0.9.0_rc1-r1.ebuild 1320 MD5 3422c9155140d82e399df2f0ad07a053 alsa-tools-0.9.4.ebuild 1408 MD5 1d9c8551008456b365446107f102d3dd ChangeLog 3394 -MD5 2dc37380e5e5db9cc4de369556d54e7d alsa-tools-0.9.5.ebuild 1394 +MD5 bdf90798deef24073d446c9c7cc0e107 alsa-tools-0.9.5.ebuild 1393 +MD5 2dc37380e5e5db9cc4de369556d54e7d alsa-tools-0.9.5-r1.ebuild 1394 MD5 86fc807b53b47d3d0d2fda967a1c2418 alsa-tools-0.9.1.ebuild 1297 MD5 235d10a1de9c1536889541d74324b77d alsa-tools-0.9.3.ebuild 1298 MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72 MD5 39600c0be0d77ae2146d432ac5fd9ac5 files/digest-alsa-tools-0.9.5 69 MD5 df9ab3becdd556afdf3bc74a91bee7db files/digest-alsa-tools-0.9.4 69 +MD5 39600c0be0d77ae2146d432ac5fd9ac5 files/digest-alsa-tools-0.9.5-r1 69 MD5 d345d371cc296e16aa163adfcaa75e19 files/alsa-tools-0.9.4-gcc3.3.patch 2049 +MD5 d345d371cc296e16aa163adfcaa75e19 files/alsa-tools-0.9.5-gcc3.3.patch 2049 MD5 0c34b1352e030b5ef4d8ae5e102a8c3d files/digest-alsa-tools-0.9.1 69 MD5 e36a6a2466b43a9d6ef67c7b178e1a9a files/digest-alsa-tools-0.9.3 69 diff --git a/media-sound/alsa-tools/alsa-tools-0.9.5-r1.ebuild b/media-sound/alsa-tools/alsa-tools-0.9.5-r1.ebuild new file mode 100644 index 000000000000..dc149768bdfb --- /dev/null +++ b/media-sound/alsa-tools/alsa-tools-0.9.5-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-0.9.5-r1.ebuild,v 1.1 2003/07/15 16:35:22 agenkin Exp $ + +DESCRIPTION="Advanced Linux Sound Architecture tools" +HOMEPAGE="http://www.alsa-project.org" +LICENSE="GPL-2" + +DEPEND=">=media-libs/alsa-lib-0.9.5 + virtual/alsa + =x11-libs/gtk+-1.2*" + +SLOT="0.9" +KEYWORDS="~x86 ~ppc" + +SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2" +S="${WORKDIR}/${P}" + +# This is a list of the tools in the package. +ALSA_TOOLS="ac3dec as10k1 envy24control sb16_csp seq/sbiload" + +src_unpack() { + unpack ${A} + cd ${S} + patch -p1 < ${FILESDIR}/${P}-gcc3.3.patch || die +} + +src_compile() { + # Some of the tools don't make proper use of CFLAGS, even though + # all of them seem to use autoconf. This needs to be fixed. + local f + for f in ${ALSA_TOOLS} + do + cd "${S}/${f}" + + econf || die "./configure failed" + emake || die "Parallel Make Failed" + done +} + +src_install() { + local f + for f in ${ALSA_TOOLS} + do + # Install the main stuff + cd "${S}/${f}" + make DESTDIR="${D}" install || die + + # Install the text documentation + local doc + for doc in README TODO ChangeLog COPYING AUTHORS + do + if [ -f "${doc}" ] + then + mv "${doc}" "${doc}.`basename ${f}`" + dodoc "${doc}.`basename ${f}`" + fi + done + done +} diff --git a/media-sound/alsa-tools/alsa-tools-0.9.5.ebuild b/media-sound/alsa-tools/alsa-tools-0.9.5.ebuild deleted file mode 100644 index 4a60729cc8fc..000000000000 --- a/media-sound/alsa-tools/alsa-tools-0.9.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-0.9.5.ebuild,v 1.1 2003/07/11 20:19:09 agenkin Exp $ - -DESCRIPTION="Advanced Linux Sound Architecture tools" -HOMEPAGE="http://www.alsa-project.org" -LICENSE="GPL-2" - -DEPEND=">=media-libs/alsa-lib-0.9.5 - virtual/alsa - =x11-libs/gtk+-1.2*" - -SLOT="0.9" -KEYWORDS="~x86 ~ppc" - -SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2" -S="${WORKDIR}/${P}" - -# This is a list of the tools in the package. -ALSA_TOOLS="ac3dec as10k1 envy24control sb16_csp seq/sbiload" - -src_unpack() { - unpack ${A} - cd ${S} - #patch -p1 < ${FILESDIR}/${P}-gcc3.3.patch || die -} - -src_compile() { - # Some of the tools don't make proper use of CFLAGS, even though - # all of them seem to use autoconf. This needs to be fixed. - local f - for f in ${ALSA_TOOLS} - do - cd "${S}/${f}" - - econf || die "./configure failed" - emake || die "Parallel Make Failed" - done -} - -src_install() { - local f - for f in ${ALSA_TOOLS} - do - # Install the main stuff - cd "${S}/${f}" - make DESTDIR="${D}" install || die - - # Install the text documentation - local doc - for doc in README TODO ChangeLog COPYING AUTHORS - do - if [ -f "${doc}" ] - then - mv "${doc}" "${doc}.`basename ${f}`" - dodoc "${doc}.`basename ${f}`" - fi - done - done -} diff --git a/media-sound/alsa-tools/files/alsa-tools-0.9.5-gcc3.3.patch b/media-sound/alsa-tools/files/alsa-tools-0.9.5-gcc3.3.patch new file mode 100644 index 000000000000..c9c66191da65 --- /dev/null +++ b/media-sound/alsa-tools/files/alsa-tools-0.9.5-gcc3.3.patch @@ -0,0 +1,54 @@ +--- alsa-tools-0.9.4/as10k1/as10k1.c 2003-05-14 23:45:17.000000000 -0700 ++++ alsa-tools-0.9.4-gcc33/as10k1/as10k1.c 2003-06-05 20:33:53.000000000 -0700 +@@ -43,29 +43,28 @@ + + char version[]="As10k1 assembler version " VERSION; + +-char help[]=" +-Usage: as10k1 [option...] asmfile +- +-The as10k1 assembler is for the emu10k1 dsp processor +-found in Creative Lab's sblive series of sound cards. +- +-Author: Daniel Bertrand +- +-Options:\n +- -l [listfile] Specify a listing file, default is none. +- -o [emu10k1 file] Specify an output file, default is based input, +- Substituting .asm to .emu10k1 +- -d [dbg_options...] Turn on debug messages. +- s prints all symbols +- g prints defined gprs +- t prints tram usage +- i prints instructions +- -h Prints this message +- -v Prints version number. +- +-This program is distributed under the GPL. +- +-"; ++char help[]="\n" ++"Usage: as10k1 [option...] asmfile\n" ++"\n" ++"The as10k1 assembler is for the emu10k1 dsp processor\n" ++"found in Creative Lab's sblive series of sound cards.\n" ++"\n" ++"Author: Daniel Bertrand \n" ++"\n" ++"Options:\n\n" ++" -l [listfile] Specify a listing file, default is none.\n" ++" -o [emu10k1 file] Specify an output file, default is based input,\n" ++" Substituting .asm to .emu10k1\n" ++" -d [dbg_options...] Turn on debug messages.\n" ++" s prints all symbols \n" ++" g prints defined gprs\n" ++" t prints tram usage\n" ++" i prints instructions\n" ++" -h Prints this message \n" ++" -v Prints version number. \n" ++"\n" ++"This program is distributed under the GPL.\n" ++"\n"; + + // cli==Command-Line Interface && !Creative Labs Inc. + diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-0.9.5 b/media-sound/alsa-tools/files/digest-alsa-tools-0.9.5 deleted file mode 100644 index 81f222086a50..000000000000 --- a/media-sound/alsa-tools/files/digest-alsa-tools-0.9.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 b6ecfca26bf43ce29bb1b4ed78721a65 alsa-tools-0.9.5.tar.bz2 717202 diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-0.9.5-r1 b/media-sound/alsa-tools/files/digest-alsa-tools-0.9.5-r1 new file mode 100644 index 000000000000..81f222086a50 --- /dev/null +++ b/media-sound/alsa-tools/files/digest-alsa-tools-0.9.5-r1 @@ -0,0 +1 @@ +MD5 b6ecfca26bf43ce29bb1b4ed78721a65 alsa-tools-0.9.5.tar.bz2 717202 -- cgit v1.2.3-65-gdbad