From 3f222747bfbf7e6e53c02a5d6e27e8475db6649b Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 17 Dec 2018 23:47:07 +0200 Subject: [PATCH 1/7] handbrake: 1.1.2 -> 1.2.0 --- pkgs/applications/video/handbrake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index abd4973bbdf..b251bfeabc6 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -20,12 +20,12 @@ 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: { From 0f83cff8a2c27fb31357ea860ecca6dc99d96fd1 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 27 Dec 2018 17:05:57 +0200 Subject: [PATCH 2/7] handbrake: 1.2.0: switch to FFMpeg, deps sort --- pkgs/applications/video/handbrake/default.nix | 69 ++++++++----------- 1 file changed, 27 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index b251bfeabc6..63034b09af7 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -1,25 +1,31 @@ # 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, + python2, pkgconfig, autoconf, automake, yasm, libtool, m4, + fribidi, fontconfig, freetype, jansson, zlib, + libass, libiconv, libsamplerate, libxml2, bzip2, + ffmpeg_4, libtheora, x264, x265, libvpx, mpeg2dec, + libopus, lame, libvorbis, a52dec, + libogg, libmkv, mp4v2, + 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.2.0"; name = "handbrake-${version}"; @@ -28,44 +34,22 @@ stdenv.mkDerivation rec { 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 - ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; + python2 pkgconfig autoconf automake yasm libtool m4 + ] ++ lib.optionals useGtk [ wrapGAppsHook intltool ]; 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_4 libtheora x264 x265 libvpx mpeg2dec + libopus lame libvorbis a52dec + libogg libmkv mp4v2 + 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; enableParallelBuilding = true; @@ -87,6 +71,7 @@ stdenv.mkDerivation rec { (if useFdk then "--enable-fdk-aac" else "") ]; + # NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = [ "-lx265" ]; From 42f660a3a069b77f06d0f379c499b9f470a6d768 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 27 Dec 2018 17:14:59 +0200 Subject: [PATCH 3/7] handbrake: 1.2.0: add cmake, no cmake conf --- pkgs/applications/video/handbrake/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 63034b09af7..9d43104364e 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -4,7 +4,7 @@ # { stdenv, lib, fetchurl, - python2, pkgconfig, autoconf, automake, yasm, libtool, m4, + python2, pkgconfig, autoconf, automake, cmake, yasm, libtool, m4, fribidi, fontconfig, freetype, jansson, zlib, libass, libiconv, libsamplerate, libxml2, bzip2, ffmpeg_4, libtheora, x264, x265, libvpx, mpeg2dec, @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake yasm libtool m4 - ] ++ lib.optionals useGtk [ wrapGAppsHook intltool ]; + python2 pkgconfig autoconf automake cmake yasm libtool m4 + ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ fribidi fontconfig freetype jansson zlib @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { libgudev hicolor-icon-theme ] ++ lib.optional useFdk fdk_aac; + # 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 = '' From fd8a90f5cae34bf52afcb5774a0c31c60c107727 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 27 Dec 2018 17:40:07 +0200 Subject: [PATCH 4/7] handbrake: 1.2.0: updating deps rm yasm - dropped rm bzip2, zlib - no needed for build rm mp4v2, libmkv, mpeg2dec - drop abandonware, HandBrake now uses FFMpeg for that add nasm, speex, nv-codec-headers - new required deps --- pkgs/applications/video/handbrake/default.nix | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 9d43104364e..15bef1046f0 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -3,13 +3,16 @@ # Derivation patches HandBrake to use Nix closure dependencies. # -{ stdenv, lib, fetchurl, - python2, pkgconfig, autoconf, automake, cmake, yasm, libtool, m4, - fribidi, fontconfig, freetype, jansson, zlib, - libass, libiconv, libsamplerate, libxml2, bzip2, - ffmpeg_4, libtheora, x264, x265, libvpx, mpeg2dec, - libopus, lame, libvorbis, a52dec, - libogg, libmkv, mp4v2, +{ stdenv, lib, fetchurl, callPackage, + # Main build tools + python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, + # Processing, video codecs, containers + ffmpeg_4, 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, @@ -25,6 +28,12 @@ useFdk ? false, fdk_aac ? null }: +let + + nv-codec-headers = callPackage ../../../development/libraries/ffmpeg-full/nv-codec-headers.nix { }; + +in + stdenv.mkDerivation rec { version = "1.2.0"; name = "handbrake-${version}"; @@ -35,21 +44,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake cmake yasm 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 - ffmpeg_4 libtheora x264 x265 libvpx mpeg2dec - libopus lame libvorbis a52dec - libogg libmkv mp4v2 + ffmpeg_4 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 - ] ++ 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), From 6ebcbd0c97ba696a90fcf25db8c8bdfccc6fc64f Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 28 Dec 2018 20:05:20 +0200 Subject: [PATCH 5/7] handbrake: 1.2.0: ffmpeg_4 -> ffmpeg-full --- pkgs/applications/video/handbrake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 15bef1046f0..bdb8630241e 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,7 +7,7 @@ # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, # Processing, video codecs, containers - ffmpeg_4, libogg, x264, x265, libvpx, libtheora, + ffmpeg-full, libogg, x264, x265, libvpx, libtheora, # Codecs, audio libopus, lame, libvorbis, a52dec, speex, libsamplerate, # Text processing @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ - ffmpeg_4 libogg libtheora 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 From 9f6e6f9b31e1e97f090678623a67f858d51108b3 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 5 Jan 2019 03:31:43 +0200 Subject: [PATCH 6/7] nv-codec-headers: bring package to top-level --- pkgs/applications/video/handbrake/default.nix | 8 +------- pkgs/development/libraries/ffmpeg-full/default.nix | 4 +--- .../nv-codec-headers.nix => nv-codec-headers/default.nix} | 0 pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 4 insertions(+), 10 deletions(-) rename pkgs/development/libraries/{ffmpeg-full/nv-codec-headers.nix => nv-codec-headers/default.nix} (100%) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index bdb8630241e..07474c5e52c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,7 +7,7 @@ # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, # Processing, video codecs, containers - ffmpeg-full, libogg, x264, x265, libvpx, libtheora, + ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, # Codecs, audio libopus, lame, libvorbis, a52dec, speex, libsamplerate, # Text processing @@ -28,12 +28,6 @@ useFdk ? false, fdk_aac ? null }: -let - - nv-codec-headers = callPackage ../../../development/libraries/ffmpeg-full/nv-codec-headers.nix { }; - -in - stdenv.mkDerivation rec { version = "1.2.0"; name = "handbrake-${version}"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4c1ad34f6da..2cfa4b1d3cd 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -96,7 +96,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support +, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -176,8 +176,6 @@ let inherit (stdenv) isCygwin isFreeBSD isLinux; inherit (stdenv.lib) optional optionals optionalString enableFeature; - - nv-codec-headers = callPackage ./nv-codec-headers.nix { }; in /* diff --git a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix b/pkgs/development/libraries/nv-codec-headers/default.nix similarity index 100% rename from pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix rename to pkgs/development/libraries/nv-codec-headers/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba2c979b42..cbc3ef44173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11774,6 +11774,8 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; + nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; From 25f9129f86da831d443b8a7f28a086afed80009f Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 5 Jan 2019 03:20:00 +0200 Subject: [PATCH 7/7] nv-codec-headers: 8.1.24.2 -> 8.2.15.6 --- pkgs/development/libraries/nv-codec-headers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 03599c91bf0..07ec502cd12 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "nv-codec-headers-${version}"; - version = "n8.1.24.2"; + version = "8.2.15.6"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "${version}"; - sha256 = "122i3f6whiz5yp44dhk73ifr1973z8vvfbg4216vb782bl8b5bam"; + rev = "n${version}"; + sha256 = "0216ww8byjxz639kagyw0mr9vxxwj89xdnj448d579vjr54jychv"; }; makeFlags = [ "PREFIX=$(out)" ]; meta = { - description = "ffmpeg nvidia headers for NVENC"; + description = "FFmpeg version of headers for NVENC"; homepage = http://ffmpeg.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.MP2E ];