From 38d55e37e754e2e5029d6536201d4efdc796f509 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 24 Sep 2011 14:24:42 +0000 Subject: [PATCH] Add patch to work-around high pitched sounds produced when compiled with gcc-4.6, bug 377837 Package-Manager: portage-2.1.10.3/cvs/Linux x86_64 --- media-video/mplayer/ChangeLog | 8 ++++++- media-video/mplayer/Manifest | 15 +++++++++++-- .../mplayer-1.0_rc4_p20110322-gcc46.patch | 22 +++++++++++++++++++ .../mplayer/mplayer-1.0_rc4_p20110322.ebuild | 3 ++- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 media-video/mplayer/files/mplayer-1.0_rc4_p20110322-gcc46.patch diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 1ac81f967021..a4b9a9a09978 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.798 2011/07/15 06:15:32 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.799 2011/09/24 14:24:42 mattst88 Exp $ + + 24 Sep 2011; Matt Turner + mplayer-1.0_rc4_p20110322.ebuild, + +files/mplayer-1.0_rc4_p20110322-gcc46.patch: + Add patch to work-around high pitched sounds produced when compiled with + gcc-4.6, bug 377837 15 Jul 2011; Matt Turner mplayer-1.0_rc4_p20110322.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 7e85425e0e7a..2b8de74220bb 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,4 +1,8 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX dump_ffmpeg.sh 2497 RMD160 4eba5e45cfe9e1b28ee4cbde337adf5faf89c52e SHA1 fc173a448b1763197337b79c871b05ec7cc1fe5d SHA256 630327b7a6156aa1081c6abb3d3a0501507f26346baefd5832f3ceb8789c7477 +AUX mplayer-1.0_rc4_p20110322-gcc46.patch 657 RMD160 a327aa565f55102be2d6f73f12e08862418023e9 SHA1 560e41e7c5c147e8656ec0216f4272e1421e887c SHA256 4c57d5c4c79db87796b6b1b4a485f4d0a8ed95f3ae71040592a0bd5f3dc070b2 AUX prepare_mplayer.sh 711 RMD160 6a5271c822795f88b86caf0f716f9336528b17c4 SHA1 e2a75ad0fe9caebef8f0eb63f6160b78669e6b12 SHA256 4141c88e9942d7332fb0ed25d26c0c9d1cbe9e6d9d0f3a2d178f263699b1fd42 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 @@ -6,7 +10,14 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d14 DIST mplayer-1.0_rc4_p20101114.tar.xz 8515160 RMD160 73aec83d64abaadf9c6b6110f5d42e6bfae1ca87 SHA1 b6cfd5e05ef5a48a9d3d2f272f6f629461de8474 SHA256 02d6a259e063304cbf2ebb89fcb89d5133383d514264df9a423872684eb36c2d DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08a4dfafdc17d09 SHA1 3f60cf0ce8c910e3628e425167cb6a46bb4a29a3 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5 EBUILD mplayer-1.0_rc4_p20101114.ebuild 20160 RMD160 fb0bc873bbbfd3fcad0c1102efce5937450e8e1c SHA1 a42383b74a43dd39814d7c07dbc52b82f38b0cb4 SHA256 9a4c7304ddc806d7bdb07245c6a68cecbf2f55c8d0fb08647d0a3df53a1ecf0a -EBUILD mplayer-1.0_rc4_p20110322.ebuild 20334 RMD160 d52624398f068a7821e544a11c1504bd9ff68c6a SHA1 3b74a326b23c046797754434a3b506422baa1c33 SHA256 f24b8ea75804140aa342f67ec886b9ac41e24a26a5ca02aa6c506822b431ac67 +EBUILD mplayer-1.0_rc4_p20110322.ebuild 20366 RMD160 a8fa264e61d927affcdc541a367f6d6438c1d714 SHA1 ed667010ab8b74fb374e298d2e1d808ebbcffc9c SHA256 651c8fb06dbdbb1d6d059cc552689390078119dbe79110058721e0a73b6d5511 EBUILD mplayer-9999.ebuild 19577 RMD160 aa5eeca6fe6c6be7707e59591338810b1dd5d622 SHA1 3f9ac208b68638834ec49379bf028741e030567f SHA256 d0dea15e0279de7f47a6418fb05b3f595bef36b78f51b302c4a596397dc0e702 -MISC ChangeLog 139975 RMD160 e1117ed1537a1ee5aaad050f39e8ed1240459378 SHA1 0968bebed349d4d64924c86ff44102c0c49ea81a SHA256 12321bf6e34406b1f71e53f64c22ddb1007e191b078f856f17a8632f1f542b46 +MISC ChangeLog 140206 RMD160 dc07248c9b1af4a05fec8f6f4c327adce438158a SHA1 9bf84766fbb8c9f3b7f2b5149ca7e9bb5d6357c2 SHA256 47bff5fda25360dccbc5704508e82b4be0290d834a32a06dabefcb3a63ad5b82 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk596DUACgkQTVUdg23rv51OCgCfeoA3fIEz3Z6WasfEKZ4CoSmJ ++Z8AnjWvKrG6iof/AfAZqrNCx6KZ599+ +=ZV+e +-----END PGP SIGNATURE----- diff --git a/media-video/mplayer/files/mplayer-1.0_rc4_p20110322-gcc46.patch b/media-video/mplayer/files/mplayer-1.0_rc4_p20110322-gcc46.patch new file mode 100644 index 000000000000..bb7240eac0b1 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.0_rc4_p20110322-gcc46.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/377837 +http://lists-archives.org/mplayer-dev-eng/34349-compiling-mplayer-with-gcc-4-6-broken-audio-decoding.html + +--- a/mp3lib/dct64_sse.c ++++ b/mp3lib/dct64_sse.c +@@ -112,7 +112,6 @@ void dct64_sse(short *out0,short *out1,real *c) + } + + { +- real *costab = costab_mmx + 24; + int i; + + __asm__( +@@ -121,7 +120,7 @@ void dct64_sse(short *out0,short *out1,real *c) + "movaps %1, %%xmm5\n\t" + "movaps %%xmm5, %%xmm6\n\t" + : +- :"m"(*costab), "m"(*nnnn) ++ :"m"(costab_mmx[24]), "m"(*nnnn) + ); + + for (i = 0; i < 0x20; i += 8) diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20110322.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20110322.ebuild index b0ade17adda6..fcb3ef4112b8 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20110322.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20110322.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322.ebuild,v 1.4 2011/07/15 06:15:32 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20110322.ebuild,v 1.5 2011/09/24 14:24:42 mattst88 Exp $ EAPI=4 @@ -196,6 +196,7 @@ fi REQUIRED_USE="bindist? ( !amr !faac !win32codecs )" PATCHES=( + "${FILESDIR}"/${P}-gcc46.patch ) pkg_setup() { -- 2.26.2