Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 595636 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/media-video/ffmpeg/ffmpeg-9999.ebuild (-3 / +18 lines)
Lines 97-103 Link Here
97
)
97
)
98
98
99
IUSE="
99
IUSE="
100
	alsa doc +encode jack oss pic static-libs test v4l
100
	alsa cuda doc +encode jack libnpp oss pic static-libs test v4l
101
	${FFMPEG_FLAG_MAP[@]%:*}
101
	${FFMPEG_FLAG_MAP[@]%:*}
102
	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
102
	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
103
"
103
"
Lines 162-174 Link Here
162
	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
162
	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
163
	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
163
	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
164
	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
164
	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
165
	cuda? ( >=x11-drivers/nvidia-drivers-367.35 >=dev-util/nvidia-cuda-toolkit-7.5 )
165
	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
166
	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
166
	encode? (
167
	encode? (
167
		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
168
		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
168
		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
169
		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
169
		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
170
		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
170
		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
171
		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
171
		nvenc? ( media-video/nvidia_video_sdk )
172
		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
172
		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
173
		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
173
		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
174
		theora? (
174
		theora? (
Lines 274-279 Link Here
274
	)
274
	)
275
"
275
"
276
REQUIRED_USE="
276
REQUIRED_USE="
277
	cuda? ( abi_x86_64 )
278
	libnpp? ( cuda )
277
	libv4l? ( v4l )
279
	libv4l? ( v4l )
278
	fftools_cws2fws? ( zlib )
280
	fftools_cws2fws? ( zlib )
279
	test? ( encode )
281
	test? ( encode )
Lines 282-287 Link Here
282
RESTRICT="
284
RESTRICT="
283
	encode? ( faac? ( bindist ) )
285
	encode? ( faac? ( bindist ) )
284
	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
286
	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
287
	cuda? ( bindist )
285
"
288
"
286
289
287
S=${WORKDIR}/${P/_/-}
290
S=${WORKDIR}/${P/_/-}
Lines 299-304 Link Here
299
302
300
multilib_src_configure() {
303
multilib_src_configure() {
301
	local myconf=( ${EXTRA_FFMPEG_CONF} )
304
	local myconf=( ${EXTRA_FFMPEG_CONF} )
305
	local extra_cflags=()
306
	local extra_ldflags=()
302
307
303
	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
308
	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
304
	use openssl && use gpl && myconf+=( --enable-nonfree )
309
	use openssl && use gpl && myconf+=( --enable-nonfree )
Lines 327-335 Link Here
327
	use xcb || ffuse+=( X:x11grab )
332
	use xcb || ffuse+=( X:x11grab )
328
333
329
	# Outdevs
334
	# Outdevs
330
	for i in alsa oss sdl ; do
335
	for i in alsa oss ; do
331
		use ${i} || myconf+=( --disable-outdev=${i} )
336
		use ${i} || myconf+=( --disable-outdev=${i} )
332
	done
337
	done
338
	use sdl || myconf+=( --disable-outdev=sdl2 )
333
339
334
	# Decoders
340
	# Decoders
335
	use amr && myconf+=( --enable-version3 )
341
	use amr && myconf+=( --enable-version3 )
Lines 340-345 Link Here
340
		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
346
		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
341
	done
347
	done
342
348
349
	if [[ ${ABI} == amd64 ]] && use cuda; then
350
		myconf+=( --enable-nonfree --enable-cuda )
351
		use libnpp && myconf+=( --enable-libnpp )
352
		extra_cflags+=( "-I/opt/cuda/include" )
353
		extra_ldflags+=( "-L/opt/cuda/lib64" )
354
	fi
355
343
	# (temporarily) disable non-multilib deps
356
	# (temporarily) disable non-multilib deps
344
	if ! multilib_is_native_abi; then
357
	if ! multilib_is_native_abi; then
345
		for i in frei0r ; do
358
		for i in frei0r ; do
Lines 421-426 Link Here
421
		--cxx="$(tc-getCXX)" \
434
		--cxx="$(tc-getCXX)" \
422
		--ar="$(tc-getAR)" \
435
		--ar="$(tc-getAR)" \
423
		--optflags="${CFLAGS}" \
436
		--optflags="${CFLAGS}" \
437
		--extra-cflags="${extra_cflags[*]}" \
438
		--extra-ldflags="${extra_ldflags[*]}" \
424
		$(use_enable static-libs static) \
439
		$(use_enable static-libs static) \
425
		"${myconf[@]}"
440
		"${myconf[@]}"
426
	echo "${@}"
441
	echo "${@}"

Return to bug 595636