pass user cflags as extra-cflags, disable optflags as we assume user cflags contain...

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

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9d1dee821a1871b75fd5cd14ba0fcfb668416e38..da53a7613e20ae52ceb9ece44cf35a638a0ecb31 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.504 2011/12/09 13:59:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.505 2011/12/15 11:15:54 aballier Exp $
+
+  15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  pass user cflags as extra-cflags, disable optflags as we assume user cflags
+  contain them, do not disable opimizations since optflags are empty, bug
+  #392451
 
   09 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.8.7.ebuild,
   ffmpeg-9999.ebuild:

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 9960d7544508051a313005fb797347a2a240f74d..de198be230b65f2b439c0b1037ddb7034b1d23f9 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,13 +8,13 @@ DIST ffmpeg-0.8.7.tar.bz2 4527751 RMD160 5ccc0cfcfaf77b2f7e7cc51190d00bc22db8586
 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f
 EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318
 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4
-EBUILD ffmpeg-9999.ebuild 8849 RMD160 ec36a0557756db9f288c033a5b111d2963f4e6be SHA1 6426dc2629af02273b89bb9b67c1ef3a5099deea SHA256 049921045c1426a1cfe6095c5e214c1f2640fa053d802b10a72f70fb63fffab0
-MISC ChangeLog 72353 RMD160 c2cb7337133209d22622f356d65d1844e1afb047 SHA1 357521a3749607cd8fd7eed606c2926edbaec1b5 SHA256 414e465a3a6007e7d0c626fb88057ccaa88e0d932b7201a608bfa0317a16179e
+EBUILD ffmpeg-9999.ebuild 8905 RMD160 533b3ea4438896dd8339e793d568d83017368f0b SHA1 870e3e837972f10ed3f1c3b1c9d59d26d78589a8 SHA256 d45fef0e2b98f68ff06a6c76d5aae6861b8e64cfcfddae14c3c42a7e2e9eb504
+MISC ChangeLog 72588 RMD160 64137fa73c7e7c06e6af3073c73a40d81272f6f5 SHA1 960be9ffc1eac376ff0060a20b42c8ec5fd8096f SHA256 e403ba17e1da4dbc3bbb03822f2e1e1bcf64da3ced906a42c0465592b4ffee61
 MISC metadata.xml 3136 RMD160 83498fadc792f93d602a65caf742e4cd1c379615 SHA1 61ecdedb07c4d97cf5f3a665e9d301c07657d863 SHA256 6a36d874d9bd519aadc8c406f9f1a07b60dd35c41a41ba8484f602b87f8ed85e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7iFEcACgkQvFcC4BYPU0qkogCaAoefpkUSaU5Pyyw9pqpjRKUn
-ocgAoLqlULQ4PY0khA6oO5TCFFL0i9U5
-=stva
+iEYEARECAAYFAk7p1u8ACgkQvFcC4BYPU0p/1wCfYiV/Ox0rnHAlPGxj6AV+5PLl
+bpYAn3fOTo7Sfr5Fm5d9VwxTVV2xieSf
+=K/aj
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index e2a0c3a550a494b9b494fc717b9c08a04e4efba3..872fef9363fc9e7f0d449566b6884094cb649e03 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.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-video/ffmpeg/ffmpeg-9999.ebuild,v 1.68 2011/12/09 13:59:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.69 2011/12/15 11:15:54 aballier Exp $
 
 EAPI="4"
 
@@ -251,7 +251,9 @@ src_configure() {
                --mandir="${EPREFIX}/usr/share/man" \
                --enable-shared \
                --cc="$(tc-getCC)" \
-               --disable-optimizations \
+               --optflags="" \
+               --extra-cflags="${CFLAGS}" \
+               --extra-cxxflags="${CXXFLAGS}" \
                $(use_enable static-libs static) \
                ${myconf} || die
 }