From 685d3b6497eb90ad75d7029a8cb50a240b8c6246 Mon Sep 17 00:00:00 2001 From: Chris White Date: Sat, 6 Nov 2004 00:46:30 +0000 Subject: [PATCH] Fixed optimization filtering per bug #70175. --- media-video/mplayer/ChangeLog | 6 +++++- media-video/mplayer/Manifest | 8 ++++---- media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 | 1 - media-video/mplayer/mplayer-1.0_pre4-r7.ebuild | 8 +++++++- media-video/mplayer/mplayer-1.0_pre5-r4.ebuild | 9 ++++++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 74c622fc84f9..afae36c045e5 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.225 2004/10/31 00:47:14 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.226 2004/11/06 00:46:30 chriswhite Exp $ + + 06 Nov 2004; Chris White mplayer-1.0_pre4-r7.ebuild, + mplayer-1.0_pre5-r4.ebuild: + Fixed optimization filtering per bug #70175. 31 Oct 2004; Chris White mplayer-1.0_pre4-r7.ebuild, mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r4.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 81ec7a55cafb..f76055dc6b6d 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,9 +1,9 @@ -MD5 2f633a4d1f711bb9768c7dc1f14953a6 ChangeLog 42001 +MD5 341f8fd77d48411e5a82ce663c6fafc8 ChangeLog 42158 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 -MD5 209d187be672848b202c48eb0f764595 mplayer-1.0_pre4-r7.ebuild 12379 +MD5 55f7cc5d3f03ad8eeb10215b4d316a56 mplayer-1.0_pre4-r7.ebuild 12510 MD5 eb22cb7ad1909bb99a27bee98dba2bdc mplayer-1.0_pre5-r2.ebuild 14070 MD5 2049c0de9dbd427d32b4beadab319be8 mplayer-1.0_pre5-r3.ebuild 14898 -MD5 62e7675fd504c6e7608a41a3f52c72eb mplayer-1.0_pre5-r4.ebuild 14817 +MD5 8645c005c9f917ef629077d09e010266 mplayer-1.0_pre5-r4.ebuild 15006 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510 @@ -27,6 +27,6 @@ MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950 MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981 MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 -MD5 e7dab41ab0b1ff71d6cb8f06c7066903 files/digest-mplayer-1.0_pre4-r7 516 +MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378 MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853 diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 index ecaca897aa35..55d2adb2a0e5 100644 --- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 +++ b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 @@ -4,4 +4,3 @@ MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208 MD5 62d4d7af62f1081e2849d4a0a44463de mplayer-1.0_pre4-mga-kernel2.6.patch.tar.bz2 9848 MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234 MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734 -MD5 00e075a083163317bce06435134602e4 rp9codecs-20040626.tar.bz2 511450 diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild index a59789c1772f..fc7ab62e9d1a 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.22 2004/10/31 00:47:14 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.23 2004/11/06 00:46:30 chriswhite Exp $ inherit eutils flag-o-matic kernel-mod @@ -163,6 +163,12 @@ src_compile() { filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -falign-functions local myconf= + # ugly optimizations cause MPlayer to cry on x86 systems! + if use x86 ; then + replace-flags -O0 -O2 + replace-flags -O3 -O2 + fi + if use dvd; then myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)" else diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild index 7dc45957520f..734e787198d7 100644 --- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.16 2004/10/31 00:47:14 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.17 2004/11/06 00:46:30 chriswhite Exp $ inherit eutils flag-o-matic kernel-mod @@ -168,8 +168,15 @@ src_unpack() { src_compile() { + # let's play the filtration game! MPlayer hates on all! filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -falign-functions + # ugly optimizations cause MPlayer to cry on x86 systems! + if use x86 ; then + replace-flags -O0 -O2 + replace-flags -O3 -O2 + fi + local myconf= ################ #Optional features# -- 2.26.2