From 18af8dabab9935985600c3d4a36942d93b06f67c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 11 Jan 2018 21:29:31 +0300 Subject: avidemux: support alsa --- pkgs/applications/video/avidemux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 7f70818bb141..76b42acef3e1 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, alsaLib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -29,7 +30,7 @@ let enableParallelBuilding = false; nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ] + buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ] ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 ++ lib.optional withXvid xvidcore -- cgit 1.4.1 From 747431cf4229e7f02f691534d7203acb8d1b07e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 22:31:43 +0800 Subject: smtube: 17.5.0 -> 18.1.0 --- pkgs/applications/video/smtube/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index b05887967093..406d49c99391 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "17.5.0"; + version = "18.1.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld"; + sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1"; }; makeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04be1c44978c..a4359884eee0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16226,7 +16226,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt56.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube {}; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; -- cgit 1.4.1 From dbf5d1d433f8f24937ea8377455cad9a3ab21861 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Fri, 12 Jan 2018 22:14:12 -0200 Subject: subtitleeditor: 0.53.0 -> 0.54.0 --- pkgs/applications/video/subtitleeditor/default.nix | 36 ++++++++-------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 88768b3cb8f6..536b4ba0fac4 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils, - enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx, - xdg_utils, isocodes, wrapGAppsHook +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, + desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, + libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: let - ver_maj = "0.53"; - ver_min = "0"; + version = "0.54.0"; in stdenv.mkDerivation rec { - name = "subtitle-editor-${ver_maj}.${ver_min}"; + name = "subtitleeditor-${version}"; - src = fetchurl { - url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz"; - sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g"; + src = fetchFromGitHub { + owner = "kitone"; + repo = "subtitleeditor"; + rev = version; + sha256 = "0vxcscc9m6gymgj173ahk2g9hlk9588z5fdaavmkpyriqdlhwm11"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch"; - sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c"; - }) - ]; - nativeBuildInputs = [ + autoreconfHook pkgconfig intltool file @@ -48,11 +43,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable check because currently making check in po fails - doCheck = false; - - hardeningDisable = [ "format" ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; configureFlags = [ "--disable-debug" ]; @@ -65,9 +55,9 @@ stdenv.mkDerivation rec { and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. ''; - homepage = http://home.gna.org/subtitleeditor; + homepage = http://kitone.github.io/subtitleeditor/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.plcplc ]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.plcplc ]; }; } -- cgit 1.4.1 From e5aae0f2d6d7f46e4ed3689790aa7a7541deae82 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 02:02:44 +0100 Subject: mpv: fix PYTHONPATH --- pkgs/applications/video/mpv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7aaa1b65fc45..dcbafd8594d3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' - --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" + --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" '' + '' cp TOOLS/umpv $out/bin -- cgit 1.4.1