diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-03-04 11:40:57 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-03-04 11:40:57 +0000 |
| commit | 66f16eb7af8ee7819e4b2f185d43fece5dddab02 (patch) | |
| tree | a9c40961153d8333398bc10041255da6447ab56b | |
| parent | Simplify logic in src_configure. (diff) | |
| download | gentoo-2-66f16eb7af8ee7819e4b2f185d43fece5dddab02.tar.gz gentoo-2-66f16eb7af8ee7819e4b2f185d43fece5dddab02.tar.bz2 gentoo-2-66f16eb7af8ee7819e4b2f185d43fece5dddab02.zip | |
do an out-of-tree build
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 27 |
2 files changed, 21 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index ae16b93608a6..bbf32eef55fc 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.609 2013/03/04 10:58:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.610 2013/03/04 11:40:57 aballier Exp $ + + 04 Mar 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + do an out-of-tree build *ffmpeg-1.0.5 (04 Mar 2013) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index dc98deea08a2..ff345d4aa85d 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.116 2013/02/22 19:08:22 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.117 2013/03/04 11:40:57 aballier Exp $ EAPI="4" @@ -123,6 +123,7 @@ REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) test? ( encode )" S=${WORKDIR}/${P/_/-} +BUILD_DIR=${S}_build src_prepare() { if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot @@ -132,6 +133,9 @@ src_prepare() { } src_configure() { + mkdir -p "${BUILD_DIR}" + cd "${BUILD_DIR}" + local myconf="${EXTRA_FFMPEG_CONF}" # Set to --enable-version3 if (L)GPL-3 is required local version3="" @@ -256,8 +260,7 @@ src_configure() { # Misc stuff use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables" - cd "${S}" - ./configure \ + "${S}/configure" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -274,6 +277,7 @@ src_configure() { } src_compile() { + cd "${BUILD_DIR}" emake V=1 for i in ${FFTOOLS} ; do @@ -284,23 +288,26 @@ src_compile() { } src_install() { + cd "${BUILD_DIR}" emake V=1 DESTDIR="${D}" install install-man + for i in ${FFTOOLS} ; do + if use fftools_$i ; then + dobin tools/$i + fi + done + + cd "${S}" dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES use doc && dohtml -r doc/* if use examples ; then insinto "/usr/share/doc/${PF}/examples" doins -r doc/examples/* fi - - for i in ${FFTOOLS} ; do - if use fftools_$i ; then - dobin tools/$i - fi - done } src_test() { - LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil:${S}/libavresample" \ + cd "${BUILD_DIR}" + LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ emake V=1 fate } |