1 |
aballier 11/04/05 04:49:22 |
2 |
|
3 |
Modified: ffmpeg-9999.ebuild ChangeLog |
4 |
Added: ffmpeg-0.6.90_rc0.ebuild |
5 |
Log: |
6 |
version bump and adjust variables to fit with the rc style releases |
7 |
|
8 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.38 media-video/ffmpeg/ffmpeg-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.38&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.38&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.37&r2=1.38 |
16 |
|
17 |
Index: ffmpeg-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v |
20 |
retrieving revision 1.37 |
21 |
retrieving revision 1.38 |
22 |
diff -u -r1.37 -r1.38 |
23 |
--- ffmpeg-9999.ebuild 1 Apr 2011 23:16:20 -0000 1.37 |
24 |
+++ ffmpeg-9999.ebuild 5 Apr 2011 04:49:22 -0000 1.38 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2011 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.37 2011/04/01 23:16:20 aballier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.38 2011/04/05 04:49:22 aballier Exp $ |
30 |
|
31 |
EAPI="2" |
32 |
|
33 |
@@ -19,7 +19,7 @@ |
34 |
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot |
35 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
36 |
else # Release |
37 |
- SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2" |
38 |
+ SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2" |
39 |
fi |
40 |
FFMPEG_REVISION="${PV#*_p}" |
41 |
|
42 |
@@ -85,6 +85,8 @@ |
43 |
v4l2? ( sys-kernel/linux-headers ) |
44 |
" |
45 |
|
46 |
+S=${WORKDIR}/${P/_/-} |
47 |
+ |
48 |
src_prepare() { |
49 |
if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot |
50 |
export revision=git-N-${FFMPEG_REVISION} |
51 |
|
52 |
|
53 |
|
54 |
1.400 media-video/ffmpeg/ChangeLog |
55 |
|
56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.400&view=markup |
57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.400&content-type=text/plain |
58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.399&r2=1.400 |
59 |
|
60 |
Index: ChangeLog |
61 |
=================================================================== |
62 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
63 |
retrieving revision 1.399 |
64 |
retrieving revision 1.400 |
65 |
diff -u -r1.399 -r1.400 |
66 |
--- ChangeLog 1 Apr 2011 23:16:20 -0000 1.399 |
67 |
+++ ChangeLog 5 Apr 2011 04:49:22 -0000 1.400 |
68 |
@@ -1,6 +1,12 @@ |
69 |
# ChangeLog for media-video/ffmpeg |
70 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
71 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.399 2011/04/01 23:16:20 aballier Exp $ |
72 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.400 2011/04/05 04:49:22 aballier Exp $ |
73 |
+ |
74 |
+*ffmpeg-0.6.90_rc0 (05 Apr 2011) |
75 |
+ |
76 |
+ 05 Apr 2011; Alexis Ballier <aballier@g.o> +ffmpeg-0.6.90_rc0.ebuild, |
77 |
+ ffmpeg-9999.ebuild: |
78 |
+ version bump and adjust variables to fit with the rc style releases |
79 |
|
80 |
01 Apr 2011; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
81 |
disable-stripping option is back, we need to pass it |
82 |
|
83 |
|
84 |
|
85 |
1.1 media-video/ffmpeg/ffmpeg-0.6.90_rc0.ebuild |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.90_rc0.ebuild?rev=1.1&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.90_rc0.ebuild?rev=1.1&content-type=text/plain |
89 |
|
90 |
Index: ffmpeg-0.6.90_rc0.ebuild |
91 |
=================================================================== |
92 |
# Copyright 1999-2011 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.90_rc0.ebuild,v 1.1 2011/04/05 04:49:22 aballier Exp $ |
95 |
|
96 |
EAPI="2" |
97 |
|
98 |
SCM="" |
99 |
if [ "${PV#9999}" != "${PV}" ] ; then |
100 |
SCM="git" |
101 |
EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" |
102 |
fi |
103 |
|
104 |
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} |
105 |
|
106 |
DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec." |
107 |
HOMEPAGE="http://ffmpeg.org/" |
108 |
if [ "${PV#9999}" != "${PV}" ] ; then |
109 |
SRC_URI="" |
110 |
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot |
111 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
112 |
else # Release |
113 |
SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2" |
114 |
fi |
115 |
FFMPEG_REVISION="${PV#*_p}" |
116 |
|
117 |
LICENSE="GPL-3" |
118 |
SLOT="0" |
119 |
if [ "${PV#9999}" = "${PV}" ] ; then |
120 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
121 |
fi |
122 |
IUSE=" |
123 |
+3dnow +3dnowext alsa altivec amr avx bindist +bzip2 cpudetection |
124 |
custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables |
125 |
ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp |
126 |
schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l |
127 |
v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib |
128 |
" |
129 |
|
130 |
VIDEO_CARDS="nvidia" |
131 |
|
132 |
for x in ${VIDEO_CARDS}; do |
133 |
IUSE="${IUSE} video_cards_${x}" |
134 |
done |
135 |
|
136 |
RDEPEND=" |
137 |
alsa? ( media-libs/alsa-lib ) |
138 |
amr? ( media-libs/opencore-amr ) |
139 |
bzip2? ( app-arch/bzip2 ) |
140 |
dirac? ( media-video/dirac ) |
141 |
encode? ( |
142 |
faac? ( media-libs/faac ) |
143 |
mp3? ( >=media-sound/lame-3.98.3 ) |
144 |
theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) |
145 |
vorbis? ( media-libs/libvorbis media-libs/libogg ) |
146 |
x264? ( >=media-libs/x264-0.0.20101029 ) |
147 |
xvid? ( >=media-libs/xvid-1.1.0 ) |
148 |
) |
149 |
frei0r? ( media-plugins/frei0r-plugins ) |
150 |
gsm? ( >=media-sound/gsm-1.0.12-r1 ) |
151 |
ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) |
152 |
jack? ( media-sound/jack-audio-connection-kit ) |
153 |
jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) |
154 |
rtmp? ( >=media-video/rtmpdump-2.2f ) |
155 |
sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) |
156 |
schroedinger? ( media-libs/schroedinger ) |
157 |
speex? ( >=media-libs/speex-1.2_beta3 ) |
158 |
truetype? ( media-libs/freetype:2 ) |
159 |
vaapi? ( >=x11-libs/libva-0.32 ) |
160 |
video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) |
161 |
vpx? ( media-libs/libvpx ) |
162 |
X? ( x11-libs/libX11 x11-libs/libXext ) |
163 |
zlib? ( sys-libs/zlib ) |
164 |
!media-video/qt-faststart |
165 |
" |
166 |
|
167 |
DEPEND="${RDEPEND} |
168 |
>=sys-devel/make-3.81 |
169 |
dirac? ( dev-util/pkgconfig ) |
170 |
doc? ( app-text/texi2html ) |
171 |
mmx? ( dev-lang/yasm ) |
172 |
rtmp? ( dev-util/pkgconfig ) |
173 |
schroedinger? ( dev-util/pkgconfig ) |
174 |
test? ( net-misc/wget ) |
175 |
v4l? ( sys-kernel/linux-headers ) |
176 |
v4l2? ( sys-kernel/linux-headers ) |
177 |
" |
178 |
|
179 |
S=${WORKDIR}/${P/_/-} |
180 |
|
181 |
src_prepare() { |
182 |
if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot |
183 |
export revision=git-N-${FFMPEG_REVISION} |
184 |
fi |
185 |
} |
186 |
|
187 |
src_configure() { |
188 |
local myconf="${EXTRA_FFMPEG_CONF}" |
189 |
|
190 |
# enabled by default |
191 |
for i in debug doc network vaapi zlib; do |
192 |
use ${i} || myconf="${myconf} --disable-${i}" |
193 |
done |
194 |
use bzip2 || myconf="${myconf} --disable-bzlib" |
195 |
use sdl || myconf="${myconf} --disable-ffplay" |
196 |
|
197 |
use custom-cflags && myconf="${myconf} --disable-optimizations" |
198 |
use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" |
199 |
|
200 |
#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do |
201 |
# use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" |
202 |
# use vdpau || myconf="${myconf} --disable-decoder=${i}" |
203 |
#done |
204 |
use video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau" |
205 |
|
206 |
# Encoders |
207 |
if use encode |
208 |
then |
209 |
use mp3 && myconf="${myconf} --enable-libmp3lame" |
210 |
for i in theora vorbis x264 xvid; do |
211 |
use ${i} && myconf="${myconf} --enable-lib${i}" |
212 |
done |
213 |
if use bindist |
214 |
then |
215 |
use faac && ewarn "faac is nonfree and cannot be distributed; |
216 |
disabling faac support." |
217 |
else |
218 |
use faac && myconf="${myconf} --enable-libfaac --enable-nonfree" |
219 |
fi |
220 |
else |
221 |
myconf="${myconf} --disable-encoders" |
222 |
fi |
223 |
|
224 |
# libavdevice options |
225 |
use ieee1394 && myconf="${myconf} --enable-libdc1394" |
226 |
# Indevs |
227 |
for i in v4l v4l2 alsa oss jack ; do |
228 |
use ${i} || myconf="${myconf} --disable-indev=${i}" |
229 |
done |
230 |
use X && myconf="${myconf} --enable-x11grab" |
231 |
# Outdevs |
232 |
for i in alsa oss ; do |
233 |
use ${i} || myconf="${myconf} --disable-outdev=${i}" |
234 |
done |
235 |
# libavfilter options |
236 |
use frei0r && myconf="${myconf} --enable-frei0r" |
237 |
use truetype && myconf="${myconf} --enable-libfreetype" |
238 |
|
239 |
# Threads; we only support pthread for now but ffmpeg supports more |
240 |
use threads && myconf="${myconf} --enable-pthreads" |
241 |
|
242 |
# Decoders |
243 |
use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" |
244 |
for i in gsm dirac rtmp schroedinger speex vpx; do |
245 |
use ${i} && myconf="${myconf} --enable-lib${i}" |
246 |
done |
247 |
use jpeg2k && myconf="${myconf} --enable-libopenjpeg" |
248 |
|
249 |
# CPU features |
250 |
for i in mmx ssse3 altivec avx ; do |
251 |
use ${i} || myconf="${myconf} --disable-${i}" |
252 |
done |
253 |
use mmxext || myconf="${myconf} --disable-mmx2" |
254 |
use 3dnow || myconf="${myconf} --disable-amd3dnow" |
255 |
use 3dnowext || myconf="${myconf} --disable-amd3dnowext" |
256 |
# disable mmx accelerated code if PIC is required |
257 |
# as the provided asm decidedly is not PIC for x86. |
258 |
if use pic && use x86 ; then |
259 |
myconf="${myconf} --disable-mmx --disable-mmx2" |
260 |
fi |
261 |
|
262 |
# Option to force building pic |
263 |
use pic && myconf="${myconf} --enable-pic" |
264 |
|
265 |
# Try to get cpu type based on CFLAGS. |
266 |
# Bug #172723 |
267 |
# We need to do this so that features of that CPU will be better used |
268 |
# If they contain an unknown CPU it will not hurt since ffmpeg's configure |
269 |
# will just ignore it. |
270 |
for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do |
271 |
[ "${i}" = "native" ] && i="host" # bug #273421 |
272 |
[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 |
273 |
myconf="${myconf} --cpu=${i}" |
274 |
break |
275 |
done |
276 |
|
277 |
# Mandatory configuration |
278 |
myconf=" |
279 |
--enable-gpl |
280 |
--enable-version3 |
281 |
--enable-postproc |
282 |
--enable-avfilter |
283 |
--disable-stripping |
284 |
${myconf}" |
285 |
|
286 |
# cross compile support |
287 |
if tc-is-cross-compiler ; then |
288 |
myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" |
289 |
case ${CHOST} in |
290 |
*freebsd*) |
291 |
myconf="${myconf} --target-os=freebsd" |
292 |
;; |
293 |
mingw32*) |
294 |
myconf="${myconf} --target-os=mingw32" |
295 |
;; |
296 |
*linux*) |
297 |
myconf="${myconf} --target-os=linux" |
298 |
;; |
299 |
esac |
300 |
fi |
301 |
|
302 |
# Misc stuff |
303 |
use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables" |
304 |
|
305 |
# Specific workarounds for too-few-registers arch... |
306 |
if [[ $(tc-arch) == "x86" ]]; then |
307 |
filter-flags -fforce-addr -momit-leaf-frame-pointer |
308 |
append-flags -fomit-frame-pointer |
309 |
is-flag -O? || append-flags -O2 |
310 |
if (use debug); then |
311 |
# no need to warn about debug if not using debug flag |
312 |
ewarn "" |
313 |
ewarn "Debug information will be almost useless as the frame pointer is omitted." |
314 |
ewarn "This makes debugging harder, so crashes that has no fixed behavior are" |
315 |
ewarn "difficult to fix. Please have that in mind." |
316 |
ewarn "" |
317 |
fi |
318 |
fi |
319 |
|
320 |
cd "${S}" |
321 |
./configure \ |
322 |
--prefix=/usr \ |
323 |
--libdir=/usr/$(get_libdir) \ |
324 |
--shlibdir=/usr/$(get_libdir) \ |
325 |
--mandir=/usr/share/man \ |
326 |
--enable-shared \ |
327 |
--cc="$(tc-getCC)" \ |
328 |
$(use_enable static-libs static) \ |
329 |
${myconf} || die |
330 |
} |
331 |
|
332 |
src_compile() { |
333 |
emake version.h || die #252269 |
334 |
emake || die |
335 |
|
336 |
if use qt-faststart; then |
337 |
tc-export CC |
338 |
emake -C tools qt-faststart || die |
339 |
fi |
340 |
} |
341 |
|
342 |
src_install() { |
343 |
emake DESTDIR="${D}" install install-man || die |
344 |
|
345 |
dodoc Changelog README INSTALL |
346 |
dodoc doc/* |
347 |
|
348 |
if use qt-faststart; then |
349 |
dobin tools/qt-faststart || die |
350 |
fi |
351 |
} |
352 |
|
353 |
src_test() { |
354 |
if use encode ; then |
355 |
for t in codectest lavftest seektest ; do |
356 |
LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ |
357 |
emake ${t} || die "Some tests in ${t} failed" |
358 |
done |
359 |
else |
360 |
ewarn "Tests fail without USE=encode, skipping" |
361 |
fi |
362 |
} |