Clean up custom-cflags a bit, add -fomit-frame-pointer as it seems to be required to compile some of the inline asm.

Package-Manager: portage-2.1.2_pre3-r7

6 files changed, 36 insertions, 32 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f9b522dabdaa..fe9a457a2eb9 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.431 2006/10/31 14:32:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.432 2006/11/03 19:18:14 chutzpah Exp $
+
+  03 Nov 2006; Patrick McLean <chutzpah@gentoo.org> mplayer-1.0_rc1.ebuild:
+  Clean up custom-cflags a bit, add -fomit-frame-pointer as it seems to be
+  required to compile some of the inline asm.
 
   31 Oct 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_rc1.ebuild:
   Fix some packaging issue part II
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index d021ac4d8940..118e7cda0376 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -12,7 +12,7 @@ RMD160 f7df35bfad6cb8d1eba2f5b2df9ace117c9f2651 files/mplayer.desktop 794
 SHA256 a3763e82f93b008e202bcb38bd48a65de8f4fd954a8e44b847f0a0f3a83b563d files/mplayer.desktop 794
 DIST 26104-510.zip 291836 RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca SHA1 b22dbe895991c23fad446c3c4ff7b6db12673778 SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46
 DIST 26204-510.zip 246663 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd SHA1 9ca910295c2888fba95a98da83762a22aaf34651 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991
-DIST Blue-1.6.tar.bz2 225883 RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e SHA1 d894cbd44ffb7bde14a8f9bbdac53525a51e1e08 SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568
+DIST Blue-1.6.tar.bz2 281056 RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 SHA1 2a082bdef2f5eebc403c234a036949f38683da06 SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d
 DIST MPlayer-1.0pre8.tar.bz2 8166628 RMD160 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0 SHA1 8a0929b84dcb37d47c062230ce693b64b3e30921 SHA256 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc
 DIST MPlayer-1.0rc1.tar.bz2 8414213 RMD160 8cea02e832aec5d9e090829d61d0f131dcc177a2 SHA1 a450c0b0749c343a8496ba7810363c9d46dfa73c SHA256 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
@@ -27,24 +27,24 @@ EBUILD mplayer-1.0_pre8.ebuild 15502 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c
 MD5 db980765b40b1685613b1c2b3f91ecbc mplayer-1.0_pre8.ebuild 15502
 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c1143 mplayer-1.0_pre8.ebuild 15502
 SHA256 064f4421b0e091fba4c575b09cedd21cf6c4b8757bdc4608519d63d5b2dd5c9e mplayer-1.0_pre8.ebuild 15502
-EBUILD mplayer-1.0_rc1.ebuild 15509 RMD160 6eee33e317e5f37bc031f59e4c53e5ced2ab8be7 SHA1 9553e92abf5a66fa22c3c3bcb4601b3becf2a4f4 SHA256 a6fdd08d03518779e89e28aa076c5589144a77381bfcc0d8cb57622f33cca171
-MD5 f842530e4110b564545547e3f91acd71 mplayer-1.0_rc1.ebuild 15509
-RMD160 6eee33e317e5f37bc031f59e4c53e5ced2ab8be7 mplayer-1.0_rc1.ebuild 15509
-SHA256 a6fdd08d03518779e89e28aa076c5589144a77381bfcc0d8cb57622f33cca171 mplayer-1.0_rc1.ebuild 15509
-MISC ChangeLog 77945 RMD160 9d8b26933bea0de4afb05eb2434f4fc65a009968 SHA1 57d503b54d0d27a72c86188d592ba27ecc92a30e SHA256 572dbc191753f4f1fc31f1d79dbd7f5e148bd1842fe589451c96773073b13e90
-MD5 bf45cb8f2eb4dedff0e99bbf4427fef3 ChangeLog 77945
-RMD160 9d8b26933bea0de4afb05eb2434f4fc65a009968 ChangeLog 77945
-SHA256 572dbc191753f4f1fc31f1d79dbd7f5e148bd1842fe589451c96773073b13e90 ChangeLog 77945
+EBUILD mplayer-1.0_rc1.ebuild 15534 RMD160 658932348b72a5f22a9c22d77b9abffd7ec898af SHA1 e7b1f8109151e61127725e8377296bcf5c8f6b35 SHA256 7708106f20fc1f17e5ce0d9a68e913bed800067597d7ee63cfd76d3316ea0fab
+MD5 bf7b4390610231eef1fa333792060559 mplayer-1.0_rc1.ebuild 15534
+RMD160 658932348b72a5f22a9c22d77b9abffd7ec898af mplayer-1.0_rc1.ebuild 15534
+SHA256 7708106f20fc1f17e5ce0d9a68e913bed800067597d7ee63cfd76d3316ea0fab mplayer-1.0_rc1.ebuild 15534
+MISC ChangeLog 78144 RMD160 074a30390d37145a3d9f415f6a3740c137d2ed2b SHA1 75a08e28094eb0016f48d56629ebb8e9bab6899c SHA256 2db623ce66f04e016c396ebb14b09a5a268245a51a88a313de8db73e976af7c1
+MD5 ff7a3d4fabc38840f446a99fe2cb1880 ChangeLog 78144
+RMD160 074a30390d37145a3d9f415f6a3740c137d2ed2b ChangeLog 78144
+SHA256 2db623ce66f04e016c396ebb14b09a5a268245a51a88a313de8db73e976af7c1 ChangeLog 78144
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
-MD5 4c3ce9f6ced0ec6f46d94af644b26ba3 files/digest-mplayer-1.0_pre8 1560
-RMD160 17bd38c2a567629cf82872c5459c7a1cae287e56 files/digest-mplayer-1.0_pre8 1560
-SHA256 4cb7e07037e8fb90c07d27408a2fb61e3eb4d709770e0c42aeace9a06a095d3b files/digest-mplayer-1.0_pre8 1560
-MD5 78c3b2b2c87d00dc7a74dab0c090ebec files/digest-mplayer-1.0_pre8-r1 2000
-RMD160 9f6fbb2c027afa121aa898f209aaa3f7912f52d8 files/digest-mplayer-1.0_pre8-r1 2000
-SHA256 d5a1602723a4a7650baaf019ca6f1f37a716640a6a1b818807dfc25e4dccce6c files/digest-mplayer-1.0_pre8-r1 2000
-MD5 820a05e289fd79c6e24d97de0c84dc11 files/digest-mplayer-1.0_rc1 1997
-RMD160 4be6fa4ccf02f960a178ff49cbe19cfde48898dc files/digest-mplayer-1.0_rc1 1997
-SHA256 cba896664d7637da8ae08c94535c416046502c2dd58f59b525967bee5f27e305 files/digest-mplayer-1.0_rc1 1997
+MD5 0009f8f8dc99c67df9768580b4938c7f files/digest-mplayer-1.0_pre8 1560
+RMD160 27b9b8cc192806bbc86d224cdd1443385c5cd9c1 files/digest-mplayer-1.0_pre8 1560
+SHA256 01dc245555cd70440e0028553bf6ea63ce9f8014d731427897a5ab54e6276069 files/digest-mplayer-1.0_pre8 1560
+MD5 e339655a603039379d9209f60e9cf4fe files/digest-mplayer-1.0_pre8-r1 2000
+RMD160 e0de5e80e3e2be20f62ba2917c24118942d4ba4c files/digest-mplayer-1.0_pre8-r1 2000
+SHA256 54f039e1745cbbfbf2195d810d2f089b229523b76012d96a186563f684b5a176 files/digest-mplayer-1.0_pre8-r1 2000
+MD5 d0be0211a136a46aa1a3d62db8b338cb files/digest-mplayer-1.0_rc1 1997
+RMD160 c4405eb322da0468f4aa2be5cbf68fe5b8c58ec6 files/digest-mplayer-1.0_rc1 1997
+SHA256 31562c898adca2151ae31a9d49b3199b1c16e046e67532e26b7a5c37a24cce18 files/digest-mplayer-1.0_rc1 1997
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre8 b/media-video/mplayer/files/digest-mplayer-1.0_pre8
index ddd4b254a79a..fdbedbcd8111 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre8
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre8
@@ -1,6 +1,6 @@
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 f82bb2bc51b6cd5e5dd96f88f6f98582 MPlayer-1.0pre8.tar.bz2 8166628
 RMD160 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0 MPlayer-1.0pre8.tar.bz2 8166628
 SHA256 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc MPlayer-1.0pre8.tar.bz2 8166628
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1
index 16b289a74397..0cdfb93bfcda 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1
@@ -4,9 +4,9 @@ SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-51
 MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 f82bb2bc51b6cd5e5dd96f88f6f98582 MPlayer-1.0pre8.tar.bz2 8166628
 RMD160 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0 MPlayer-1.0pre8.tar.bz2 8166628
 SHA256 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc MPlayer-1.0pre8.tar.bz2 8166628
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc1 b/media-video/mplayer/files/digest-mplayer-1.0_rc1
index ac5d4f5bd74a..d4d7d553684f 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc1
+++ b/media-video/mplayer/files/digest-mplayer-1.0_rc1
@@ -4,9 +4,9 @@ SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-51
 MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 18c05d88e22c3b815a43ca8d7152ccdc MPlayer-1.0rc1.tar.bz2 8414213
 RMD160 8cea02e832aec5d9e090829d61d0f131dcc177a2 MPlayer-1.0rc1.tar.bz2 8414213
 SHA256 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063 MPlayer-1.0rc1.tar.bz2 8414213
diff --git a/media-video/mplayer/mplayer-1.0_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index bb1425d03ede..97c8f651decd 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.10 2006/10/31 14:32:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.11 2006/11/03 19:18:14 chutzpah Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,7 +9,7 @@ IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
 cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
 dv dvdread enca encode esd fbcon gif ggi gtk iconv ipv6 jack joystick jpeg
 libcaca lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode
-vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga 
+vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
 theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc"
 
 LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
@@ -405,9 +405,9 @@ src_compile() {
 	strip-flags
 	# ugly optimizations cause MPlayer to cry on x86 systems!
 		if use x86 ; then
-			replace-flags -O0 -O2
-			replace-flags -O3 -O2
+			replace-flags -O* -O2
 			filter-flags -fPIC -fPIE
+			use debug || append-flags -fomit-frame-pointer
 		fi
 	append-flags -D__STDC_LIMIT_MACROS
 	else