From e2282eb349ceb384d2000e2fecfce0baece3b9d9 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 18 Dec 2011 15:06:04 +0000 Subject: [PATCH] mp3lib failed to build on x86 with -O0 and frame-pointer, since we dropped internal mp3lib we can also avoid messing with CFLAGS and let people build with the -O flag they wish. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- media-video/mplayer/ChangeLog | 7 ++++++- media-video/mplayer/Manifest | 10 +++++----- media-video/mplayer/mplayer-9999.ebuild | 11 +---------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 352a29013749..55e83390779d 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # 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.826 2011/12/18 14:56:59 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.827 2011/12/18 15:06:04 aballier Exp $ + + 18 Dec 2011; Alexis Ballier mplayer-9999.ebuild: + mp3lib failed to build on x86 with -O0 and frame-pointer, since we dropped + internal mp3lib we can also avoid messing with CFLAGS and let people build + with the -O flag they wish. 18 Dec 2011; Alexis Ballier files/dump_ffmpeg.sh: allfilters.c is also checked, inlude it too diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 934d2f6e1d27..06c02dc6ae81 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -12,13 +12,13 @@ DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94 EBUILD mplayer-1.0_rc4_p20111215.ebuild 19455 RMD160 2eb8087a10021f937cc894ffc840f08471a59f14 SHA1 ac7409811698ad1dac29d45ba8ead0a777891c0d SHA256 28678530fed056e3e826ebbddac5069ccb435adef250bda27fa4f41f85acbc8e -EBUILD mplayer-9999.ebuild 18503 RMD160 2e09205c243bd80bebcb3bd041df1a514f09e178 SHA1 28936584a23b1a309b92861b4579d5707a7fc329 SHA256 42d49d60b9a1fb49ca65cfc98fa721ce585ae8f5d5f3f51d967c02c56f6b7acf -MISC ChangeLog 144224 RMD160 00f892b0642ad89aff679c9719a381065b72d1d7 SHA1 9712c372965e2c578912b9137566b5fcbd096652 SHA256 03d8cdeb24992f19485da787e8b16cf90642f204c0faf004a2a682b21916bb19 +EBUILD mplayer-9999.ebuild 18226 RMD160 4c529c35e72959594ea2dc60c6694f329022ee33 SHA1 de0cdde5556dce1a20b53d3899f2e012f3d345fc SHA256 8f1bb17b530a60589d39f8ea3fd9b8baa40a08663811d37ed8925c70fd0fff96 +MISC ChangeLog 144482 RMD160 2f8d131abdf0562639669289c013f04f5292478d SHA1 4250717cbfb5d32fd3f92867ba79ca0b35c88621 SHA256 f7141ab95dff352761dbfad7eb6c4d2e0e8f7763a436815f4a173f378a61c81b MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7t/0AACgkQvFcC4BYPU0pQqQCbBi9JsBMpIqZcw905EX55lSbz -0ysAoIjtODOzwSgACigsWDK+y0/MQMLy -=3XjW +iEYEARECAAYFAk7uAWIACgkQvFcC4BYPU0qnqACfRQdqT81AW8tk9Tk0l3lH7yTc +pGgAoKJUuQj2rZbwUccj8Wd7L1FTE6q4 +=1EpK -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 8f4ceade5be6..de1dd2d5dd63 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.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-9999.ebuild,v 1.118 2011/12/17 18:02:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.119 2011/12/18 15:06:04 aballier Exp $ EAPI=4 @@ -496,15 +496,6 @@ src_configure() { append-ldflags -nopie fi - is-flag -O? || append-flags -O2 - - # workaround bug, x86 just has too few registers, see c.f. - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44 - # and 32-bits OSX, bug 329861 - if [[ ${CHOST} == i?86-* ]] ; then - use debug || append-flags -fomit-frame-pointer - fi - ########################### # X enabled configuration # ########################### -- 2.26.2