Gentoo Archives: gentoo-commits

From: "Luca Barbato (lu_zero)" <lu_zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/libav: libav-9999.ebuild libav-11.1.ebuild ChangeLog
Date: Tue, 02 Dec 2014 13:36:29
Message-Id: 20141202133600.9BC49B5AD@oystercatcher.gentoo.org
1 lu_zero 14/12/02 13:36:00
2
3 Modified: libav-9999.ebuild ChangeLog
4 Added: libav-11.1.ebuild
5 Log:
6 New point release
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.75 media-video/libav/libav-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.75&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.75&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?r1=1.74&r2=1.75
16
17 Index: libav-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v
20 retrieving revision 1.74
21 retrieving revision 1.75
22 diff -u -r1.74 -r1.75
23 --- libav-9999.ebuild 17 Sep 2014 00:11:43 -0000 1.74
24 +++ libav-9999.ebuild 2 Dec 2014 13:36:00 -0000 1.75
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.74 2014/09/17 00:11:43 lu_zero Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.75 2014/12/02 13:36:00 lu_zero Exp $
30
31 EAPI=5
32
33 @@ -96,11 +96,8 @@
34 vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
35 vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
36 vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
37 - X? (
38 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
39 - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
40 - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
41 - )
42 + X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
43 + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
44 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
45 "
46
47 @@ -212,7 +209,7 @@
48 for i in alsa oss jack; do
49 use ${i} || myconf+=( --disable-indev=${i} )
50 done
51 - use X && myconf+=( --enable-x11grab )
52 + use X && myconf+=( --enable-libxcb )
53 # Outdevs
54 for i in alsa oss ; do
55 use ${i} || myconf+=( --disable-outdev=${i} )
56
57
58
59 1.226 media-video/libav/ChangeLog
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.226&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.226&content-type=text/plain
63 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?r1=1.225&r2=1.226
64
65 Index: ChangeLog
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v
68 retrieving revision 1.225
69 retrieving revision 1.226
70 diff -u -r1.225 -r1.226
71 --- ChangeLog 27 Oct 2014 12:34:05 -0000 1.225
72 +++ ChangeLog 2 Dec 2014 13:36:00 -0000 1.226
73 @@ -1,6 +1,12 @@
74 # ChangeLog for media-video/libav
75 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
76 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.225 2014/10/27 12:34:05 lu_zero Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.226 2014/12/02 13:36:00 lu_zero Exp $
78 +
79 +*libav-11.1 (02 Dec 2014)
80 +
81 + 02 Dec 2014; Luca Barbato <lu_zero@g.o> +libav-11.1.ebuild,
82 + libav-9999.ebuild:
83 + New point release
84
85 27 Oct 2014; Luca Barbato <lu_zero@g.o> libav-10.5.ebuild:
86 Fix bug #526180
87
88
89
90 1.1 media-video/libav/libav-11.1.ebuild
91
92 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.1.ebuild?rev=1.1&view=markup
93 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.1.ebuild?rev=1.1&content-type=text/plain
94
95 Index: libav-11.1.ebuild
96 ===================================================================
97 # Copyright 1999-2014 Gentoo Foundation
98 # Distributed under the terms of the GNU General Public License v2
99 # $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.1.ebuild,v 1.1 2014/12/02 13:36:00 lu_zero Exp $
100
101 EAPI=5
102
103 if [[ ${PV} == *9999 ]] ; then
104 SCM="git-2"
105 : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
106 if [[ ${PV%9999} != "" ]] ; then
107 : ${EGIT_BRANCH:="release/${PV%.9999}"}
108 fi
109 fi
110
111 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
112
113 DESCRIPTION="Complete solution to record, convert and stream audio and video"
114 HOMEPAGE="http://libav.org/"
115 if [[ ${PV} == *9999 ]] ; then
116 SRC_URI=""
117 elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
118 SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
119 else # Official release
120 SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
121 fi
122
123 LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
124 SLOT="0/10"
125 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
126 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
127 ~x64-solaris ~x86-solaris"
128 IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
129 +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k
130 mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
131 static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
132 wavpack webp x264 x265 xvid +zlib"
133
134 # String for CPU features in the useflag[:configure_option] form
135 # if :configure_option isn't set, it will use 'useflag' as configure option
136 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext neon ssse3 vis avx2"
137 for i in ${CPU_FEATURES} ; do
138 IUSE+=" ${i%:*}"
139 done
140
141 RDEPEND="
142 !media-video/ffmpeg:0
143 alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
144 amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
145 bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
146 cdio? (
147 || (
148 >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
149 <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
150 )
151 )
152 encode? (
153 aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
154 amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
155 faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
156 fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
157 mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
158 theora? (
159 >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
160 >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
161 )
162 vorbis? (
163 >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
164 >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
165 )
166 webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
167 wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
168 x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
169 x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
170 xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
171 )
172 frei0r? ( media-plugins/frei0r-plugins )
173 gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
174 ieee1394? (
175 >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
176 >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
177 )
178 jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
179 jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
180 opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
181 pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
182 rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
183 ssl? (
184 openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
185 !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
186 )
187 sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
188 schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
189 speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
190 truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
191 fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
192 vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
193 vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
194 vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
195 X? (
196 >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
197 >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
198 >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
199 )
200 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
201 "
202
203 DEPEND="${RDEPEND}
204 >=sys-devel/make-3.81
205 doc? ( app-text/texi2html )
206 ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
207 mmx? ( dev-lang/yasm )
208 rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
209 schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
210 ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
211 test? ( sys-devel/bc )
212 truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
213 fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
214 v4l? ( sys-kernel/linux-headers )
215 "
216
217 RDEPEND="${RDEPEND}
218 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
219 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
220
221 # faac can't be binary distributed
222 # openssl support marked as nonfree
223 # faac and aac are concurent implementations
224 # amr and aac require at least lgpl3
225 # x264 requires gpl2
226 REQUIRED_USE="bindist? ( !faac !openssl !fdk )
227 rtmp? ( network )
228 amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
229 test? ( encode zlib )
230 fontconfig? ( truetype )
231 "
232
233 # Test on live ebuild are not possible as they require trunk fate
234 RESTRICT="test"
235
236 MULTILIB_WRAPPED_HEADERS=(
237 /usr/include/libavutil/avconfig.h
238 )
239
240 src_prepare() {
241 epatch_user
242
243 # if we have snapshot then we need to hardcode the version
244 if [[ ${PV%_p*} != ${PV} ]]; then
245 sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
246 fi
247
248 TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
249 use zlib && TOOLS+=( cws2fws )
250
251 MAKEOPTS+=" V=1"
252 }
253
254 multilib_src_configure() {
255 local myconf=( ${EXTRA_LIBAV_CONF} )
256 local uses i
257
258 myconf+=(
259 $(use_enable gpl)
260 $(use_enable gpl version3)
261 --enable-avfilter
262 )
263
264 # enabled by default
265 uses="debug doc network zlib"
266 for i in ${uses}; do
267 use ${i} || myconf+=( --disable-${i} )
268 done
269 use bzip2 || myconf+=( --disable-bzlib )
270 use sdl || myconf+=( --disable-avplay )
271
272 if use ssl; then
273 use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
274 || myconf+=( --enable-gnutls )
275 fi
276
277 use custom-cflags && myconf+=( --disable-optimizations )
278 use cpudetection && myconf+=( --enable-runtime-cpudetect )
279
280 use vdpau || myconf+=( --disable-vdpau )
281
282 use vaapi && myconf+=( --enable-vaapi )
283
284 # Encoders
285 if use encode; then
286 use faac && myconf+=( --enable-nonfree )
287 use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
288 use mp3 && myconf+=( --enable-libmp3lame )
289 use amr && myconf+=( --enable-libvo-amrwbenc )
290 use aac && myconf+=( --enable-libvo-aacenc )
291 uses="faac theora vorbis wavpack webp x264 x265 xvid"
292 for i in ${uses}; do
293 use ${i} && myconf+=( --enable-lib${i} )
294 done
295 else
296 myconf+=( --disable-encoders )
297 fi
298
299 # libavdevice options
300 use cdio && myconf+=( --enable-libcdio )
301 use ieee1394 && myconf+=( --enable-libdc1394 )
302 use pulseaudio && myconf+=( --enable-libpulse )
303
304 # Indevs
305 # v4l1 is gone since linux-headers-2.6.38
306 myconf+=( --disable-indev=v4l )
307 use v4l || myconf+=( --disable-indev=v4l2 )
308 for i in alsa oss jack; do
309 use ${i} || myconf+=( --disable-indev=${i} )
310 done
311 use X && myconf+=( --enable-x11grab )
312 # Outdevs
313 for i in alsa oss ; do
314 use ${i} || myconf+=( --disable-outdev=${i} )
315 done
316 # libavfilter options
317 multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
318 use truetype && myconf+=( --enable-libfreetype )
319 use fontconfig && myconf+=( --enable-libfontconfig )
320
321 # Threads; we only support pthread for now
322 use threads && myconf+=( --enable-pthreads )
323
324 # Decoders
325 use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
326 uses="gsm opus rtmp schroedinger speex vpx"
327 for i in ${uses}; do
328 use ${i} && myconf+=( --enable-lib${i} )
329 done
330 use jpeg2k && myconf+=( --enable-libopenjpeg )
331
332 # CPU features
333 for i in ${CPU_FEATURES}; do
334 use ${i%:*} || myconf+=( --disable-${i#*:} )
335 done
336
337 # pass the right -mfpu as extra
338 use neon && myconf+=( --extra-cflags=-mfpu=neon )
339
340 # disable mmx accelerated code if PIC is required
341 # as the provided asm decidedly is not PIC for x86.
342 if use pic && [[ ${ABI} == x86 ]]; then
343 myconf+=( --disable-mmx --disable-mmxext )
344 fi
345
346 # Option to force building pic
347 use pic && myconf+=( --enable-pic )
348
349 # cross compile support
350 if tc-is-cross-compiler ; then
351 myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
352 case ${CHOST} in
353 *freebsd*)
354 myconf+=( --target-os=freebsd )
355 ;;
356 mingw32*)
357 myconf+=( --target-os=mingw32 )
358 ;;
359 *linux*)
360 myconf+=( --target-os=linux )
361 ;;
362 esac
363 fi
364
365 # Misc stuff
366 use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
367
368 # Specific workarounds for too-few-registers arch...
369 if [[ ${ABI} == x86 ]]; then
370 local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
371 filter-flags -fforce-addr -momit-leaf-frame-pointer
372 append-flags -fomit-frame-pointer
373 is-flag -O? || append-flags -O2
374 if use debug; then
375 # no need to warn about debug if not using debug flag
376 ewarn ""
377 ewarn "Debug information will be almost useless as the frame pointer is omitted."
378 ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
379 ewarn "difficult to fix. Please have that in mind."
380 ewarn ""
381 fi
382 fi
383
384 set -- "${S}"/configure \
385 --prefix="${EPREFIX}"/usr \
386 --libdir="${EPREFIX}"/usr/$(get_libdir) \
387 --shlibdir="${EPREFIX}"/usr/$(get_libdir) \
388 --mandir="${EPREFIX}"/usr/share/man \
389 --enable-shared \
390 --cc="$(tc-getCC)" \
391 --ar="$(tc-getAR)" \
392 --optflags="${CFLAGS}" \
393 --extra-cflags="${CFLAGS}" \
394 $(use_enable static-libs static) \
395 "${myconf[@]}"
396 echo "${@}"
397 "${@}" || die
398 }
399
400 multilib_src_compile() {
401 emake
402
403 if use tools; then
404 tc-export CC
405
406 emake ${TOOLS[@]/#/tools/}
407 fi
408 }
409
410 multilib_src_install() {
411 emake DESTDIR="${D}" install install-man
412 use doc && dodoc doc/*.html
413
414 if use tools; then
415 dobin ${TOOLS[@]/#/tools/}
416 fi
417 }
418
419 multilib_src_install_all() {
420 dodoc Changelog README INSTALL
421 }
422
423 multilib_src_test() {
424 LD_LIBRARY_PATH="${BUILD_DIR}/libavcore:${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
425 emake -j1 fate
426 }