From dbc343c49a25514657c799c3c97c8dc231b468d5 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sat, 23 Feb 2013 19:35:19 -0800
Subject: [PATCH 1/3] makemkv-1.8.0

---
 pkgs/applications/video/makemkv/builder.sh  | 38 +++++++++++++++++++++
 pkgs/applications/video/makemkv/default.nix | 30 ++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/video/makemkv/builder.sh
 create mode 100644 pkgs/applications/video/makemkv/default.nix

diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh
new file mode 100644
index 00000000000..0e1898a4556
--- /dev/null
+++ b/pkgs/applications/video/makemkv/builder.sh
@@ -0,0 +1,38 @@
+source $stdenv/setup
+set -x
+
+lib=" \
+  makemkv-oss-${ver}/out/libdriveio.so.0 \
+  makemkv-oss-${ver}/out/libmakemkv.so.1 \
+  "
+
+bin=" \
+  makemkv-oss-${ver}/out/makemkv \
+  makemkv-bin-${ver}/bin/amd64/makemkvcon \
+  "
+
+tar xzf ${src_bin}
+tar xzf ${src_oss}
+
+(
+  cd makemkv-oss-${ver}
+  make -f makefile.linux
+)
+
+chmod +x ${bin}
+
+libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file?
+
+for i in ${bin} ; do
+  patchelf \
+    --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    --set-rpath $libPath \
+    ${i}
+done 
+
+ensureDir $out/bin
+ensureDir $out/lib
+ensureDir $out/share/MakeMKV
+cp ${lib} ${out}/lib
+cp ${bin} ${out}/bin
+cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
new file mode 100644
index 00000000000..23f08eef623
--- /dev/null
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl
+, openssl, qt4, mesa, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "makemkv-${ver}";
+  ver = "1.8.0";
+  builder = ./builder.sh;
+
+  src_bin = fetchurl {
+    url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
+    sha256 = "1f465rdv5ibnh5hnfmvmlid0yyzkansjw8l1mi5qd3bc6ca4k30c";
+  };
+
+  src_oss = fetchurl { 
+    url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
+    sha256 = "0kj1mpkzz2cvi0ibdgdzfwbh9k2jfj3ra5m3hd7iyc5ng21v4sk3";
+  };
+
+  buildInputs = [openssl qt4 mesa zlib];
+
+  libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] 
+          + ":" + stdenv.gcc.gcc + "/lib64";
+
+  meta = {
+    description = "software to convert blu-ray and dvd to mkv";
+    license = "unfree";
+    homepage = http://makemkv.com;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8707db52520..f1670eab598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1088,6 +1088,8 @@ let
 
   mairix = callPackage ../tools/text/mairix { };
 
+  makemkv = callPackage ../applications/video/makemkv { };
+
   man = callPackage ../tools/misc/man { };
 
   man_db = callPackage ../tools/misc/man-db { };

From ae35f74dbe2144fbaa911499b3cecceddc421e56 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 24 Feb 2013 02:17:24 -0800
Subject: [PATCH 2/3] Add makemkv descriptions

---
 pkgs/applications/video/makemkv/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 23f08eef623..4a1765c7e03 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -23,7 +23,16 @@ stdenv.mkDerivation rec {
           + ":" + stdenv.gcc.gcc + "/lib64";
 
   meta = {
-    description = "software to convert blu-ray and dvd to mkv";
+    description = "convert blu-ray and dvd to mkv";
+    longDescription = ''
+      makemkv is a one-click QT application that transcodes an encrypted
+      blu-ray or DVD disc into a more portable set of mkv files, preserving
+      subtitles, chapter marks, all video and audio tracks.
+
+      Program is time-limited -- it will stop functioning after 60 days. You
+      can always download the latest version from makemkv.com that will reset the
+      expiration date.
+    ''
     license = "unfree";
     homepage = http://makemkv.com;
   };

From 58a9875789aa7db43ca82e511667e637dddd7a41 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 1 Mar 2013 01:26:19 -0800
Subject: [PATCH 3/3] missing semicolon, found after push..

---
 pkgs/applications/video/makemkv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 4a1765c7e03..43482bd9762 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       Program is time-limited -- it will stop functioning after 60 days. You
       can always download the latest version from makemkv.com that will reset the
       expiration date.
-    ''
+    '';
     license = "unfree";
     homepage = http://makemkv.com;
   };