From 3421d4c470127fd3638d4a8de02a4202cbf26edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 25 Dec 2014 09:42:31 +0100
Subject: [PATCH] libvdpau, vdpauinfo: update to 0.9, extend meta

Add myself as a maintainer.
The rebuild impact is large, mostly through mesa -> {qt, gtk}.
---
 pkgs/development/libraries/libvdpau/default.nix | 10 ++++++----
 pkgs/tools/X11/vdpauinfo/default.nix            | 12 +++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 9d9528b75e4c..dfb3575b89b2 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,22 +1,24 @@
 { stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-0.8";
+  name = "libvdpau-0.9";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk";
+    sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3";
   };
 
   buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
 
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
-    license = licenses.mit;
+    license = licenses.mit; # expat version
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vcunat ];
   };
 }
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
index 0b1d889d7001..2332cd1bc510 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }:
 
 stdenv.mkDerivation rec {
-  name = "vdpauinfo-0.1";
+  name = "vdpauinfo-0.9";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h";
+    sha256 = "1qy84clsz3l3hvhaxw01rl4bjqlsaml5l63rc43vck6vh8vgwh50";
   };
 
-  buildInputs = [ pkgconfig xlibs.libX11 libvdpau ];
+  buildInputs = [ pkgconfig libvdpau ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system";
-    license = "bsd";
+    license = licenses.mit; # expat version
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vcunat ];
   };
 }