| 1 |
aballier 11/06/29 14:50:13 |
| 2 |
|
| 3 |
Modified: ffmpeg-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
convert to eapi4, add eprefix stuff, make use of REQUIRED_USE |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.47 media-video/ffmpeg/ffmpeg-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.47&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.47&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.46&r2=1.47 |
| 15 |
|
| 16 |
Index: ffmpeg-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v |
| 19 |
retrieving revision 1.46 |
| 20 |
retrieving revision 1.47 |
| 21 |
diff -u -r1.46 -r1.47 |
| 22 |
--- ffmpeg-9999.ebuild 27 Jun 2011 14:25:08 -0000 1.46 |
| 23 |
+++ ffmpeg-9999.ebuild 29 Jun 2011 14:50:13 -0000 1.47 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.46 2011/06/27 14:25:08 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.47 2011/06/29 14:50:13 aballier Exp $ |
| 29 |
|
| 30 |
-EAPI="2" |
| 31 |
+EAPI="4" |
| 32 |
|
| 33 |
SCM="" |
| 34 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 35 |
@@ -88,6 +88,8 @@ |
| 36 |
v4l? ( sys-kernel/linux-headers ) |
| 37 |
v4l2? ( sys-kernel/linux-headers ) |
| 38 |
" |
| 39 |
+# faac is license-incompatible with ffmpeg |
| 40 |
+REQUIRED_USE="bindist? ( encode? ( !faac ) )" |
| 41 |
|
| 42 |
S=${WORKDIR}/${P/_/-} |
| 43 |
|
| 44 |
@@ -127,13 +129,7 @@ |
| 45 |
for i in theora vorbis x264 xvid; do |
| 46 |
use ${i} && myconf="${myconf} --enable-lib${i}" |
| 47 |
done |
| 48 |
- if use bindist |
| 49 |
- then |
| 50 |
- use faac && ewarn "faac is nonfree and cannot be distributed; |
| 51 |
- disabling faac support." |
| 52 |
- else |
| 53 |
- use faac && myconf="${myconf} --enable-libfaac --enable-nonfree" |
| 54 |
- fi |
| 55 |
+ use faac && myconf="${myconf} --enable-libfaac --enable-nonfree" |
| 56 |
else |
| 57 |
myconf="${myconf} --disable-encoders" |
| 58 |
fi |
| 59 |
@@ -236,10 +232,10 @@ |
| 60 |
|
| 61 |
cd "${S}" |
| 62 |
./configure \ |
| 63 |
- --prefix=/usr \ |
| 64 |
- --libdir=/usr/$(get_libdir) \ |
| 65 |
- --shlibdir=/usr/$(get_libdir) \ |
| 66 |
- --mandir=/usr/share/man \ |
| 67 |
+ --prefix="${EPREFIX}/usr" \ |
| 68 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 69 |
+ --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 70 |
+ --mandir="${EPREFIX}/usr/share/man" \ |
| 71 |
--enable-shared \ |
| 72 |
--cc="$(tc-getCC)" \ |
| 73 |
$(use_enable static-libs static) \ |
| 74 |
@@ -247,30 +243,31 @@ |
| 75 |
} |
| 76 |
|
| 77 |
src_compile() { |
| 78 |
- emake version.h || die #252269 |
| 79 |
- emake || die |
| 80 |
+ #252269 |
| 81 |
+ emake version.h |
| 82 |
+ emake |
| 83 |
|
| 84 |
if use qt-faststart; then |
| 85 |
tc-export CC |
| 86 |
- emake -C tools qt-faststart || die |
| 87 |
+ emake -C tools qt-faststart |
| 88 |
fi |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
| 92 |
- emake DESTDIR="${D}" install install-man || die |
| 93 |
+ emake DESTDIR="${D}" install install-man |
| 94 |
|
| 95 |
dodoc Changelog README INSTALL |
| 96 |
- dodoc doc/* |
| 97 |
+ dodoc -r doc/* |
| 98 |
|
| 99 |
if use qt-faststart; then |
| 100 |
- dobin tools/qt-faststart || die |
| 101 |
+ dobin tools/qt-faststart |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
src_test() { |
| 106 |
if use encode ; then |
| 107 |
LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ |
| 108 |
- emake test || die "Some tests failed" |
| 109 |
+ emake test |
| 110 |
else |
| 111 |
ewarn "Tests fail without USE=encode, skipping" |
| 112 |
fi |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.425 media-video/ffmpeg/ChangeLog |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.425&view=markup |
| 119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.425&content-type=text/plain |
| 120 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.424&r2=1.425 |
| 121 |
|
| 122 |
Index: ChangeLog |
| 123 |
=================================================================== |
| 124 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
| 125 |
retrieving revision 1.424 |
| 126 |
retrieving revision 1.425 |
| 127 |
diff -u -r1.424 -r1.425 |
| 128 |
--- ChangeLog 27 Jun 2011 14:25:08 -0000 1.424 |
| 129 |
+++ ChangeLog 29 Jun 2011 14:50:13 -0000 1.425 |
| 130 |
@@ -1,6 +1,9 @@ |
| 131 |
# ChangeLog for media-video/ffmpeg |
| 132 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 133 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.424 2011/06/27 14:25:08 aballier Exp $ |
| 134 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.425 2011/06/29 14:50:13 aballier Exp $ |
| 135 |
+ |
| 136 |
+ 29 Jun 2011; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
| 137 |
+ convert to eapi4, add eprefix stuff, make use of REQUIRED_USE |
| 138 |
|
| 139 |
27 Jun 2011; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
| 140 |
add openal useflag |
Archives