diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:22:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:22:27 +0200 |
| commit | e8d3c1579bf7e773270e208bc489d193cdf37243 (patch) | |
| tree | a3612d14ea5ec0d14ec1cee7304c3a2ae7928bfd /pkgs/development/libraries/gstreamer | |
| parent | 1906fc5bd10a7bbab35136325fa3251a043361b2 (diff) | |
| parent | b0f49529ddc6fef2da2eb6388b6bb5c640290f2a (diff) | |
| download | nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.tar nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.tar.gz nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.tar.bz2 nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.tar.lz nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.tar.xz nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.tar.zst nixpkgs-e8d3c1579bf7e773270e208bc489d193cdf37243.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 5bf3e0261e4..f08718b970c 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -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 diff --git a/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch new file mode 100644 index 00000000000..55155d5c5e7 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch @@ -0,0 +1,13 @@ +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55d..05b142e 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -65,7 +65,7 @@ if opencv_found + endif + endforeach + else +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) ++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers |