Version bump wrt #294106, thanks to Shark <shark at bitchx.it> for reporting. Fix ABI handling wrt #295075, thanks to Ferret <ferret at explodingferret.com> for reporting.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

4 files changed, 108 insertions, 2 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 5ad89c06d1d9..e9cf01776e93 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.209 2009/11/03 17:54:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.210 2009/12/01 18:20:24 ssuominen Exp $
+
+*mpg123-1.9.2 (01 Dec 2009)
+
+  01 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> +mpg123-1.9.2.ebuild,
+  +files/mpg123-1.9.2-libtool.patch:
+  Version bump wrt #294106, thanks to Shark <shark at bitchx.it> for
+  reporting. Fix ABI handling wrt #295075, thanks to Ferret <ferret at
+  explodingferret.com> for reporting.
 
   03 Nov 2009; Raúl Porcel <armin76@gentoo.org> mpg123-1.9.0.ebuild:
   ia64/sparc stable wrt #287239
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 5f3ce008c321..d1dda1c6c5af 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,6 +1,9 @@
+AUX mpg123-1.9.2-libtool.patch 829 RMD160 7cd9a61b64703c76a33184b29c17cfff49e28de4 SHA1 fc07132a45f55bf3a4343afda4d949a7a765f6bf SHA256 743d0179923ec1d87da0620e25c470e978ed754b5ab425c13bf6e48d12209c66
 DIST mpg123-1.8.1.tar.bz2 885440 RMD160 40a84ca514e686b1e080916d9ae4f0984960e48b SHA1 c7dae6842db1f52b6a2dcfbbdbd78b47baff7210 SHA256 21a7e13b16972819a7dfd4fa7b91b45902c43440b6dae46e3efc54e8ed733628
 DIST mpg123-1.9.0.tar.bz2 715127 RMD160 ecc7427ab75800d7c668c9f4bd56375ee5769230 SHA1 51dc4c3fe0b905d6c7f1a49f0a3f2c7e618e3239 SHA256 289248bf6fbe9dbcc6e14838cf6d3617a64dfd39c9c31974fda6ca9152fd94ed
+DIST mpg123-1.9.2.tar.bz2 736807 RMD160 a7a786d85f7fb7d019cfad26562f4c8b3cfb77e3 SHA1 89d80da4dde0dbed1f605650c06a49d70cabff4c SHA256 4bb866b9513562e3508037d8f0e4fd3df112970cc0bb8ffdb05bd06f76fa1dfb
 EBUILD mpg123-1.8.1.ebuild 2744 RMD160 1a5078cc7723d94687f35938e186680295aae0be SHA1 483e8cda84b511edd95d01fb18b98c88d38e04e5 SHA256 24d3c399e1dac2d3e3eaea9c4c8115f4d26df77e1f2ecdaee13d96d4330335de
 EBUILD mpg123-1.9.0.ebuild 1766 RMD160 e762a074aa2f97b02d02028a990c9aebad35bc5e SHA1 46e186aa37ef0639932f2c32320eb7a94053ee9f SHA256 a2e026475218dc022393ef4cd6c2a82ed0ca96271f5e70fc6f157a91b4c2ec47
-MISC ChangeLog 28957 RMD160 26d692325f5608ea33f7f5f19524cc5c2442c293 SHA1 2b832c510b1cc6a6f3a2753c6201c88d886c2783 SHA256 ceda66ba75ada4595ec42a3d81d75be4b2cdb1aaa70e13e8e24cd9f5baffd5e5
+EBUILD mpg123-1.9.2.ebuild 1872 RMD160 69102503497aa2209ac202e417115f44d0170524 SHA1 882929d51670320d65dee3ed64f037b7ccbc6d0a SHA256 efcc3e430222099f6b5a0ba7b2b202f5142801870d104d5e572e16e225a1fb1e
+MISC ChangeLog 29280 RMD160 82912058bf54277f83680dd1b278be2405f6ca3c SHA1 152789f0d3a0cd32683c0370d39184aa1ef52089 SHA256 a02128eb38ee114c5579dd64b5d3d308760fc5d13bf5119a42437d25062b7648
 MISC metadata.xml 324 RMD160 9a963eb8595a1ead893f4d4e376e84e8ff0cd9b8 SHA1 775f3832ff03ac2e6d037b5f1a6acceafc196fee SHA256 eb7ba00d13fe89820a740dfd2e729eb15c7d087cc0fb89064725cff9338d9b3d
diff --git a/media-sound/mpg123/files/mpg123-1.9.2-libtool.patch b/media-sound/mpg123/files/mpg123-1.9.2-libtool.patch
new file mode 100644
index 000000000000..ff8ba8f975e7
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-1.9.2-libtool.patch
@@ -0,0 +1,19 @@
+--- src/module.c
++++ src/module.c
+@@ -123,13 +123,14 @@
+ 		goto om_bad;
+ 	}
+ 	/* Work out the path of the module to open */
+-	module_path_len = strlen(type) + 1 + strlen(name) + strlen(MODULE_FILE_SUFFIX) + 1;
++	/* Note that we need to open ./file, not just file! */
++	module_path_len = 2 + strlen(type) + 1 + strlen(name) + strlen(MODULE_FILE_SUFFIX) + 1;
+ 	module_path = malloc( module_path_len );
+ 	if (module_path == NULL) {
+ 		error1( "Failed to allocate memory for module name: %s", strerror(errno) );
+ 		goto om_bad;
+ 	}
+-	snprintf( module_path, module_path_len, "%s_%s%s", type, name, MODULE_FILE_SUFFIX );
++	snprintf( module_path, module_path_len, "./%s_%s%s", type, name, MODULE_FILE_SUFFIX );
+ 	/* Display the path of the module created */
+ 	if(param.verbose > 1) fprintf(stderr, "Module path: %s\n", module_path );
+ 
diff --git a/media-sound/mpg123/mpg123-1.9.2.ebuild b/media-sound/mpg123/mpg123-1.9.2.ebuild
new file mode 100644
index 000000000000..724291cc104d
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.9.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.9.2.ebuild,v 1.1 2009/12/01 18:20:24 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="3dnow 3dnowext alsa altivec ipv6 jack mmx nas +network oss portaudio pulseaudio sdl sse"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	sys-devel/libtool"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libtool.patch
+}
+
+src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+	local _ipv6=disable
+
+	for flag in nas portaudio sdl oss jack alsa pulseaudio; do
+		if use ${flag}; then
+			_audio="${_audio} ${flag/pulseaudio/pulse}"
+			_output=${flag/pulseaudio/pulse}
+		fi
+	done
+
+	use altivec && _cpu=altivec
+
+	if [[ ${ABI} = amd64 ]] && use sse; then
+		_cpu=x86-64
+	fi
+
+	if [[ ${ABI} = x86 ]]; then
+		_cpu=i586
+		use mmx && _cpu=mmx
+		use 3dnow && _cpu=3dnow
+		use sse && _cpu=x86
+		use 3dnowext && _cpu=x86
+	fi
+
+	if use network && use ipv6; then
+		_ipv6=enable
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		$(use_enable network) \
+		--${_ipv6}-ipv6
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS* README
+}