diff options
Diffstat (limited to 'pkgs/applications/video')
19 files changed, 90 insertions, 38 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 39a85a03199..ebc1249dc11 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; }; + # Fixup build with icu-59 + postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; + buildInputs = with stdenv.lib; [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa libass fftw ffms ffmpeg zlib icu boost boost.out libiconv diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index ca9620a0eb0..b00aae61d36 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 xorg.xwininfo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 60c31cf07f9..10a8f4019fc 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { homepage = https://damien.douxchamps.net/ieee1394/coriander/; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index e2980c7108f..ba72e085bf7 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; - buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 dbus dbus_glib GConf]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 59b9893ded1..f0d7fa35370 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchurl -, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig -, kdelibs4, cairo, dbus_glib, mplayer +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, makeWrapper, + qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons, + phonon, cairo, mplayer }: -stdenv.mkDerivation { - name = "kmplayer-0.11.3d"; +mkDerivation rec { + majorMinorVersion = "0.12"; + patchVersion = "0b"; + version = "${majorMinorVersion}.${patchVersion}"; + name = "kmplayer-${version}"; src = fetchurl { - #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; - url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; - sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; + url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; + sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"; }; - buildInputs = [ kdelibs4 cairo dbus_glib ]; + patches = [ + ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA" + ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools) + ]; - nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; + nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; + + buildInputs = [ + qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons + phonon cairo + ]; postInstall = '' wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin ''; - meta = { + meta = with lib; { description = "MPlayer front-end for KDE"; - license = "GPL"; - homepage = http://kmplayer.kde.org; - broken = true; # Also unavailable on this mirror - maintainers = [ stdenv.lib.maintainers.sander ]; + license = with licenses; [ gpl2 lgpl2 fdl12 ]; + homepage = https://kmplayer.kde.org/; + maintainers = with maintainers; [ sander zraexy ]; }; } diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch new file mode 100644 index 00000000000..9b6652b0be5 --- /dev/null +++ b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch @@ -0,0 +1,11 @@ +--- a/src/kmplayer_part.h ++++ b/src/kmplayer_part.h +@@ -36,7 +36,7 @@ + + class KMPlayerFactory : public KPluginFactory { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") ++ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_INTERFACES(KPluginFactory) + public: + KMPlayerFactory(); diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/pkgs/applications/video/kmplayer/no-docs.patch new file mode 100644 index 00000000000..c93453f908c --- /dev/null +++ b/pkgs/applications/video/kmplayer/no-docs.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,9 +79,6 @@ + + add_subdirectory(src) + add_subdirectory(icons) +-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION) +- add_subdirectory(doc) +-endif(KF5DocTools_VERSION) + add_subdirectory(data) + + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index fef2c135774..717853af745 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6"; }; - buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 1559535f342..d4cf4b6c420 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235"; }; - buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [openssl qt4 mesa zlib libav]; libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ] + ":" + stdenv.cc.cc + "/lib64"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 442e9d8eeb3..2d7f7144f5f 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "15.0.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0"; + sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 550cd2930cd..518cd3d94ba 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -20,14 +20,14 @@ let nativeBuildInputs = [ cmake ]; buildInputs = [ libpng flex bison ]; }; - buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }: + buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }: stdenv.mkDerivation { name = "openfx-${pluginName}-${version}"; src = fetchurl { url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz"; inherit sha256; }; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; preConfigure = '' makeFlagsArray+=("CONFIG=release") makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron") @@ -50,8 +50,9 @@ let ({ pluginName = "arena"; sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip + pango librsvg librevenge libcdr opencolorio libxml2 libzip poppler imagemagick ]; preConfigure = '' @@ -65,8 +66,9 @@ let ({ pluginName = "io"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu + libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu seexpr ]; }) @@ -91,12 +93,12 @@ stdenv.mkDerivation { sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp"; }; + nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ]; + buildInputs = [ - pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken + qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken ]; - nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ]; - preConfigure = '' export MAKEFLAGS=-j$NIX_BUILD_CORES cp ${./config.pri} config.pri diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 1244421210e..d9eef7f4cd8 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "p2pvc"; - buildInputs = [ pkgconfig opencv ncurses portaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ opencv ncurses portaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c2c64bfa496..c4d80344080 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -18,7 +18,8 @@ let url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz"; sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6"; }; - buildInputs = [ which meson ninja pkgconfig gobjectIntrospection ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which meson ninja gobjectIntrospection ] ++ (with gst; [ gstreamer gst-plugins-base ]); }; diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 26e0d947954..8b2a69acfcc 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index cdc53367d11..6f4e6091339 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 29bb439dcf6..3f99258737c 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" ''; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 571f46de385..447518d008b 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa libpulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix index bba4cdb6e36..583d978a551 100644 --- a/pkgs/applications/video/vlc/plugin.nix +++ b/pkgs/applications/video/vlc/plugin.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { preConfigure = "sh autogen.sh"; - buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb xlibsWrapper gtk ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index c8414bbb83a..663f89b325a 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation { }; patches = [ ./xlib.patch ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - perl perlXMLParser pkgconfig gtk2 scrollkeeper + perl perlXMLParser gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 ]; |