public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36211 from Mic92/mlt

Browse Source 
mlt: 6.4.1 -> 6.6.0
This commit is contained in:
Jörg Thalheim 2018-03-02 23:25:27 +00:00 committed by GitHub
commit 063669901a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/mlt/default.nix
View File

@ -6,28 +6,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mlt-${version}"; name = "mlt-${version}";
version = "6.4.1"; version = "6.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "mlt"; repo = "mlt";
rev = "v${version}"; rev = "v${version}";
sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
}; };
patches = [
# fix for glibc-2.26
(fetchurl {
url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch";
sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a";
})
# fix for glibc-2.26
(fetchurl {
url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch";
sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv";
})
];
buildInputs = [ buildInputs = [
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
makeWrapper movit pkgconfig sox makeWrapper movit pkgconfig sox

24
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate { stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
, fftw, vid-stab, opencv3, ladspa-sdk , fftw, vid-stab, opencv3, ladspa-sdk
}: }:
@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mlt-${version}"; name = "mlt-${version}";
version = "6.4.1"; version = "6.6.0";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; owner = "mltframework";
sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; repo = "mlt";
rev = "v${version}";
sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
}; };
patches = [
# fix for glibc-2.26
(fetchurl {
url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch";
sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a";
})
# fix for glibc-2.26
(fetchurl {
url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch";
sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv";
})
];
buildInputs = [ buildInputs = [
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2