public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: adding gnutls support

Browse Source 
I also take out the useless 'openssl' I added by error to mpv.
This commit is contained in:
Lluís Batlle i Rossell 2014-01-15 17:04:14 +01:00
parent 4fe0bf9ecb
commit cb35bf15a4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/mpv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
, lua5, perl, libpthreadstubs, openssl , lua5, perl, libpthreadstubs
, python3, docutils, which , python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null , xineramaSupport ? true, libXinerama ? null
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs openssl ] [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional xvSupport libXv ++ optional xvSupport libXv

9
pkgs/development/libraries/ffmpeg/2.x.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl { stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus , lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL , libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
, freetype, fontconfig, fdk_aac , freetype, fontconfig, fdk_aac, gnutls
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
x11grabSupport = config.ffmpeg.x11grab or false; x11grabSupport = config.ffmpeg.x11grab or false;
playSupport = config.ffmpeg.play or true; playSupport = config.ffmpeg.play or true;
freetypeSupport = config.ffmpeg.freetype or true; freetypeSupport = config.ffmpeg.freetype or true;
gnutlsSupport = config.ffmpeg.gnutls or true;
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed # the resulting library is GPL'ed, so it can only be used in GPL'ed
@ -54,7 +55,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional x11grabSupport "--enable-x11grab" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay" ++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"; ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional mp3Support lame
@ -72,7 +74,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL ++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
++ stdenv.lib.optional fdkAACSupport fdk_aac; ++ stdenv.lib.optional fdkAACSupport fdk_aac
++ stdenv.lib.optional gnutlsSupport gnutls;
enableParallelBuilding = true; enableParallelBuilding = true;