Version bump, as requested by "Shark" in bug #488618. New Huffman decoding scheme and some lovingly hand-optimised assembler for AVX & SSE.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 112 insertions, 18 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 9da339a899ed..b08ede11d3f3 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.295 2013/10/14 18:14:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.296 2013/10/19 22:14:30 chainsaw Exp $
+
+*mpg123-1.16.0 (19 Oct 2013)
+
+  19 Oct 2013; Tony Vroon <chainsaw@gentoo.org> +mpg123-1.16.0.ebuild:
+  Version bump, as requested by "Shark" in bug #488618. New Huffman decoding
+  scheme and some lovingly hand-optimised assembler for AVX & SSE.
 
   14 Oct 2013; Michał Górny <mgorny@gentoo.org> mpg123-1.15.4-r1.ebuild:
   Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index cde157be64ae..15ceed6cbe76 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -5,30 +5,20 @@ DIST mpg123-1.14.4.tar.bz2 797694 SHA256 9ca189f24eb4ec6b5046b64d72c3c8439fd9ea3
 DIST mpg123-1.15.1.tar.bz2 800907 SHA256 c6ea4f4db28a66a7ad9f22f890ce10aa796f73ae03f864f3272070c46c088355 SHA512 035e068f546aeb3996d254115160e39e5564b7a17f6ae0b424e5b9d5fbc3c632a78b958495b6c511c839d49eaf3f361a6bb7b4b6108e4596153c824d98e00047 WHIRLPOOL 49c8311fe2bac467b6091628aa36cd7a7c7104f4c9b3ac1b8b11d330fb3136ad2c85363f7e6ac95d68b30bd40bf46fb98b8012220086fad4606e509d2edcd3f6
 DIST mpg123-1.15.3.tar.bz2 802052 SHA256 b6b1aef887835f83ac3d4acb5701ae619041fc60d76548ad779a409080338df7 SHA512 d98893017601403afe84f2d6082a3d2f4ef0a5f8530a3f16a1c909c27e634de21e88f57047b7bba1f5847847b3ef5ab0654532a8fa35aece038e4411198a7eaa WHIRLPOOL 55441a6d6f52c307797c1d9af97dbc28e25777364a5db98e09f4c724d4661d11c7212976ad75bb4b0dbb5c1a09f38bcf4043b28ae99e2562a5f0bfbcb4cfc97d
 DIST mpg123-1.15.4.tar.bz2 802566 SHA256 6885fda3584566c5fa4816e635dfa1d34babf397333b2af00ab7263faffe5115 SHA512 6c16adfe47aa1a474795aa655429bfa2db6b6ade52267ed8352fb76bd82284431c6c0a90651d30be6efe9942e82656658304d0b6fd6a065fce2fe07cecf5fd9f WHIRLPOOL 7971e91b3b36c070746e710f6b4ac94129200680ea943f829d21b880f1ea8afc51ad1588789929e0ddcd4bfe6783e00f8158db6f84362b95507aa3369dc9d9ba
+DIST mpg123-1.16.0.tar.bz2 842903 SHA256 f00f72e385b522b8f05c9b1ed371abad438362620e6eb8164e2a99b79bb3f6d3 SHA512 694a95d481bc9c19429f03d219685314e0363ecd65db3f4750c0ab2ff82cf5a090ed65b9037641315f1d7ad315a76bedcb0bb453440e842fab01e7fde28e4d51 WHIRLPOOL 0716ba6bc6f2a07d61ebeec36d8af866b42806cce411aafdff5a989b8ac06522a17ceee3781db7f8d40147390e75e4a176fdf7c2452546ef340daa0851a6f02f
 EBUILD mpg123-1.14.4-r1.ebuild 2343 SHA256 0db5c2e923dee9ed11409294e635bfc1e018bd67e8ecbd81a40dc126d93fbefd SHA512 fd569f2f93eb7c77c9af1aed65d3571555244c32a8922a060241ab8cad32c3b189d9b6c2e6f2c56057696a358607df91c6cf593be9eda2218e385db67daddabb WHIRLPOOL fff2044d57f4c0d177c0a2fd1ae3b652696dc131bd63e4bb61192590376278a4d406d3b0607d492b8d6febdb076f8e64d99c50013620f0426b628c5fef1b7197
 EBUILD mpg123-1.14.4.ebuild 2154 SHA256 8b47dc5ff937b9b59bcc6fe68fa99bdc3be05bb03787160e1cd226ec3efa961d SHA512 19eb959c46e2cea5f03b10e77ecdaa05b61f1287b5393a3c96be7e5ef2ad068e86767d3562a7245ea795aaf2cb3d76a5d0949606f1114b169d0cb77ca59c6d57 WHIRLPOOL 5315b805e7ff1b06718f122538930aec3e521c074695e83a6a7bc47b75a21b492c62b4e371f465eeb3c2fd5aed0228156caa5e7bb9193ca341eb460f34715e7e
 EBUILD mpg123-1.15.1.ebuild 2340 SHA256 fd69e46d60160349da1e94f5c5d94a8422d25c8955fe1e447b76a2f4553372b7 SHA512 fd0b279901373251be8535aeeb5315dec0d58160b454f5cd681bbb568324786577f3422446cb495b2865d9c8e6d58bf5dab093758d47a9fa2ba8051582f6917c WHIRLPOOL 609335ebad1e016fd050f4725c053d5dd2d9ac42a50fc7b7394c7aeace5995482eb2ae276a91a2f893ca561c798fa8a3d293a0f57ce94069896d3ea876a7f8c1
 EBUILD mpg123-1.15.3.ebuild 2340 SHA256 ce8fa5910dbef8991c4254cee7e0a98c07a3717f051f2e8c7f281fdce94836a9 SHA512 0406cacd16f0542c1598c8e18b4f0dd64741d32fbdb205b8dddeebdbe577e0b05b925e7bb663b2950f0c3fc93ceb1b53531b4c0d98c84a5947298be1f39b1e7f WHIRLPOOL 27ba8e50c99b005cf2789cb55933d0b31d1d97198fb5561ab7a5d83f4479bb8a12d842a57e1892e76f58a461737459339fc604960fb6192b88fc45f17d37993e
 EBUILD mpg123-1.15.4-r1.ebuild 2867 SHA256 af99813d78b4cc3567ed8c7a55a8d0aaa28a9440ba30758669d93ced3098b34f SHA512 75258184c10e15f02866502af53de62e2edc13866f756f9c8c47f9b254fab1500eb8572fbd77fb957a898b87fca20c6bdb2bd2c073f3200a8a483e8aadc37d4b WHIRLPOOL 52b070a6681f50ada414447f1a2e430807eda3f1db0f01896b2d18420c5508c637c749c5d3affe07c939269d1a08ce52401fe90aa1e0aaec02da35b70fc7be23
 EBUILD mpg123-1.15.4.ebuild 2331 SHA256 9617aafa8f4bafe405ba5419d6554a22bcd0836bc0e1561a7a6ca341f3a3e8a7 SHA512 df2286a84021793cfc2600ff1956d5ea0cfe467a9abebecf41febef19040862e823262071d75fe82dd7b3f3f7552ce01b67d824ceedf9e43abdb8cadd9d97cd4 WHIRLPOOL 1e6928d565fdf874fdb73813cf2eb167e51e05e957548bd098864fdb2e3a97341f9c524bcb3cb3d4d38399c1d6bdaed24145efee7119ffdb652c354b23ee96f2
-MISC ChangeLog 39699 SHA256 c4c4cb062ab78fcf5c2a6f67c116430ca044a9e889571468a0e141f12c5f8246 SHA512 0521c51b28fdfbdeead1b055efe0d268bd34a78f51221186c1f6155d9f5d303279b822b702ca552c24568e00c36d95f2f591fcdde2f7df4f3a85b151b6f86643 WHIRLPOOL 2203ccea446c9f6a2205c83c110fa7fd5efbe2f2b8cbf7dad78e160faff71f0e774c426fccb3d2a772577d73fe4dcd546c98d79379c09569c83c17c9507ff889
+EBUILD mpg123-1.16.0.ebuild 2866 SHA256 52d74d3b91c9515ac8ba6dd63c1be6ecef704a5109badecb5b3c9f64b07c00a3 SHA512 75534648baeabbc32980e0552c2951bd960f467ba25bff220527c8858e9da9c4762f5eefed22fef7aeb79cd200631af45e9c5977924127b8ced948ac05ada308 WHIRLPOOL b19457f4e7a946f107779d8615cc996f6f39ab4b731d4041d2b741a96753b886856d7fa61751b04c18f2c9affb49666b16128862b99a0c57e6f17797983f0a35
+MISC ChangeLog 39947 SHA256 a3e29cdd672867efca8d03d9218e1f9061eff3719bf444b831fee3553015d0a8 SHA512 1e8d2c79539233b07ee763c0c0722728f7991f8ea53051c4b90edf616ab3c1d3656e965ae74af4897d4c9f36dd97920a4bd2e08d1a828458e5d0ba458ce90f37 WHIRLPOOL f84c511ec16af6192bd94f59684af60902f786e6399ea3af09889ac7e0731f279e8a72ad6e33322adb6498892e46d294abf1f3e214be9c9f6951f3413181aa1e
 MISC metadata.xml 492 SHA256 ec073d0ca010ed50d6b671f13cc98a6ee6f221526e56886b469d436c25a6042e SHA512 0cb2796ed7f5eb2696d374b45f83a371944257d177d6c73df0495178dd9e43a56efe947ccdf09dcb306c051f4e00c1af3f95201a32b93ae7eef449fe2acbe7dc WHIRLPOOL 7b1da43b004d4cf690fd16915d0af64207e4ccbf391f8ae1253d14f916a44c92ecfdbe80473c8a0fdff9aa82a7366f42348c97525057ccf1195a8722ff5c67a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSXDSFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBn0QANJ8SUPPPd5GeQLDNtj3ds7R
-rZ+71qc5OzNm5sH2RFgFFq+XqNRrECVbskhLUf/q4htdYixCAj9cZFeh+cTveV9F
-Fc3gGcDUhyaa4Ua19DOn3gJyXDoTMxsaZv9c/Mb79wbAaWBvIf2Sfg47fqV9rTnP
-ItcXvnEwI0KqTTMlrINZZquZSR8zdsw2+YCM/9rVcdVR6B3AhY1mf+IBekcK18u4
-gywnJ/VDeTKzs8TRfn+3ViG6nhpVv8e4UfrlZQHfO7uiOnEJA0YHgNlHCO6mi5+8
-GPQ5+M70dNS6NdAvDr/gZq8jmeaDNZEMj4R1/AOXzqZZxzWXQ4VR2at2HYGmBSjv
-cVuiEE6JbiHYXaQ2w5bXHJWlbXtERNSTrMAPek9vqJKwt+x/5T52YgakY3TQrPxn
-9FTskkqD+1VlYUaRaKVGMMN65aLvt7P4K+hnIzE42D6joxLjKjOYtvhTjFSdajHV
-OlputqX5+LOd0x7Ah1DXvzf8gEC9UAAuALmzCLf7+6vy1bD1HLQjedpv3e2D2JUx
-gTwW4I0u9enBp928Cp1qu5HlNBOA8aN7261Z6nNSlUZmoGmUvMSsv/cAigdF/Khe
-/FsgGk7yvnQFz6nm3TsZbBfFqJfK7MSrlnbH9rtS8kkY4vgDL7eW7ykwfkq++HHk
-KV1dTvaQ9Ni1QPcgpxci
-=eEra
+iEYEAREIAAYFAlJjBVsACgkQp5vW4rUFj5p7KgCglAEbP42ZgAVq/kKXhzMTwunZ
+CgcAn24tYmurkMy11hrifqaUKWpxrFW9
+=yXY5
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/mpg123-1.16.0.ebuild b/media-sound/mpg123/mpg123-1.16.0.ebuild
new file mode 100644
index 000000000000..09e8d85c063e
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.16.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.16.0.ebuild,v 1.1 2013/10/19 22:14:30 chainsaw Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+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="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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-admin/eselect-mpg123
+	>=sys-devel/libtool-2.2.6b
+	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 )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio="${_audio} ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use mmx && _cpu=mmx
+		use 3dnow && _cpu=3dnow
+		use sse && _cpu=x86
+		use 3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}