diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-01-26 15:56:13 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-01-26 15:56:13 +0000 |
| commit | 13715861f7fdcca9ee701e475095f6992305e3b5 (patch) | |
| tree | f1952f6b2914c3ef040321f85e2e44ae79911d9f /media-video | |
| parent | Removed old versions. (diff) | |
| download | gentoo-2-13715861f7fdcca9ee701e475095f6992305e3b5.tar.gz gentoo-2-13715861f7fdcca9ee701e475095f6992305e3b5.tar.bz2 gentoo-2-13715861f7fdcca9ee701e475095f6992305e3b5.zip | |
Handle -march=*-sse3 properly, bug 283968; Install the manpages, bug 288467.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index bde9532fbb47..bc035ee79ebd 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.339 2010/01/26 15:00:41 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.340 2010/01/26 15:56:13 spatz Exp $ + + 26 Jan 2010; Dror Levin <spatz@gentoo.org> ffmpeg-0.5_p20601-r1.ebuild, + ffmpeg-9999-r1.ebuild: + Handle -march=*-sse3 properly, bug 283968; Install the manpages, bug + 288467. 26 Jan 2010; Dror Levin <spatz@gentoo.org> ffmpeg-0.5_p20601-r1.ebuild, ffmpeg-9999-r1.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild index 8cc4cc2efe65..2237ceb7afa4 100644 --- a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.5_p20601-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/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.3 2010/01/26 15:00:41 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.4 2010/01/26 15:56:13 spatz Exp $ EAPI=2 SCM="" @@ -178,6 +178,7 @@ src_configure() { # will just ignore it. for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do [ "${i}" = "native" ] && i="host" # bug #273421 + [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 myconf="${myconf} --cpu=$i" break done @@ -205,6 +206,7 @@ src_configure() { # Misc stuff use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables" + use doc || myconf="${myconf} --disable-doc" # Specific workarounds for too-few-registers arch... if [[ $(tc-arch) == "x86" ]]; then @@ -238,7 +240,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "Install Failed" + emake DESTDIR="${D}" install install-man || die "Install Failed" dodoc Changelog README INSTALL dodoc doc/* diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 3ae8cc72fba9..aaf3974aea1e 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-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/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.27 2010/01/26 15:00:41 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.28 2010/01/26 15:56:13 spatz Exp $ EAPI=2 SCM="" @@ -174,6 +174,7 @@ src_configure() { # will just ignore it. for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do [ "${i}" = "native" ] && i="host" # bug #273421 + [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 myconf="${myconf} --cpu=$i" break done @@ -235,7 +236,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "Install Failed" + emake DESTDIR="${D}" install install-man || die "Install Failed" dodoc Changelog README INSTALL dodoc doc/* |