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

ffmpeg: enable support for libvdpau acceleration

Browse Source 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
This commit is contained in:
Peter Simons 2012-07-02 16:17:16 +02:00
parent 82b2588e35
commit 225ee0a26c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg/0.6.90.nix
View File

@ -6,6 +6,7 @@
, vpxSupport ? false, libvpx ? null , vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null , x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null , xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null
}: }:
@ -15,6 +16,7 @@ assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null; assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null; assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null; assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -44,6 +46,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport "--enable-libvpx" ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264" ++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm ] buildInputs = [ pkgconfig lame yasm ]
@ -54,6 +57,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport libvpx ++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac; ++ stdenv.lib.optional faacSupport faac;
crossAttrs = { crossAttrs = {

4
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -6,6 +6,7 @@
, vpxSupport ? false, libvpx ? null , vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null , x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null , xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null
}: }:
@ -15,6 +16,7 @@ assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null; assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null; assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null; assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -44,6 +46,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport "--enable-libvpx" ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264" ++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm zlib bzip2 ] buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
@ -54,6 +57,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport libvpx ++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac; ++ stdenv.lib.optional faacSupport faac;
enableParallelBuilding = true; enableParallelBuilding = true;