Unverified Commit 406e1954 authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

Merge pull request #196739 from rnhmjoj/pr-mkvtoolnix 

mkvtoolnix updates
parents 78f5b17e c04184ba

pkgs/applications/video/mkvtoolnix/default.nix

+4 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitLab

, fetchpatch

, pkg-config

, autoreconfHook

, rake
@@ -46,13 +47,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "mkvtoolnix";

  version = "70.0.0";

  version = "71.1.0";



  src = fetchFromGitLab {

    owner = "mbunkus";

    repo = "mkvtoolnix";

    rev = "release-${version}";

    sha256 = "sha256-7ryLf/SKM5m7MdOd2K2XhJEdLF2H8xjV1aZMKUjm+Ok=";

    sha256 = "sha256-JHbnjcXOctB6HQeHXykWbykdn35S2fCYegMkc3GLmAI=";

  };



  nativeBuildInputs = [
@@ -102,7 +103,7 @@ stdenv.mkDerivation rec { 
    "--disable-profiling"

    "--disable-static-qt"

    "--enable-optimization"

    "--with-boost-libdir=${boost.out}/lib"

    "--with-boost-libdir=${lib.getLib boost}/lib"

    "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl"

    "--with-gettext"

    (enableFeature withGUI "gui")

pkgs/development/libraries/libebml/default.nix

+3 −18
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config }:

{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:



stdenv.mkDerivation rec {

  pname = "libebml";

  version = "1.4.2";

  version = "1.4.4";



  src = fetchFromGitHub {

    owner  = "Matroska-Org";

    repo   = "libebml";

    rev    = "release-${version}";

    sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25";

    sha256 = "sha256-36SfZUHJ2sIvrrHox583cQqfWWcrL2zW1IHzgDchC9g=";

  };



  patches = [

    # Upstream fix for gcc-11

    (fetchpatch {

      url = "https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806.patch";

      sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl";

      excludes = [ "ChangeLog" ];

    })

    # in master post 1.4.2, see https://github.com/Matroska-Org/libebml/issues/97

    (fetchpatch {

      name = "fix-pkg-config.patch";

      url = "https://github.com/Matroska-Org/libebml/commit/42fbae35d291b737f2bb4ad5d643fd0d48537a88.patch";

      sha256 = "020qp4a3l60mcm4n310ynxbbv5qlpmybb9xy10pjvx4brp83pmy3";

    })

  ];



  nativeBuildInputs = [ cmake pkg-config ];



  cmakeFlags = [

pkgs/development/libraries/libmatroska/default.nix

+3 −13
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config

, libebml }:

{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libebml }:



stdenv.mkDerivation rec {

  pname = "libmatroska";

  version = "1.6.3";

  version = "1.7.1";



  src = fetchFromGitHub {

    owner  = "Matroska-Org";

    repo   = "libmatroska";

    rev    = "release-${version}";

    sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji";

    sha256 = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE=";

  };



  # in master post 1.6.3, see https://github.com/Matroska-Org/libmatroska/issues/62

  patches = [

    (fetchpatch {

      name = "fix-pkg-config.patch";

      url = "https://github.com/Matroska-Org/libmatroska/commit/53f6ea573878621871bca5f089220229fcb33a3b.patch";

      sha256 = "1lcxl3n32kk5x4aa4ja7p68km7qb2bwscavpv7qdmbhp3w5ia0mk";

    })

  ];



  nativeBuildInputs = [ cmake pkg-config ];



  buildInputs = [ libebml ];