cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #76112 from acowley/handbrake-1.3.0

Browse source 
handbrake: 1.2.2 -> 1.3.0
This commit is contained in:
Lassulus 2019-12-22 21:43:03 +01:00 committed by GitHub
commit c729a066ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/applications/video/handbrake/default.nix
View file

@ -9,9 +9,10 @@
{ stdenv, lib, fetchurl, fetchpatch,
# Main build tools
python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma,
python2, pkgconfig, autoconf, automake, libtool, m4, lzma,
numactl,
# Processing, video codecs, containers
ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora,
ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d,
# Codecs, audio
libopus, lame, libvorbis, a52dec, speex, libsamplerate,
# Text processing
@ -48,22 +49,22 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
stdenv.mkDerivation rec {
pname = "handbrake";
version = "1.2.2";
version = "1.3.0";
src = fetchurl {
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z";
sha256 = "15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59";
};
nativeBuildInputs = [
python2 pkgconfig autoconf automake cmake nasm libtool m4
python2 pkgconfig autoconf automake libtool m4
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
buildInputs = [
ffmpeg-full libogg libtheora x264 x265 libvpx
ffmpeg-full libogg libtheora x264 x265 libvpx dav1d
libopus lame libvorbis a52dec speex libsamplerate
libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
libdvdread libdvdnav libdvdcss libbluray lzma
libdvdread libdvdnav libdvdcss libbluray lzma numactl
] ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify
gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
@ -74,20 +75,6 @@ stdenv.mkDerivation rec {
# 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;
# cp: cannot create regular file './internal_defaults.json': File exists
enableParallelBuilding = false;
# The samplerate patch should be removed when HandBrake 1.3.0 is released
patches = [(fetchpatch {
name = "set-ffmpeg-samplerate.patch";
url = "https://patch-diff.githubusercontent.com/raw/HandBrake/HandBrake/pull/2126.patch";
sha256 = "00lds9h27cvyr53qpvv8gbv01hfxdxd8gphxcwbwg8akqrvk9gbf";
})];
preConfigure = ''
patchShebangs scripts
@ -99,6 +86,9 @@ stdenv.mkDerivation rec {
# Force using nixpkgs dependencies
sed -i '/MODULES += contrib/d' make/include/main.defs
sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
-e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \
-i make/configure.py
'';
configureFlags = [
@ -112,6 +102,8 @@ stdenv.mkDerivation rec {
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
NIX_LDFLAGS = [
"-lx265"
# NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
"-ldl"
];
preBuild = ''