For hardened systems, disable mmx and mmx2 optimisations, since these introduce TEXTR...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index ec35ca8252050bf591a836b330b237535cdf340c..485fa290e5e904b0c8de510c600ff09a032226b2 100644 (file)
--- 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/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index b4bb857e271d4c6f09224777285f0b879355bae0..28dfe9fbdc82ec0a5ae2093021b386673b240b89 100644 (file)
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -11,14 +11,14 @@ DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 RMD160 3e5e3d44302665214cfde8a908b633f8d
 DIST gst-ffmpeg-0.10.9.tar.bz2 3310276 RMD160 07d0ac35a7896058b827992a07bd4f8501c0abc0 SHA1 88b68958680d345ebb7b261dbabd12b5908869ef SHA256 63ed1b3c7d548bed4ad50e05b14374cdb0d91e3bfac19248d68c7144bf2c8f15
 EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1150 RMD160 45d02893ccb86499b5a808411f5ef49c28226957 SHA1 c16140d816295fb759ff55385a021a76939e3a46 SHA256 cb319f1dc0bb4e9993a762300b6a424dbc19eaaad4a44502f9fe81f664f4bef7
 EBUILD gst-plugins-ffmpeg-0.10.12.ebuild 1150 RMD160 5e564dff8a59aad8723a90371b265794acd209dc SHA1 34fa4381e89779f5727b62a984d7fd435dfd20ca SHA256 a394e5e9d315fb5c2ec2709d254b1d13b3043c3bce4f7da18ab10e30356aa74c
-EBUILD gst-plugins-ffmpeg-0.10.13.ebuild 1158 RMD160 e08fee74bf41e89ac1b6dc5171ed6a1ad6a1068e SHA1 881d6668e9c5be089b87341af7b935daf7e9b635 SHA256 065de2035b0cce4d1a837c418c41abef69a786cb8c97fbc76c0f641afdb99495
+EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1366 RMD160 8e415d6fe1f9f08c51454f1605eac647e65ee365 SHA1 062a1a3b1413f6d0a0104d6046984180240d308a SHA256 9b067820b29c1e08bf57295f42b00053be9badcd4b3db374cfdc35130eaeb82f
 EBUILD gst-plugins-ffmpeg-0.10.9.ebuild 1103 RMD160 b69788268add004f574f883d599acae19afcdd50 SHA1 f5ad3de7f65a5f44c1d52c8f1ce67099eec34e42 SHA256 ae4b13df8080264b9b7a92882ef15c593ae9290a27df59e448e15c3da596c72c
-MISC ChangeLog 19656 RMD160 189800276e8bc034a23a90f24acbb81c670c77e7 SHA1 01011e235f579fc1a224f0c072432745eceea507 SHA256 0b3069eada53c7850e72dc0f7792e3dcea4e0fc5e90d88f8dcbac719f6c894b4
+MISC ChangeLog 19943 RMD160 b98e3033985079860f55bd63f1c5e6e2979e4d10 SHA1 fd3eee8c7ed36e61f32cceecbf4d6179cf1f1713 SHA256 a38a745562cc86d7fdc18ac19eb5dd865614729c4453195a0cc726387a600c23
 MISC metadata.xml 284 RMD160 7cc22001038b1ed2a95eb604de942b333449a98f SHA1 3b51c6e37d36e78ab53b51d83fe43980b2691f3d SHA256 f64fcc91266aa9c29d21e88be4f29f303151bb5b27aab1466f52404aaeb29d24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6zhIsACgkQ+Vqt1inD4uxaywCfWksPkUDPkGcHEVAdO1HXX0Ux
-n5EAn3b5qtjB/kx5ore+QuRqLl6c3xqs
-=/WxA
+iEYEARECAAYFAk6zs+0ACgkQ+Vqt1inD4uyVKACgriCEYYzWxVXs180zFGSIpGq2
+6p4An3bLi1BkeNaTx+IqZEmfz6xqhajM
+=CPNz
 -----END PGP SIGNATURE-----

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
similarity index 75%
rename from media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13.ebuild
rename to media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
index c93732d1824331da1cb4cbd7edb543ed61d9c2fc..09fd05dbb8cfda5584364c79ea9550f8617bcd01 100644 (file)
--- 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."
 }