diff options
-rw-r--r-- | pkgs/development/libraries/ffmpeg/1.1.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/vaapi-vdpau/default.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 34 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 6651f1783f8..a40b40d68be 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -7,6 +7,7 @@ , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null @@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 9b2eb19bab4..cf030eda777 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }: +{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa +, libdrm, libXfixes, intelgen4asm, which }: stdenv.mkDerivation rec { - name = "libva-1.0.12"; + name = "libva-1.1.0"; src = fetchurl { url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8"; + sha256 = "0lqkharln67p60jlyz9y662gjgqk2iy2nrj84j1jr1nzgw7j01a5"; }; buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm ]; + libXfixes intelgen4asm which ]; - configureFlags = [ "--enable-i965-driver" "--enable-glx" ]; + configureFlags = [ "--enable-glx" ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix new file mode 100644 index 00000000000..58ebc103275 --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, libvdpau, mesa, libva, pkgconfig }: + +stdenv.mkDerivation rec { + name = "vdpau-driver-0.7.4"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/vdpau-driver/snapshot/${name}.tar.bz2"; + sha256 = "1kvhpqwzw01bfamvxhnl4yhmb7pwkkfaii3w7bidd4vj1gsrx5l4"; + }; + + buildInputs = [ autoconf automake libtool libvdpau mesa libva pkgconfig ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + license = "GPLv2+"; + description = "VDPAU driver for the VAAPI library"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9cf2896dfd..9cd5943b937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5057,6 +5057,8 @@ let ucommon = callPackage ../development/libraries/ucommon { }; + vdpauDriver = callPackage ../development/libraries/vaapi-vdpau { }; + vamp = callPackage ../development/libraries/audio/vamp { }; vcdimager = callPackage ../development/libraries/vcdimager { }; |