From e444532046be5180cd57e0b991921d8da17d9934 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty <tom@logand.com> Date: Wed, 17 Aug 2016 16:09:58 +0200 Subject: [PATCH] mlt: 0.9.6 -> 6.2.0 (#17725) The old version with qt4 is kept around for kdenlive dependency. --- pkgs/development/libraries/mlt/default.nix | 21 +++++++----- pkgs/development/libraries/mlt/qt-4.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/mlt/qt-4.nix diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2bb709612b44..2e51492f142e 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox +{ stdenv, fetchFromGitHub, makeWrapper +, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +, libvorbis, libxml2, movit, pkgconfig, sox +, gtk2 }: stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.6"; + version = "6.2.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "17jwz1lf9ilaxvgvhg7z86dhcsk95m4wlszy4gn7wab2ns5zhdm7"; }; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qt sox + makeWrapper movit pkgconfig sox + gtk2 ]; # Mostly taken from: @@ -33,7 +38,7 @@ stdenv.mkDerivation rec { description = "Open source multimedia framework, designed for television broadcasting"; homepage = http://www.mltframework.org/; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.tohl ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mlt/qt-4.nix b/pkgs/development/libraries/mlt/qt-4.nix new file mode 100644 index 000000000000..2bb709612b44 --- /dev/null +++ b/pkgs/development/libraries/mlt/qt-4.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox +}: + +stdenv.mkDerivation rec { + name = "mlt-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; + sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + }; + + buildInputs = [ + SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 + makeWrapper movit pkgconfig qt sox + ]; + + # Mostly taken from: + # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine + configureFlags = [ + "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--enable-opengl" + ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; + + meta = with stdenv.lib; { + description = "Open source multimedia framework, designed for television broadcasting"; + homepage = http://www.mltframework.org/; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebf327d923d1..b7a46d3984c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8765,7 +8765,9 @@ in withGUI = false; }; - mlt-qt4 = callPackage ../development/libraries/mlt { + mlt = callPackage ../development/libraries/mlt {}; + + mlt-qt4 = callPackage ../development/libraries/mlt/qt-4.nix { ffmpeg = ffmpeg_2; qt = qt4; };