Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 448496 Details for
Bug 595636
media-video/ffmpeg-9999 ebuild updates
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ffmpeg-9999.ebuild.patch
ffmpeg-9999.ebuild.patch (text/plain), 2.61 KB, created by
Timo Rothenpieler
on 2016-09-30 12:18:18 UTC
(
hide
)
Description:
ffmpeg-9999.ebuild.patch
Filename:
MIME Type:
Creator:
Timo Rothenpieler
Created:
2016-09-30 12:18:18 UTC
Size:
2.61 KB
patch
obsolete
>--- /usr/portage/media-video/ffmpeg/ffmpeg-9999.ebuild 2016-09-30 12:20:42.034388420 +0200 >+++ ffmpeg-9999.ebuild 2016-09-30 12:09:48.984920242 +0200 >@@ -97,7 +97,7 @@ > ) > > IUSE=" >- alsa doc +encode jack oss pic static-libs test v4l >+ alsa cuda doc +encode jack libnpp oss pic static-libs test v4l > ${FFMPEG_FLAG_MAP[@]%:*} > ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} > " >@@ -162,13 +162,13 @@ > cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) > celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) > chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) >+ cuda? ( >=x11-drivers/nvidia-drivers-367.35 >=dev-util/nvidia-cuda-toolkit-7.5 ) > ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] ) > encode? ( > amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) > faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) > kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) > mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) >- nvenc? ( media-video/nvidia_video_sdk ) > openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) > snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] ) > theora? ( >@@ -274,6 +274,8 @@ > ) > " > REQUIRED_USE=" >+ cuda? ( abi_x86_64 ) >+ libnpp? ( cuda ) > libv4l? ( v4l ) > fftools_cws2fws? ( zlib ) > test? ( encode ) >@@ -282,6 +284,7 @@ > RESTRICT=" > encode? ( faac? ( bindist ) ) > gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) >+ cuda? ( bindist ) > " > > S=${WORKDIR}/${P/_/-} >@@ -299,6 +302,8 @@ > > multilib_src_configure() { > local myconf=( ${EXTRA_FFMPEG_CONF} ) >+ local extra_cflags=() >+ local extra_ldflags=() > > local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) > use openssl && use gpl && myconf+=( --enable-nonfree ) >@@ -327,9 +332,10 @@ > use xcb || ffuse+=( X:x11grab ) > > # Outdevs >- for i in alsa oss sdl ; do >+ for i in alsa oss ; do > use ${i} || myconf+=( --disable-outdev=${i} ) > done >+ use sdl || myconf+=( --disable-outdev=sdl2 ) > > # Decoders > use amr && myconf+=( --enable-version3 ) >@@ -340,6 +346,13 @@ > myconf+=( $(use_enable ${i%:*} ${i#*:}) ) > done > >+ if [[ ${ABI} == amd64 ]] && use cuda; then >+ myconf+=( --enable-nonfree --enable-cuda ) >+ use libnpp && myconf+=( --enable-libnpp ) >+ extra_cflags+=( "-I/opt/cuda/include" ) >+ extra_ldflags+=( "-L/opt/cuda/lib64" ) >+ fi >+ > # (temporarily) disable non-multilib deps > if ! multilib_is_native_abi; then > for i in frei0r ; do >@@ -421,6 +434,8 @@ > --cxx="$(tc-getCXX)" \ > --ar="$(tc-getAR)" \ > --optflags="${CFLAGS}" \ >+ --extra-cflags="${extra_cflags[*]}" \ >+ --extra-ldflags="${extra_ldflags[*]}" \ > $(use_enable static-libs static) \ > "${myconf[@]}" > echo "${@}"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 595636
:
448496
|
448498
|
448744
|
448746