From 1c40ca7a3435a994a274563ffb3891a206805470 Mon Sep 17 00:00:00 2001
From: Marinus Schraal <foser@gentoo.org>
Date: Sun, 12 Dec 2004 18:11:29 +0000
Subject: [PATCH] new set of cflag modifiers

---
 media-plugins/gst-plugins-ffmpeg/ChangeLog        |  5 ++++-
 media-plugins/gst-plugins-ffmpeg/Manifest         |  4 ++--
 .../gst-plugins-ffmpeg-0.8.2-r1.ebuild            | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index bd1167fca20e..7177c1976bd6 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.11 2004/11/28 23:32:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.12 2004/12/12 18:11:29 foser Exp $
+
+  12 Dec 2004; foser <foser@gentoo.org> gst-plugins-ffmpeg-0.8.2-r1.ebuild :
+  Use the CFLAG restrictions from the mplayer ebuild (#64262)
 
 *gst-plugins-ffmpeg-0.8.2-r1 (29 Nov 2004)
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 6e3cb0ce23a4..ba0e3321623d 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,8 +1,8 @@
 MD5 1ec268378bb3a4e5bf04cf7d8f0ceacf gst-plugins-ffmpeg-0.8.2.ebuild 1189
 MD5 ded71f2c6e4a988773764f333835a64e gst-plugins-ffmpeg-0.8.1.ebuild 1090
-MD5 de46ca8160799dd086d43ee7c831b101 gst-plugins-ffmpeg-0.8.2-r1.ebuild 1359
+MD5 2a010fec8e60c367d2be044abd38e922 gst-plugins-ffmpeg-0.8.2-r1.ebuild 1598
 MD5 7656b8141a9dafd7103958ece9272f1e gst-plugins-ffmpeg-0.8.0.ebuild 1043
-MD5 0513445eb3c238d25adedb7242d7191e ChangeLog 1758
+MD5 cf0c087c6ebd1173ba8f0e594ab875b9 ChangeLog 1898
 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
 MD5 08218449f7831982743033aa8a752314 files/digest-gst-plugins-ffmpeg-0.8.0 70
 MD5 0b33ba99748b99f1f1f0398c89c9bd41 files/digest-gst-plugins-ffmpeg-0.8.1 70
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild
index 542cf08b1be4..23f251353a53 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.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-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild,v 1.1 2004/11/28 23:32:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.2-r1.ebuild,v 1.2 2004/12/12 18:11:29 foser Exp $
 
 inherit flag-o-matic
 
@@ -36,9 +36,15 @@ src_unpack() {
 
 src_compile() {
 
-	# just a few random flags, see #56075
-	filter-flags "-Os" "-O3" "-fforce-addr"
-	strip-flags
+	# Restrictions taken from the mplayer ebuild
+	# See bug #64262 for more info
+	# let's play the filtration game!
+	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
 
 	econf || die
 	emake || die
@@ -47,7 +53,6 @@ src_compile() {
 
 src_install() {
 
-	# einstall || die
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-- 
2.26.2