diff options
Diffstat (limited to 'media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild index 6636870..90ab40a 100644 --- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild @@ -95,7 +95,7 @@ RDEPEND=" opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,${MULTILIB_USEDEP}] ) + sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) @@ -111,7 +111,7 @@ RDEPEND=" !media-video/qt-faststart !media-libs/libpostproc abi_x86_32? ( - !<=app-emulation/emul-linux-x86-medialibs-20131008-r1 + !<=app-emulation/emul-linux-x86-medialibs-20140508-r1 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) " @@ -148,6 +148,7 @@ src_prepare() { export revision=git-N-${FFMPEG_REVISION} fi + epatch "${FILESDIR}/dirac_arith_hardened.patch" epatch_user } @@ -159,7 +160,6 @@ multilib_src_configure() { # or $(use_enable foo foo) if no :bar is set. local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib" - use openssl && myconf="${myconf} --enable-nonfree" # Encoders |