Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-2.3.3.ebuild ChangeLog
Date: Fri, 29 Aug 2014 18:32:21
Message-Id: 20140829183217.0CB4A4309@oystercatcher.gentoo.org
1 aballier 14/08/29 18:32:17
2
3 Modified: ChangeLog
4 Added: ffmpeg-2.3.3.ebuild
5 Log:
6 version bump
7
8 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
9
10 Revision Changes Path
11 1.786 media-video/ffmpeg/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.786&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.786&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.785&r2=1.786
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
20 retrieving revision 1.785
21 retrieving revision 1.786
22 diff -u -r1.785 -r1.786
23 --- ChangeLog 29 Aug 2014 18:14:06 -0000 1.785
24 +++ ChangeLog 29 Aug 2014 18:32:16 -0000 1.786
25 @@ -1,6 +1,11 @@
26 # ChangeLog for media-video/ffmpeg
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.785 2014/08/29 18:14:06 aballier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.786 2014/08/29 18:32:16 aballier Exp $
30 +
31 +*ffmpeg-2.3.3 (29 Aug 2014)
32 +
33 + 29 Aug 2014; Alexis Ballier <aballier@g.o> +ffmpeg-2.3.3.ebuild:
34 + version bump
35
36 29 Aug 2014; Alexis Ballier <aballier@g.o> ffmpeg-2.3.2.ebuild,
37 ffmpeg-9999.ebuild:
38
39
40
41 1.1 media-video/ffmpeg/ffmpeg-2.3.3.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.3.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.3.ebuild?rev=1.1&content-type=text/plain
45
46 Index: ffmpeg-2.3.3.ebuild
47 ===================================================================
48 # Copyright 1999-2014 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.3.ebuild,v 1.1 2014/08/29 18:32:16 aballier Exp $
51
52 EAPI="5"
53
54 # Subslot: libavutil major.libavcodec major.libavformat major
55 # Since FFmpeg ships several libraries, subslot is kind of limited here.
56 # Most consumers will use those three libraries, if a "less used" library
57 # changes its soname, consumers will have to be rebuilt the old way
58 # (preserve-libs).
59 # If, for example, a package does not link to libavformat and only libavformat
60 # changes its ABI then this package will be rebuilt needlessly. Hence, such a
61 # package is free _not_ to := depend on FFmpeg but I would strongly encourage
62 # doing so since such a case is unlikely.
63 FFMPEG_SUBSLOT=52.55.55
64
65 SCM=""
66 if [ "${PV#9999}" != "${PV}" ] ; then
67 SCM="git-2"
68 EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
69 fi
70
71 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
72
73 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
74 HOMEPAGE="http://ffmpeg.org/"
75 if [ "${PV#9999}" != "${PV}" ] ; then
76 SRC_URI=""
77 elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
78 SRC_URI="mirror://gentoo/${P}.tar.bz2"
79 else # Release
80 SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
81 fi
82 FFMPEG_REVISION="${PV#*_p}"
83
84 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
85 SLOT="0/${FFMPEG_SUBSLOT}"
86 if [ "${PV#9999}" = "${PV}" ] ; then
87 KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
88 fi
89 IUSE="
90 aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
91 cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
92 fribidi gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
93 jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal
94 opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger sdl
95 speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau
96 vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi
97 "
98
99 ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
100 MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
101 PPC_CPU_FEATURES="altivec"
102 X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
103
104 # String for CPU features in the useflag[:configure_option] form
105 # if :configure_option isn't set, it will use 'useflag' as configure option
106 CPU_FEATURES="
107 ${ARM_CPU_FEATURES}
108 ${MIPS_CPU_FEATURES}
109 ${PPC_CPU_FEATURES}
110 ${X86_CPU_FEATURES}
111 "
112
113 for i in ${CPU_FEATURES}; do
114 IUSE="${IUSE} ${i%:*}"
115 done
116
117 FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
118
119 for i in ${FFTOOLS}; do
120 IUSE="${IUSE} +fftools_$i"
121 done
122
123 RDEPEND="
124 alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
125 amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
126 bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
127 bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
128 bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
129 cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
130 celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
131 encode? (
132 aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
133 aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
134 amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
135 faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
136 mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
137 theora? (
138 >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
139 >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
140 )
141 twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
142 wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
143 webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
144 x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
145 x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
146 xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
147 )
148 fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
149 flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
150 fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
151 frei0r? ( media-plugins/frei0r-plugins )
152 fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
153 gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
154 gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
155 gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
156 iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
157 iec61883? (
158 >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
159 >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
160 >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
161 )
162 ieee1394? (
163 >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
164 >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
165 )
166 jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
167 jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
168 libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
169 libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
170 libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
171 libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
172 modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
173 openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
174 opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
175 openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
176 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
177 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
178 quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
179 rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
180 samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
181 schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
182 sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
183 speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
184 ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
185 truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
186 vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
187 vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
188 vorbis? (
189 >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
190 >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
191 )
192 vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
193 X? (
194 >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
195 >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
196 >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
197 )
198 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
199 zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
200 !media-video/qt-faststart
201 !media-libs/libpostproc
202 "
203
204 DEPEND="${RDEPEND}
205 >=sys-devel/make-3.81
206 doc? ( app-text/texi2html )
207 fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
208 gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
209 ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
210 ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
211 libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
212 mmx? ( >=dev-lang/yasm-1.2 )
213 rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
214 schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
215 test? ( net-misc/wget )
216 truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
217 v4l? ( sys-kernel/linux-headers )
218 "
219
220 RDEPEND="${RDEPEND}
221 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
222 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
223
224 # faac is license-incompatible with ffmpeg
225 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
226 libv4l? ( v4l )
227 fftools_cws2fws? ( zlib )
228 test? ( encode )"
229
230 S=${WORKDIR}/${P/_/-}
231
232 MULTILIB_WRAPPED_HEADERS=(
233 /usr/include/libavutil/avconfig.h
234 )
235
236 src_prepare() {
237 if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
238 export revision=git-N-${FFMPEG_REVISION}
239 fi
240 epatch_user
241 }
242
243 multilib_src_configure() {
244 local myconf=( ${EXTRA_FFMPEG_CONF} )
245
246 # options to use as use_enable in the foo[:bar] form.
247 # This will feed configure with $(use_enable foo bar)
248 # or $(use_enable foo foo) if no :bar is set.
249 local ffuse=(
250 bzip2:bzlib cpudetection:runtime-cpudetect debug doc
251 gnutls hardcoded-tables iconv network openssl samba:libsmbclient
252 sdl:ffplay vaapi vdpau X:xlib zlib
253 )
254 use openssl && myconf+=( --enable-nonfree )
255 use samba && myconf+=( --enable-version3 )
256
257 # Encoders
258 if use encode
259 then
260 ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
261 for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
262 ffuse+=( ${i}:lib${i} )
263 done
264
265 # Licensing.
266 if use aac || use amrenc ; then
267 myconf+=( --enable-version3 )
268 fi
269 if use aacplus || use faac ; then
270 myconf+=( --enable-nonfree )
271 fi
272 else
273 myconf+=( --disable-encoders )
274 fi
275
276 # libavdevice options
277 ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
278
279 # Indevs
280 use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
281 for i in alsa oss jack ; do
282 use ${i} || myconf+=( --disable-indev=${i} )
283 done
284 ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
285
286 # Outdevs
287 for i in alsa oss sdl ; do
288 use ${i} || myconf+=( --disable-outdev=${i} )
289 done
290
291 # libavfilter options
292 ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
293
294 # libswresample options
295 ffuse+=( libsoxr )
296
297 # Threads; we only support pthread for now but ffmpeg supports more
298 ffuse+=( threads:pthreads )
299
300 # Decoders
301 ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
302 use amr && myconf+=( --enable-version3 )
303 for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
304 ffuse+=( ${i}:lib${i} )
305 done
306 use fdk && myconf+=( --enable-nonfree )
307
308 for i in "${ffuse[@]}" ; do
309 myconf+=( $(use_enable ${i%:*} ${i#*:}) )
310 done
311
312 # (temporarily) disable non-multilib deps
313 if ! multilib_is_native_abi; then
314 for i in frei0r ; do
315 myconf+=( --disable-${i} )
316 done
317 fi
318
319 # CPU features
320 for i in ${CPU_FEATURES}; do
321 use ${i%:*} || myconf+=( --disable-${i#*:} )
322 done
323 if use pic ; then
324 myconf+=( --enable-pic )
325 # disable asm code if PIC is required
326 # as the provided asm decidedly is not PIC for x86.
327 [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
328 fi
329 [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
330
331 # Try to get cpu type based on CFLAGS.
332 # Bug #172723
333 # We need to do this so that features of that CPU will be better used
334 # If they contain an unknown CPU it will not hurt since ffmpeg's configure
335 # will just ignore it.
336 for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
337 [[ ${i} = native ]] && i="host" # bug #273421
338 myconf+=( --cpu=${i} )
339 break
340 done
341
342 # Mandatory configuration
343 myconf=(
344 --enable-gpl
345 --enable-postproc
346 --enable-avfilter
347 --enable-avresample
348 --disable-stripping
349 "${myconf[@]}"
350 )
351
352 # cross compile support
353 if tc-is-cross-compiler ; then
354 myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
355 case ${CHOST} in
356 *freebsd*)
357 myconf+=( --target-os=freebsd )
358 ;;
359 mingw32*)
360 myconf+=( --target-os=mingw32 )
361 ;;
362 *linux*)
363 myconf+=( --target-os=linux )
364 ;;
365 esac
366 fi
367
368 set -- "${S}/configure" \
369 --prefix="${EPREFIX}/usr" \
370 --libdir="${EPREFIX}/usr/$(get_libdir)" \
371 --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
372 --mandir="${EPREFIX}/usr/share/man" \
373 --enable-shared \
374 --cc="$(tc-getCC)" \
375 --cxx="$(tc-getCXX)" \
376 --ar="$(tc-getAR)" \
377 --optflags="${CFLAGS}" \
378 --extra-cflags="${CFLAGS}" \
379 --extra-cxxflags="${CXXFLAGS}" \
380 $(use_enable static-libs static) \
381 "${myconf[@]}"
382 echo "${@}"
383 "${@}" || die
384 }
385
386 multilib_src_compile() {
387 emake V=1
388
389 if multilib_is_native_abi; then
390 for i in ${FFTOOLS} ; do
391 if use fftools_${i} ; then
392 emake V=1 tools/${i}
393 fi
394 done
395 fi
396 }
397
398 multilib_src_install() {
399 emake V=1 DESTDIR="${D}" install install-man
400
401 if multilib_is_native_abi; then
402 for i in ${FFTOOLS} ; do
403 if use fftools_${i} ; then
404 dobin tools/${i}
405 fi
406 done
407 fi
408 }
409
410 multilib_src_install_all() {
411 dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
412 [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
413 use doc && dohtml -r doc/*
414 if use examples ; then
415 dodoc -r doc/examples
416 docompress -x /usr/share/doc/${PF}/examples
417 fi
418 }
419
420 multilib_src_test() {
421 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" \
422 emake V=1 fate
423 }