From 25ba56a263e645752007bdc9170f93539a22d7a3 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 8 Nov 2015 15:03:00 +0000
Subject: [PATCH 1/2] {lib}mediainfo-gui: 0.7.78 -> 0.7.79

Following a commit by @k0ral, this completes the upgrade of the other
`mediainfo` components.

From the changelog:
```
Version 0.7.79, 2015-11-02
+ CLI/DLL only, XML: new option --Output=MIXML, with XML v2.0beta1
  status, not for production, see
  https://github.com/MediaArea/MediaAreaXml for more details
+ MediaTrace: support of more than 1 file in XML output.
+ CLI/DLL only, XML: new option --Output=MAXML, with XML v0.1 status, in
  order to have bot MediaInfo and MediaTrace in the same output, not for
  production, see https://github.com/MediaArea/MediaAreaXml for more
  details
x MediaTrace: fixed some invalid outputs
x #B951, Amazon S3 support (REST API v2), CLI/DLL only and if compiled
  with libcurl support: URL without credential were badly interpreted
```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index dee0f92822a..a7dfac1eb0d 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.78";
+  version = "0.7.79";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0458rxla3nhw9rbb2psak8qvxwr0drfhdl82k6wvb3a38xb0qij3";
+    sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 7e5887e9b9d..d9619fd2712 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.78";
+  version = "0.7.79";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0ai4al5h3qbfq5f1b24ixk5v1fpln2kw1zmdj4hxjz40rj18qzka";
+    sha256 = "0lanhx1zg7s36wgi9ndv4zz7dbhkqz4dc99mva6x9rcj2p5p8c6d";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

From e20ce69acaccd9b8128ce2ca8803da9770803943 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 8 Nov 2015 15:05:26 +0000
Subject: [PATCH 2/2] libzen: 0.4.31 -> 0.4.32

This is the update to `libzen` which is a dependency of `mediainfo{-gui}`.
---
 pkgs/development/libraries/libzen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 11b77ae0815..127eeaeaca9 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }:
 
-let version = "0.4.31"; in
+let version = "0.4.32"; in
 
 stdenv.mkDerivation {
   name = "libzen-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z";
+    sha256 = "0rhbiaywij6jj8d7vkc4v7y21ic1kv9fbn9lk82mm12yjwzlhhyd";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   sourceRoot = "./ZenLib/Project/GNU/Library/";
 
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   meta = {
     description = "Shared library for libmediainfo and mediainfo";