summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <ford_prefect@gentoo.org>2011-11-04 09:44:04 +0000
committerArun Raghavan <ford_prefect@gentoo.org>2011-11-04 09:44:04 +0000
commit5042ec05b7ef8cffe09cc864020684d0724e794b (patch)
tree39a690250daeec0d9c123f6f507ff04791a684b9 /media-plugins
parentMarked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian ... (diff)
downloadgentoo-2-5042ec05b7ef8cffe09cc864020684d0724e794b.tar.gz
gentoo-2-5042ec05b7ef8cffe09cc864020684d0724e794b.tar.bz2
gentoo-2-5042ec05b7ef8cffe09cc864020684d0724e794b.zip
For hardened systems, disable mmx and mmx2 optimisations, since these introduce TEXTRELs. (bug #389471)
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/gst-plugins-ffmpeg/ChangeLog9
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild (renamed from media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13.ebuild)13
2 files changed, 18 insertions, 4 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index ec35ca825205..485fa290e5e9 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-plugins/gst-plugins-ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.131 2011/11/04 06:21:44 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.132 2011/11/04 09:44:04 ford_prefect Exp $
+
+*gst-plugins-ffmpeg-0.10.13-r1 (04 Nov 2011)
+
+ 04 Nov 2011; Arun Raghavan <ford_prefect@gentoo.org>
+ -gst-plugins-ffmpeg-0.10.13.ebuild, +gst-plugins-ffmpeg-0.10.13-r1.ebuild:
+ For hardened systems, disable mmx and mmx2 optimisations, since these
+ introduce TEXTRELs. (bug #389471)
*gst-plugins-ffmpeg-0.10.13 (04 Nov 2011)
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
index c93732d18243..09fd05dbb8cf 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.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-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13.ebuild,v 1.1 2011/11/04 06:21:44 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.1 2011/11/04 09:44:04 ford_prefect Exp $
EAPI=1
@@ -21,7 +21,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+orc"
+IUSE="+orc hardened"
S=${WORKDIR}/${MY_P}
@@ -34,7 +34,14 @@ DEPEND="${RDEPEND}
src_compile() {
append-flags -fno-strict-aliasing
- econf $(use_enable orc)
+ if ! use hardened; then
+ econf $(use_enable orc)
+ else
+ # On hardened, we need to disable mmx and mmx2 to avoid TEXTRELs
+ econf $(use_enable orc) \
+ --with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2'
+ fi
+
emake || die "emake failed."
}