diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/gstreamer | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gstreamer')
11 files changed, 79 insertions, 66 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 313a063cae89..40b10d0983ad 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext -, config , pkg-config , python3 , gst-plugins-base @@ -12,7 +11,7 @@ , gobject-introspection , enableZbar ? false , faacSupport ? false -, faac ? null +, faac , faad2 , libass , libkate @@ -36,7 +35,6 @@ , bluez , chromaprint , curl -, darwin , directfb , fdk_aac , flite @@ -81,24 +79,29 @@ , x265 , libxml2 , srt +, vo-aacenc +, VideoToolbox +, AudioToolbox +, AVFoundation +, CoreMedia +, CoreVideo +, Foundation +, MediaToolbox }: -assert faacSupport -> faac != null; - -let - inherit (lib) optional optionals; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "gst-plugins-bad"; version = "1.18.2"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca"; }; patches = [ + # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch ]; @@ -110,13 +113,15 @@ in stdenv.mkDerivation rec { python3 gettext gobject-introspection - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ]; buildInputs = [ gst-plugins-base orc + # gobject-introspection has to be in both nativeBuildInputs and + # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection faad2 libass @@ -163,16 +168,17 @@ in stdenv.mkDerivation rec { libxml2 libintl srt - ] ++ optionals enableZbar [ + vo-aacenc + ] ++ lib.optionals enableZbar [ zbar - ] ++ optionals faacSupport [ + ] ++ lib.optionals faacSupport [ faac - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ bluez libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols - ] ++ optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin wildmidi @@ -199,7 +205,7 @@ in stdenv.mkDerivation rec { serd sord sratom - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: # fatal error: 'VideoToolbox/VideoToolbox.h' file not found @@ -210,7 +216,7 @@ in stdenv.mkDerivation rec { CoreVideo Foundation MediaToolbox - ]); + ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users @@ -241,7 +247,6 @@ in stdenv.mkDerivation rec { "-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 @@ -249,10 +254,10 @@ in stdenv.mkDerivation rec { "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing ] - ++ optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.isLinux) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` ] - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "-Dbluez=disabled" "-Dchromaprint=disabled" "-Ddirectfb=disabled" @@ -269,11 +274,11 @@ in stdenv.mkDerivation rec { "-Dladspa=disabled" # requires lrdf "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs "-Dwildmidi=disabled" # see dependencies above - ] ++ optionals (!gst-plugins-base.glEnabled) [ - "-Dgl=disabled"] - ++ optionals (!gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ + "-Dgl=disabled" + ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [ "-Dwayland=disabled" - ] ++ optionals (!gst-plugins-base.glEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # but its meson build system does not declare the dependency. "-Dapplemedia=disabled" diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index bac59ac4c48c..4f392622065b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -31,7 +31,8 @@ # errors. Suspected is that a newer version than clang # is needed than 5.0 but it is not clear. , enableCocoa ? false -, darwin +, Cocoa +, OpenGL , enableGl ? (enableX11 || enableWayland || enableCocoa) , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x"; }; @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { libvisual ] ++ lib.optionals stdenv.isDarwin [ pango - darwin.apple_sdk.frameworks.OpenGL + OpenGL ] ++ lib.optionals enableAlsa [ alsaLib ] ++ lib.optionals enableX11 [ @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableWayland [ wayland wayland-protocols - ] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa + ] ++ lib.optional enableCocoa Cocoa ++ lib.optional enableCdparanoia cdparanoia; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index a5b4c0b827a1..84badf304108 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 1fdd67d836e7..a86308ea3cef 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -1,17 +1,17 @@ -{ callPackage, CoreServices }: +{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }: rec { gstreamer = callPackage ./core { inherit CoreServices; }; gstreamermm = callPackage ./gstreamermm { }; - gst-plugins-base = callPackage ./base { inherit gstreamer; }; + gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; }; - gst-plugins-good = callPackage ./good { inherit gst-plugins-base; }; + gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; }; - gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; }; + gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; - gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; + gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; }; gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index dc53a76bbca6..a39eadafb0b7 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index ebd5f83dd15f..774fefbc3584 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index a032f5f5b5a4..b08759b8dba1 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -25,12 +25,13 @@ , libsoup , libpulseaudio , libintl -, darwin +, Cocoa , lame , mpg123 , twolame -, gtkSupport ? false, gtk3 ? null -, raspiCameraSupport ? false, libraspberrypi ? null +, gtkSupport ? false, gtk3 +, qt5Support ? false, qt5 +, raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 , libXdamage , libXext @@ -43,12 +44,8 @@ , wavpack }: -assert gtkSupport -> gtk3 != null; -assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); +assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); -let - inherit (lib) optionals; -in stdenv.mkDerivation rec { pname = "gst-plugins-good"; version = "1.18.2"; @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp"; }; @@ -67,7 +64,7 @@ stdenv.mkDerivation rec { ninja gettext nasm - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ wayland-protocols ]; @@ -97,33 +94,39 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack - ] ++ optionals raspiCameraSupport [ + ] ++ lib.optionals raspiCameraSupport [ libraspberrypi - ] ++ optionals gtkSupport [ + ] ++ lib.optionals gtkSupport [ # for gtksink gtk3 - ] ++ optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals qt5Support (with qt5; [ + qtbase + qtdeclarative + qtwayland + qtx11extras + ]) ++ lib.optionals stdenv.isDarwin [ + Cocoa + ] ++ lib.optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev wayland - ] ++ optionals enableJack [ + ] ++ lib.optionals enableJack [ libjack2 ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps - ] ++ optionals (!gtkSupport) [ + ] ++ lib.optionals (!qt5Support) [ + "-Dqt5=disabled" + ] ++ lib.optionals (!gtkSupport) [ "-Dgtk3=disabled" - ] ++ optionals (!enableJack) [ + ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" - ] ++ optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only "-Doss=disabled" # Linux only @@ -131,8 +134,7 @@ stdenv.mkDerivation rec { "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only - "-Dpulse=disabled" # TODO check if we can keep this enabled - ] ++ optionals (!raspiCameraSupport) [ + ] ++ lib.optionals (!raspiCameraSupport) [ "-Drpicamsrc=disabled" ]; @@ -150,6 +152,9 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; + # must be explicitely set since 5590e365 + dontWrapQtApps = true; + meta = with lib; { description = "GStreamer Good Plugins"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 3175cff4acaa..f0755f201d48 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index bcecd11ce2d2..037face3d128 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 8f35829ed384..7c70b7ead1ab 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -16,7 +16,9 @@ , libintl , lib , opencore-amr -, darwin +, IOKit +, CoreFoundation +, DiskArbitration }: stdenv.mkDerivation rec { @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3"; }; @@ -49,11 +51,11 @@ stdenv.mkDerivation rec { x264 libintl opencore-amr - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation DiskArbitration - ]); + ]; mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index a90d21c28e8c..2c92cd2236ff 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc"; }; |