From e3f4dc626166daad5bd6b16ace1de730361ab216 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Sat, 13 Aug 2005 12:41:48 +0000 Subject: Revision bump; only set terminal line settings once, not for every new song (can make terminal unusable after use of -C option). Patch by Andrzej Zaborowski , closes bug #70592. (Portage version: 2.0.51.22-r2) --- media-sound/mpg123/ChangeLog | 11 +- media-sound/mpg123/Manifest | 7 +- .../0.59s-set-terminal-line-settings-once.patch | 21 ++++ media-sound/mpg123/files/digest-mpg123-0.59s-r10 | 2 + media-sound/mpg123/mpg123-0.59s-r10.ebuild | 140 +++++++++++++++++++++ 5 files changed, 178 insertions(+), 3 deletions(-) create mode 100644 media-sound/mpg123/files/0.59s-set-terminal-line-settings-once.patch create mode 100644 media-sound/mpg123/files/digest-mpg123-0.59s-r10 create mode 100644 media-sound/mpg123/mpg123-0.59s-r10.ebuild (limited to 'media-sound/mpg123') diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index a540d71941cc..f400419a074f 100644 --- a/media-sound/mpg123/ChangeLog +++ b/media-sound/mpg123/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/mpg123 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.88 2005/06/27 03:27:55 j4rg0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.89 2005/08/13 12:41:48 chainsaw Exp $ + +*mpg123-0.59s-r10 (13 Aug 2005) + + 13 Aug 2005; Tony Vroon + +files/0.59s-set-terminal-line-settings-once.patch, + +mpg123-0.59s-r10.ebuild: + Revision bump; only set terminal line settings once, not for every new song + (can make terminal unusable after use of -c option). Patch by Andrzej + Zaborowski , closes bug #70592. 27 Jun 2005; Lina Pezzella mpg123-0.59s-r9.ebuild: Stable ppc-macos diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index ba15547281c9..1840fc56257c 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -1,7 +1,10 @@ -MD5 7191b57e318b42d7db2cb16e06fb996f ChangeLog 13257 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 125d7ad49336252f01bea89794e0adc0 mpg123-0.59s-r8.ebuild 2877 MD5 c81855764fa77363447f9243f75a1bd1 mpg123-0.59s-r9.ebuild 3165 +MD5 7191b57e318b42d7db2cb16e06fb996f ChangeLog 13257 +MD5 125d7ad49336252f01bea89794e0adc0 mpg123-0.59s-r8.ebuild 2877 +MD5 69131ac9c1af0f0ebf148afc1e8e5f9a mpg123-0.59s-r10.ebuild 3335 +MD5 a147137fdcd756dd021b9807a2fae2b6 files/0.59s-set-terminal-line-settings-once.patch 767 MD5 12a16d9aafab05a0ad9eace12cf3596a files/digest-mpg123-0.59s-r8 141 MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r9 141 +MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r10 141 MD5 154058014fa42867a57faa57b857521a files/mpg123-osx.diff 11227 diff --git a/media-sound/mpg123/files/0.59s-set-terminal-line-settings-once.patch b/media-sound/mpg123/files/0.59s-set-terminal-line-settings-once.patch new file mode 100644 index 000000000000..8d43ee44715f --- /dev/null +++ b/media-sound/mpg123/files/0.59s-set-terminal-line-settings-once.patch @@ -0,0 +1,21 @@ +term_init() is called everytime a new song starts playing in -C mode +so only after the first song finishes, as a side effect the original +terminal line properties were getting overwritten and therefore were +not restored to the original value. Also as a side effect term_restore() +was called as many times as songs were played, at exit. The patch +fixes this by letting the things be executed only once. +Andrzej Zaborowski + +diff -Naur mpg123/term.c mpg123b/term.c +--- mpg123/term.c 2000-10-30 17:45:14.000000000 +0000 ++++ mpg123b/term.c 2005-06-09 17:52:49.764132264 +0000 +@@ -25,7 +25,8 @@ + { + struct termios tio; + +- term_enable = 0; ++ if (term_enable || !param.term_ctrl) ++ return; + + atexit(term_restore); + if(tcgetattr(0,&tio) < 0) { diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r10 b/media-sound/mpg123/files/digest-mpg123-0.59s-r10 new file mode 100644 index 000000000000..36b99f70c718 --- /dev/null +++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r10 @@ -0,0 +1,2 @@ +MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 +MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207 diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild new file mode 100644 index 000000000000..599212d78069 --- /dev/null +++ b/media-sound/mpg123/mpg123-0.59s-r10.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.1 2005/08/13 12:41:48 chainsaw Exp $ + +inherit eutils + +PATCH_VER=1.5 +S="${WORKDIR}/${PN}" + +DESCRIPTION="Real Time mp3 player" +HOMEPAGE="http://www.mpg123.de/" +SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz + http://dev.gentoo.org/~eradicator/${PN}/${P}-gentoo-${PATCH_VER}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" +IUSE="mmx 3dnow esd nas oss" + +RDEPEND="virtual/libc + esd? ( media-sound/esound ) + nas? ( media-libs/nas )" + +# alsa-1 b0rks and it's not a simple fix +# alsa? ( media-libs/alsa-lib )" + +DEPEND="${RDEPEND} + >=sys-apps/sed-4" + +PROVIDE="virtual/mpg123" + +PATCHDIR="${WORKDIR}/patches" + +src_unpack() { + unpack ${A} + + cd ${S} + + EPATCH_SUFFIX="patch" + epatch ${PATCHDIR} + + # Bug #70592; terminal line settings should only be set once; not everytime a new song starts + epatch ${FILESDIR}/${PV}-set-terminal-line-settings-once.patch + + if use ppc-macos; + then + einfo "Patching for OSX build" + epatch ${FILESDIR}/${PN}-osx.diff + fi + + sed -i "s:${PV}-mh4:${PVR}:" version.h +} + +src_compile() { + mkdir gentoo-bin + + # The last one in $styles is the default + local styles + + use nas && styles="${styles} -nas" + use oss && styles="${styles} -generic" + atype="linux" + + case $ARCH in + ppc64) + use esd && styles="${styles} -ppc64-esd" + use oss && styles="${styles} -ppc64" + + [ -z "${styles}" ] && styles="-ppc64" + ;; + ppc) + if use ppc-macos; then + [ -z "${styles}" ] && styles="macos" + atype="" + else + use esd && styles="${styles} -ppc-esd" + use oss && styles="${styles} -ppc" + + [ -z "${styles}" ] && styles="-ppc" + fi + ;; + x86) + use esd && styles="${styles} -esd" + use esd && use 3dnow && styles="${styles} -3dnow-esd" + use oss && styles="${styles} -i486" + use oss && use mmx && styles="${styles} -mmx" + use oss && use 3dnow && styles="${styles} -3dnow" + # use alsa && styles="${styles} -alsa" + # use alsa && use 3dnow && styles="${styles} -3dnow-alsa" + + [ -z "${styles}" ] && styles="-generic" + ;; + sparc*) + use esd && styles="${styles} -sparc-esd" + styles="${styles} -sparc -generic" + ;; + amd64) + use esd && styles="${styles} -x86_64-esd" + use oss && styles="${styles} -x86_64" + # use alsa && styles="${styles} -x86_64-alsa" + + [ -z "${styles}" ] && styles="-x86_64" + ;; + alpha) + use esd && styles="${styles} -alpha-esd" + use oss && styles="${styles} -alpha" + # use alsa && styles="${styles} -alpha-alsa" + + [ -z "${styles}" ] && styles="-generic" + ;; + mips|hppa|ia64) + # use alsa && styles="${styles} -mips-alsa" + + [ -z "${styles}" ] && styles="-generic" + ;; + *) + eerror "No support has been added for your architecture." + exit 1 + ;; + esac + + for style in ${styles}; + do + make clean ${atype}${style} CFLAGS="${CFLAGS}" || die + mv mpg123 gentoo-bin/mpg123${style} + [ -L "gentoo-bin/mpg123" ] && rm gentoo-bin/mpg123 + ln -s mpg123${style} gentoo-bin/mpg123 + done +} + +src_install() { + dodir /usr + if use ppc-macos; then + cp -R gentoo-bin ${D}/usr/bin + else + cp -dR gentoo-bin ${D}/usr/bin + fi + doman mpg123.1 + dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO +} -- cgit v1.2.3-65-gdbad