From 341aadaba15a8b6c5c8153009d3c8f69c086c5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Jun 2013 00:30:44 +0200
Subject: [PATCH] kdenlive+mlt: enabling some subcomponents, parallel builds

---
 pkgs/applications/video/kdenlive/default.nix |  8 +++++---
 pkgs/development/libraries/mlt/default.nix   | 12 +++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
index d862c7012c49..d7fab74e6cac 100644
--- a/pkgs/applications/video/kdenlive/default.nix
+++ b/pkgs/applications/video/kdenlive/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon
 , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano
-, pkgconfig, shared_desktop_ontologies }:
+, pkgconfig, shared_desktop_ontologies, libv4l }:
 
 stdenv.mkDerivation rec {
   name = "kdenlive-${version}";
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x";
   };
 
-  buildInputs = 
+  buildInputs =
     [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz
-      qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies
+      qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies libv4l
     ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Free and open source video editor";
     license = "GPLv2+";
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 4e4790bd2a0b..4d17184a6082 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis
-, libxml2 , pkgconfig, qt4, sox }:
+, libxml2 , pkgconfig, qt4, sox, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
@@ -10,18 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc";
   };
 
-  buildInputs = 
+  buildInputs =
     [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4
-      sox
+      sox # gtk2 /*optional*/
     ];
 
   # Mostly taken from:
   # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
-  configureFlags = [ "--enable-gpl" "--avformat-swscale" ];
+  configureFlags = [ "--enable-gpl" "--enable-gpl3" "--avformat-swscale" ];
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.mltframework.org/;
     description = "Open source multimedia framework, designed for television broadcasting";
-    license = "GPLv2+";
+    license = "GPLv3";
   };
 }