diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-12 12:15:44 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-12 12:19:34 +0100 |
commit | bde8efe792b5be621a1fdc169a3b717b5a5b5cc2 (patch) | |
tree | 93b8d1a2b18224578db4cab7ada60d28692f3e89 /pkgs/applications/video | |
parent | 3d730814998c6f7ac8bfb753b9514a0df4a9d183 (diff) | |
parent | 6359e9baf01a7bdc37f18a6eda7b6953e95318f0 (diff) |
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 85 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/qmediathekview/default.nix | 7 |
3 files changed, 48 insertions, 50 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index abd4973bbdf29..07474c5e52c59 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -1,72 +1,64 @@ # Upstream distributes HandBrake with bundle of according versions of libraries and patches to them. # -# Derivation patches HandBrake to use our closure. +# Derivation patches HandBrake to use Nix closure dependencies. # -{ stdenv, lib, fetchurl, - python2, pkgconfig, yasm, zlib, - autoconf, automake, libtool, m4, jansson, - libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, - libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, - lame, libdvdread, libdvdnav, libbluray, - mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor-icon-theme, - glib, gtk3, intltool, libnotify, - gst_all_1, dbus-glib, udev, libgudev, libvpx, - useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, - useFfmpeg ? false, libav_12 ? null, ffmpeg ? null, +{ stdenv, lib, fetchurl, callPackage, + # Main build tools + python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, + # Processing, video codecs, containers + ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, + # Codecs, audio + libopus, lame, libvorbis, a52dec, speex, libsamplerate, + # Text processing + libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, + # Optical media + libdvdread, libdvdnav, libdvdcss, libbluray, + useGtk ? true, wrapGAppsHook ? null, + intltool ? null, + glib ? null, + gtk3 ? null, + libappindicator-gtk3 ? null, + libnotify ? null, + gst_all_1 ? null, + dbus-glib ? null, + udev ? null, + libgudev ? null, + hicolor-icon-theme ? null, useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { - # TODO: Release 1.2.0 would switch LibAV to FFmpeg. - version = "1.1.2"; + version = "1.2.0"; name = "handbrake-${version}"; src = fetchurl { url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "0bny0hwlr55g2c69rsamv0xvwmfh1s4a582b9vq20xv5ly84m6ms"; + sha256 = "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi"; }; - patched_libav_12 = libav_12.overrideAttrs (super: { - patches = (super.patches or []) ++ [( - # NOTE: 2018-04-26: HandBrake compilation (1.1.0) requires - # a patch of LibAV (12.3) from HandBrake team. This patch - # not went LibAV upstream. - fetchurl { - url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch''; - sha256 = "14grzyvb1qbb90k31ibabnwmwnrc48ml6h2z0rjamdv83q45jq4g"; - }) - # NOTE: 2018-11-11: Transcoding to MP4 can fail with: - # - # Tag avc1/0x31637661 incompatible with output codec id '28' - # muxavformat: avformat_write_header failed! - # - # Fix using Handbrake patch that is not upstream in libav. - ( - fetchurl { - url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/df6c26fa261423237ee2bec0bf784c32cbfda3fa/contrib/ffmpeg/A20-avc3-hvc1-override.patch''; - sha256 = "1vijd7bmkzp3sb6zhpcpdni8fz4h13wgglnml6cz9f44j41w2c3v"; - }) - ]; - }); - nativeBuildInputs = [ - python2 pkgconfig yasm autoconf automake libtool m4 + python2 pkgconfig autoconf automake cmake nasm libtool m4 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ - fribidi fontconfig freetype jansson zlib - libass libiconv libsamplerate libxml2 bzip2 - libogg libopus libtheora libvorbis libdvdcss a52dec libmkv - lame libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx + ffmpeg-full libogg libtheora x264 x265 libvpx + libopus lame libvorbis a52dec speex libsamplerate + libiconv fribidi fontconfig freetype libass jansson libxml2 + libdvdread libdvdnav libdvdcss libbluray ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme - ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) - ++ lib.optional useFdk fdk_aac; + ] ++ lib.optional useFdk fdk_aac + # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, + # look at ./make/configure.py search "enable_nvenc" + ++ lib.optional stdenv.isLinux nv-codec-headers; + # NOTE: 2018-12-25: v1.2.0 now requires cmake dep + # (default distribution bundles&builds 3rd party libs), + # don't trigger cmake build + dontUseCmakeConfigure = true; enableParallelBuilding = true; preConfigure = '' @@ -87,6 +79,7 @@ stdenv.mkDerivation rec { (if useFdk then "--enable-fdk-aac" else "") ]; + # NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = [ "-lx265" ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index c98acda9eea06..579d5566f134e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -21,6 +21,11 @@ , vlc , mbedtls +, scriptingSupport ? true +, luajit +, swig +, python3 + , alsaSupport ? false , alsaLib , pulseaudioSupport ? false @@ -68,6 +73,7 @@ in stdenv.mkDerivation rec { makeWrapper mbedtls ] + ++ optional scriptingSupport [ luajit swig python3 ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 13f93800f6e24..1600666884627 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "QMediathekView"; - version = "2017-04-16"; - name = "${pname}-${version}"; + version = "2019-01-06"; src = fetchFromGitHub { owner = "adamreichold"; repo = pname; - rev = "8c69892b95bf6825bd06a8c594168a98fe7cb2d1"; - sha256 = "1wca1w4iywd3hmiwcqx6fv79p3x5n1cgbw2liw3hs24ch3z54ckm"; + rev = "e098aaec552ec4e367078bf19953a08067316b4b"; + sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6"; }; postPatch = '' |