Merge branch 'staging' into staging-next

2020-05-06 08:22:27 +02:00
parent 1906fc5bd1 b0f49529dd
commit e8d3c1579b
29 changed files with 213 additions and 176 deletions
@@ -104,6 +104,8 @@ in stdenv.mkDerivation rec {
      sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";
    })
    ./fix_pkgconfig_includedir.patch
+    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235
+    ./opencv-4.3.patch
  ];

  # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/950