gstreamer: 1.16.2 -> 1.18.0
Fixes #98769. Important changes from https://gstreamer.freedesktop.org/releases/1.18/: * `gst-validate` was renamed to `gst-devtools` upstream: > * the `gst-validate` tarball has been superseded by > the `gst-devtools` tarball for consistency with the git module name. * `gst-python` is now Python 3 only: > * Python 2.x is no longer supported
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
, libbs2b
|
||||
, libmodplug
|
||||
, mpeg2dec
|
||||
, libmicrodns
|
||||
, openjpeg
|
||||
, libopus
|
||||
, librsvg
|
||||
@@ -65,6 +66,7 @@
|
||||
, wayland-protocols
|
||||
, wildmidi
|
||||
, fluidsynth
|
||||
, libva
|
||||
, libvdpau
|
||||
, wayland
|
||||
, libwebp
|
||||
@@ -87,25 +89,17 @@ let
|
||||
inherit (stdenv.lib) optional optionals;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-bad";
|
||||
version = "1.16.2";
|
||||
version = "1.18.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi";
|
||||
sha256 = "0pqqq5bs9fjwcmbwgsgxs2dx6gznhxs7ii5pmjkslr6xmlfap0pk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with neon 0.31
|
||||
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch";
|
||||
sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";
|
||||
})
|
||||
./fix_pkgconfig_includedir.patch
|
||||
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235
|
||||
./opencv-4.3.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -130,6 +124,7 @@ in stdenv.mkDerivation rec {
|
||||
libbs2b
|
||||
libmodplug
|
||||
mpeg2dec
|
||||
libmicrodns
|
||||
openjpeg
|
||||
libopus
|
||||
librsvg
|
||||
@@ -154,6 +149,7 @@ in stdenv.mkDerivation rec {
|
||||
soundtouch
|
||||
srtp
|
||||
fluidsynth
|
||||
libva
|
||||
libvdpau
|
||||
libwebp
|
||||
xvidcore
|
||||
@@ -215,11 +211,14 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
|
||||
"-Davtp=disabled"
|
||||
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
|
||||
"-Dzbar=${if enableZbar then "enabled" else "disabled"}"
|
||||
"-Dfaac=${if faacSupport then "enabled" else "disabled"}"
|
||||
"-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing
|
||||
"-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing
|
||||
"-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support
|
||||
# As of writing, with `libmpcdec` in `buildInputs` we get
|
||||
# "Could not find libmpcdec header files, but Musepack was enabled via options"
|
||||
@@ -236,19 +235,16 @@ in stdenv.mkDerivation rec {
|
||||
"-Dopenni2=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dopensles=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing
|
||||
"-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
|
||||
"-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
|
||||
"-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
|
||||
"-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing
|
||||
"-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing
|
||||
"-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs
|
||||
"-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support
|
||||
"-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support
|
||||
"-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
|
||||
|
||||
# Requires CUDA and we haven't figured out how to make Meson find CUDA yet;
|
||||
# it probably searches via pkgconfig, for which we have no .pc files,
|
||||
# see https://github.com/NixOS/nixpkgs/issues/54395
|
||||
"-Dnvdec=disabled"
|
||||
"-Dnvenc=disabled"
|
||||
"-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
|
||||
]
|
||||
++ optionals stdenv.isDarwin [
|
||||
"-Dbluez=disabled"
|
||||
@@ -276,6 +272,11 @@ in stdenv.mkDerivation rec {
|
||||
"-Dapplemedia=disabled"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
scripts/extract-release-date-from-doap-file.py
|
||||
'';
|
||||
|
||||
# This package has some `_("string literal")` string formats
|
||||
# that trip up clang with format security enabled.
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
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
|
||||
Reference in New Issue
Block a user