summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-02 22:26:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-02 22:26:50 +0000
commit83ee436daa658f1cb3a09f8368e3a1c2aa7b3dd7 (patch)
treec05cf8b95a0b373d1a6139202b91339967f0dccf /media-video
parentFixing dependencies (diff)
downloadhistorical-83ee436daa658f1cb3a09f8368e3a1c2aa7b3dd7.tar.gz
historical-83ee436daa658f1cb3a09f8368e3a1c2aa7b3dd7.tar.bz2
historical-83ee436daa658f1cb3a09f8368e3a1c2aa7b3dd7.zip
Append -nopie to LDFLAGS wrt #93862 and only filter -fPIC -fPIE on x86.
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest6
-rw-r--r--media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild8
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild8
4 files changed, 20 insertions, 8 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 861002de7302..48d59bb3c223 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.713 2010/02/27 23:37:39 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.714 2010/03/02 22:26:50 ssuominen Exp $
+
+ 02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+ mplayer-1.0_rc4_p20100213-r1.ebuild, mplayer-9999.ebuild:
+ Append -nopie to LDFLAGS wrt #93862 and only filter -fPIC -fPIE on x86.
*mplayer-1.0_rc4_p20100213-r1 (27 Feb 2010)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index be0700a31aa3..06962ef3bb76 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,7 +11,7 @@ DIST mplayer-1.0_rc4_p20091026.tbz2 15508762 RMD160 f4a6b4253cfbea8d3f7d6e1ac1c5
DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484598956db983 SHA1 350d39f2b42f5c5065abe7d64a4d759a9efa56f4 SHA256 59c09f6388ad15d12f74ae18ebe07945392e40d9096d5598bd496f857722bcb0
DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 19012 RMD160 1076a93d98415f9a0c485d7a657ab880826a31b5 SHA1 0a864159b27bac92b50729eed004cc1f767a8593 SHA256 6267e447602f2323c11e91f9c702012616b5794d178ecae2f5522348161506cb
-EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19953 RMD160 aed19e86078f7114b72f1327ff27503c49baa577 SHA1 ad3f05a64a075df7b61b59154351e76cc4d74ebc SHA256 a1d751d0cf0ee421ceae8ef91a07ad0789581c1dc6854b8a7b084752fecb3f39
-EBUILD mplayer-9999.ebuild 19938 RMD160 6bd0403e07c5ac3f280046033cc6ad224fadc78f SHA1 fa5813afc1469c7d574bae259e0acb8a5c34415a SHA256 5915139847acfe2491f203c5e98d9fcb06cef4b1a4807fb47eedea84f3ae169d
-MISC ChangeLog 126131 RMD160 4edf818cf45ac533c3ed954de51cac8c63bdf12c SHA1 216b4fb34627aa2d6945562a40ad5c38c296ea87 SHA256 9df2110ba578a41def1523e47f7676b7921786173b1e32239cb9f59394c837e8
+EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 20001 RMD160 c1130eb9f758599dfdad0732e9f59ef92b4cba51 SHA1 50d08fc82c9701f3ec161610f5f979c240e73e83 SHA256 282c2f3507d763106375f2e80246cb457e6261399469bce354b51001341659d1
+EBUILD mplayer-9999.ebuild 19986 RMD160 4e29f985355549f24cd1305c9b7a52ef3b65aad0 SHA1 fa99fa28a15cd609a8925c9b82124890a0d73606 SHA256 b9525075112c46fc7f8785123845989e13b510d27b7250d38ea52faff852f1af
+MISC ChangeLog 126324 RMD160 d84930ddf3356e044ff44fd73307b17e1d257cca SHA1 f5b116d512f29e9d02a862bce4e361dc7fdd3e11 SHA256 2bc1478dd63a717bb3939a519040a5c7e980856e31c20d0cf823ef578b853226
MISC metadata.xml 3591 RMD160 883e9161526d98f546d5b790a76da78ae6b03b94 SHA1 bf3ab6509cfa4a72a088ba005c9a92e44bac6df1 SHA256 956383713923533a4caa6e39fbe8067b2afa7c7aecc3e52c9dd0715435226ef8
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild
index b01353029b55..957ce1c8082f 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild,v 1.2 2010/03/01 17:23:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild,v 1.3 2010/03/02 22:26:50 ssuominen Exp $
EAPI="2"
@@ -558,7 +558,11 @@ src_configure() {
use debug && myconf+=" --enable-debug=3"
- filter-flags -fPIC -fPIE
+ if use x86; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
append-flags -D__STDC_LIMIT_MACROS
is-flag -O? || append-flags -O2
if use x86 || use x86-fbsd; then
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 64ad1642e6b7..ce8e670ee529 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.27 2010/03/01 17:23:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.28 2010/03/02 22:26:50 ssuominen Exp $
EAPI="2"
@@ -558,7 +558,11 @@ src_configure() {
use debug && myconf+=" --enable-debug=3"
- filter-flags -fPIC -fPIE
+ if use x86; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
append-flags -D__STDC_LIMIT_MACROS
is-flag -O? || append-flags -O2
if use x86 || use x86-fbsd; then