diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-08-04 08:01:54 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-08-04 08:01:54 +0000 |
| commit | fecbe2df0120c1e38af2904584ed57572cb960dd (patch) | |
| tree | ed170e0bd9097ff5ecb5dd25a9bc05847f3845e3 /media-plugins | |
| parent | clean unused msql use flag (diff) | |
| download | gentoo-2-fecbe2df0120c1e38af2904584ed57572cb960dd.tar.gz gentoo-2-fecbe2df0120c1e38af2904584ed57572cb960dd.tar.bz2 gentoo-2-fecbe2df0120c1e38af2904584ed57572cb960dd.zip | |
Respect environment CFLAGS wrt #418243 by "thomasg"
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/frei0r-plugins/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/media-plugins/frei0r-plugins/ChangeLog b/media-plugins/frei0r-plugins/ChangeLog index 0f2db8e5c8d7..bc6f7e3859f5 100644 --- a/media-plugins/frei0r-plugins/ChangeLog +++ b/media-plugins/frei0r-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/frei0r-plugins # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.19 2012/06/14 14:12:20 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.20 2012/08/04 08:01:53 ssuominen Exp $ + + 04 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> + frei0r-plugins-1.3.ebuild: + Respect environment CFLAGS wrt #418243 by "thomasg" 14 Jun 2012; Michael Weber <xmw@gentoo.org> frei0r-plugins-1.3.ebuild: ppc stable (bug 394291) diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild index 24068ade1c30..b911609d0a40 100644 --- a/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild +++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild,v 1.6 2012/06/14 14:12:20 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.3.ebuild,v 1.7 2012/08/04 08:01:54 ssuominen Exp $ EAPI=4 inherit cmake-utils multilib @@ -36,7 +36,12 @@ src_prepare() { sed -i \ -e '/set(CMAKE_C_FLAGS/d' \ -e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \ - ${f} + ${f} || die + + # http://bugs.gentoo.org/418243 + sed -i \ + -e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \ + src/filter/*/${f} || die use facedetect || sed -i -e '/package.*OpenCV/d' ${f} use scale0tilt || sed -i -e '/modules.*gavl/d' ${f} |