diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/libraries/gstreamer | |
parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gstreamer')
12 files changed, 278 insertions, 64 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 8179806859c9..ba59a2514375 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,42 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, gettext +, config , pkgconfig, python3, gst-plugins-base, orc +, gobject-introspection , faacSupport ? false, faac ? null , faad2, libass, libkate, libmms, librdf, ladspaH , libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom , libbs2b, libmodplug, mpeg2dec , openjpeg, libopus, librsvg +, bluez +, chromaprint +, curl +, directfb +, fdk_aac +, flite +, gsm +, libaom +, libdc1394 +, libde265 +, libdrm +, libdvdnav +, libdvdread +, libgudev +, libofa +, libsndfile +, libusb1 +, neon +, openal +, opencv3 +, openexr +, openh264 +, pango +, rtmpdump +, sbc +, soundtouch +, spandsp +, srtp +, zbar +, wayland-protocols , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools , libGLU_combined, libintl, libgme @@ -15,11 +47,11 @@ assert faacSupport -> faac != null; let - inherit (stdenv.lib) optional; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "gst-plugins-bad-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -40,27 +72,32 @@ stdenv.mkDerivation rec { ''; patches = [ + ./fix_pkgconfig_includedir.patch + # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us (fetchpatch { - url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370409"; - sha256 = "0hy0rcn35alq65yqwri4fqjz2hf3nyyg5c7rnndk51msmqjxpprk"; + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/99790eaad9083cce5ab2b1646489e1a1c0faad1e.patch"; + sha256 = "11bqy4sl05qq5mj4bx5s09rq106s3j0vnpjl4np058im32j69lr3"; }) - ./fix_pkgconfig_includedir.patch - # Enable bs2b compilation - # https://bugzilla.gnome.org/show_bug.cgi?id=794346 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=369724; - sha256 = "1716mp0h2866ab33w607isvfhv1zwyj71qb4jrkx5v0h276v1pwr"; + # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/1872da81c48d3a719bd39955fd97deac7d037d74.patch"; + sha256 = "11zwrr5ggflmvr0qfssj7dmhgd3ybiadmy79b4zh24022zgw3xpz"; }) ]; src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "1r8dma3x127rbx42yab7kwq7q1bhkmvz2ykn0rnqnzl95q74w2wi"; + sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig python3 gettext ]; + nativeBuildInputs = [ + meson ninja pkgconfig python3 gettext gobject-introspection + ] + ++ optionals stdenv.isLinux [ + wayland-protocols + ]; buildInputs = [ gst-plugins-base orc @@ -71,6 +108,35 @@ stdenv.mkDerivation rec { lilv lv2 serd sord sratom # lv2 plug-in libmodplug mpeg2dec openjpeg libopus librsvg + bluez + chromaprint + curl.dev + directfb + fdk_aac + flite + gsm + libaom + libdc1394 + libde265 + libdrm + libdvdnav + libdvdread + libgudev + libofa + libsndfile + libusb1 + neon + openal + opencv3 + openexr + openh264 + rtmpdump + pango + sbc + soundtouch + spandsp + srtp + zbar fluidsynth libvdpau libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 @@ -85,6 +151,46 @@ stdenv.mkDerivation rec { # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + + "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" + "-Dfaac=${if faacSupport then "enabled" else "disabled"}" + "-Diqa=disabled" # required `dssim` library not packaging 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" + # This is likely because nixpkgs has the header in libmpc/mpcdec.h + # instead of mpc/mpcdec.h, like Arch does. The situation is not trivial. + # There are apparently 2 things called `libmpcdec` from the same author: + # * http://svn.musepack.net/libmpcdec/trunk/src/ + # * http://svn.musepack.net/libmpc/trunk/include/mpc/ + # Fixing it likely requires to first figure out with upstream which one + # is needed, and then patching upstream to find it (though it probably + # already works on Arch?). + "-Dmusepack=disabled" + "-Dopenmpt=disabled" # `libopenmpt` not packaged in nixpkgs as of writing + "-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 + "-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 + "-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" + ]; + enableParallelBuilding = true; doCheck = false; # fails 20 out of 58 tests, expensive diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 0acdf71fb72f..87bbef227de8 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -2,6 +2,11 @@ , pkgconfig, meson, ninja, gettext, gobject-introspection , python3, gstreamer, orc, pango, libtheora , libintl, libopus +, isocodes +, libjpeg +, libvisual +, tremor # provides 'virbisidec' +, gtk-doc, docbook_xsl, docbook_xml_dtd_412 , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland , enableAlsa ? stdenv.isLinux, alsaLib @@ -10,7 +15,7 @@ stdenv.mkDerivation rec { name = "gst-plugins-base-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with lib; { description = "Base plugins and helper libraries"; @@ -22,28 +27,56 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "0qbllw4kphchwhy4p7ivdysigx69i97gyw6q0rvkx1j81r4kjqfa"; + sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python3 gettext gobject-introspection ] - + nativeBuildInputs = [ + pkgconfig python3 gettext gobject-introspection + gtk-doc + # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` + docbook_xsl docbook_xml_dtd_412 + ] # Broken meson with Darwin. Should hopefully be fixed soon. Tracking # in https://bugzilla.gnome.org/show_bug.cgi?id=781148. ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ]; + # On Darwin, we currently use autoconf, on all other systems Meson + # TODO Switch to Meson on Darwin as well + # TODO How to pass these to Meson? - configureFlags = [ + configureFlags = lib.optionals stdenv.isDarwin [ "--enable-x11=${if enableX11 then "yes" else "no"}" "--enable-wayland=${if enableWayland then "yes" else "no"}" "--enable-cocoa=${if enableCocoa then "yes" else "no"}" ] - # Introspection fails on my MacBook currently ++ lib.optional stdenv.isDarwin "--disable-introspection"; - buildInputs = [ orc libtheora libintl libopus ] + mesonFlags = lib.optionals (!stdenv.isDarwin) [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing + # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices + "-Dgl_winsys=[${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}]" + # We must currently disable gtk_doc API docs generation, + # because it is not compatible with some features being disabled. + # See for example + # https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/38 + # for it failing because some Wayland symbols are missing. + # This problem appeared between 1.15.1 and 1.16.0. + "-Dgtk_doc=disabled" + ] + ++ lib.optional (!enableX11) "-Dx11=disabled" + # TODO How to disable Wayland? + ++ lib.optional (!enableAlsa) "-Dalsa=disabled" + ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" + ; + + buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor ] + ++ lib.optional (!stdenv.isDarwin) libvisual ++ lib.optional enableAlsa alsaLib ++ lib.optionals enableX11 [ libXv pango ] ++ lib.optional enableWayland wayland @@ -61,10 +94,6 @@ stdenv.mkDerivation rec { doCheck = false; # fails, wants DRI access for OpenGL patches = [ - (fetchpatch { - url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370414"; - sha256 = "07x43xis0sr0hfchf36ap0cibx0lkfpqyszb3r3w9dzz301fk04z"; - }) ./fix_pkgconfig_includedir.patch ]; } diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index b69ab89df24d..fa838d5ff773 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -2,12 +2,17 @@ , pkgconfig, gettext, gobject-introspection , bison, flex, python3, glib, makeWrapper , libcap,libunwind, darwin +, elfutils # for libdw +, bash-completion +, docbook_xsl, docbook_xml_dtd_412 +, gtk-doc , lib +, CoreServices }: stdenv.mkDerivation rec { name = "gstreamer-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with lib ;{ description = "Open source multimedia framework"; @@ -19,14 +24,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr"; + sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; }; patches = [ - (fetchpatch { - url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411"; - sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2"; - }) ./fix_pkgconfig_includedir.patch ]; @@ -35,13 +36,27 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection + bash-completion + gtk-doc + # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` + docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = - lib.optionals stdenv.isLinux [ libcap libunwind ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; + lib.optionals stdenv.isLinux [ libcap libunwind elfutils ] + ++ lib.optional stdenv.isDarwin CoreServices; propagatedBuildInputs = [ glib ]; + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + ] + # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. + ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; + postInstall = '' for prog in "$dev/bin/"*; do # We can't use --suffix here due to quoting so we craft the export command by hand @@ -49,9 +64,17 @@ stdenv.mkDerivation rec { done ''; - preConfigure= '' - patchShebangs . - ''; + preConfigure= + # These files are not executable upstream, so we need to + # make them executable for `patchShebangs` to pick them up. + # Can be removed when this is merged and available: + # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/141 + '' + chmod +x gst/parse/get_flex_version.py + '' + + '' + patchShebangs . + ''; preFixup = '' moveToOutput "share/bash-completion" "$dev" diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 9aec87634040..94d71760a7f8 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -1,7 +1,7 @@ -{ callPackage }: +{ callPackage, CoreServices }: rec { - gstreamer = callPackage ./core { }; + gstreamer = callPackage ./core { inherit CoreServices; }; gstreamermm = callPackage ./gstreamermm { }; @@ -13,7 +13,7 @@ rec { gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; - gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base; }; + gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; }; gst-libav = callPackage ./libav { inherit gst-plugins-base; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index fb7a37a4f448..61d39bc96369 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "gstreamer-editing-services-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0pxk65jib3mqszjkyvlzklwia4kbdj6j2b6jw1d502b06mdx5lak"; + sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2"; }; outputs = [ "out" "dev" ]; @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gst-plugins-base libxml2 ]; patches = [ - (fetchpatch { - url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370413"; - sha256 = "1xcgbs18g6n5p7z7kqj7ffakwmkxq7ijajyvhyl7p3zvqll9dc7x"; - }) ./fix_pkgconfig_includedir.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 247a74e3a325..b76142c9d86d 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -6,10 +6,17 @@ , libsoup, libpulseaudio, libintl , darwin, lame, mpg123, twolame , gtkSupport ? false, gtk3 ? null +# As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. +# In the fuure we should probably split `ffado`. +, enableJack ? false , libXdamage , libXext , libXfixes , ncurses +, xorg +, libgudev +, wavpack +, jack2 }: assert gtkSupport -> gtk3 != null; @@ -19,7 +26,7 @@ let in stdenv.mkDerivation rec { name = "gst-plugins-good-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -36,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz"; + sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"; }; outputs = [ "out" "dev" ]; @@ -52,16 +59,34 @@ stdenv.mkDerivation rec { libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca libsoup libshout lame mpg123 twolame libintl - # TODO: Remove the comments once https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/e234932dc703e51a0e1aa3b9c408f12758b12335 - # is merged and available in nixpkgs. - libXdamage # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 - libXext # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 - libXfixes # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 + libXdamage + libXext + libXfixes ncurses + xorg.libXfixes + xorg.libXdamage + wavpack ] ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev jack2 ] + ++ optionals (stdenv.isLinux && enableJack) [ + jack2 + ]; + + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps + ] + ++ optional (!gtkSupport) "-Dgtk3=disabled" + ++ optionals (!stdenv.isLinux || !enableJack) [ + "-Djack=disabled" # unclear whether Jack works on Darwin + ] + ++ optionals (!stdenv.isLinux) [ + "-Dv4l2-gudev=disabled" + ]; # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index d03151e43444..c70e898a47d8 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, autoreconfHook -, perl, bison2, flex, pkgconfig, glib, libxml2, libintl +, perl, bison2, flex, pkgconfig, glib, libxml2, libintl, libunwind }: stdenv.mkDerivation rec { @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind; propagatedBuildInputs = [ glib libxml2 ]; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 7f7393bba28e..297c8ada884e 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -10,7 +10,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { name = "gst-libav-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1nk5g24z2xx5kaw5cg8dv8skdc516inahmkymcz8bxqxj28qbmyz"; + sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"; }; outputs = [ "out" "dev" ]; @@ -34,4 +34,10 @@ stdenv.mkDerivation rec { [ gst-plugins-base orc bzip2 ] ++ optional withSystemLibav libav ; + + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + ]; + } diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 6236edec6a40..c4620a29e945 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig -, gst-plugins-base, gettext, gobject-introspection +, gettext, gobject-introspection +, gst-plugins-base +, gst-plugins-bad }: stdenv.mkDerivation rec { name = "gst-rtsp-server-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with stdenv.lib; { description = "Gstreamer RTSP server"; @@ -19,12 +21,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; - sha256 = "1wc4d0y57hpfvv9sykjg8mxj86dw60mf696fbqbiqq6dzlmcw3ix"; + sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ]; - buildInputs = [ gst-plugins-base ]; + buildInputs = [ gst-plugins-base gst-plugins-bad ]; + + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + ]; } diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 0cdfd1f4a7b6..5c3a56814bad 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -2,12 +2,13 @@ , gst-plugins-base, orc, gettext , a52dec, libcdio, libdvdread , libmad, libmpeg2, x264, libintl, lib +, opencore-amr , darwin }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = with lib; { description = "Gstreamer Ugly Plugins"; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc"; + sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"; }; outputs = [ "out" "dev" ]; @@ -37,8 +38,16 @@ stdenv.mkDerivation rec { a52dec libcdio libdvdread libmad libmpeg2 x264 libintl + opencore-amr ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit CoreFoundation DiskArbitration ]); + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing + ]; + NIX_LDFLAGS = [ "-lm" ]; } diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index e84f8dce9125..c0541857e8b7 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.14.4"; + version = "1.16.0"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "18yha6119v7mwz47idv2vykzfssqfmh6hc824wqqsshwjvzdn66f"; + sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf"; }; outputs = [ "out" "dev" ]; @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { mkdir -p $GST_PLUGIN_PATH_1_0 ''; + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + ]; + meta = { homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix index 916185bf7ecf..06d275078f30 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gst-validate-${version}"; - version = "1.14.4"; + version = "1.16.0"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1ismv4i7ldi04swq76pcpd5apxqd52yify5hvlyan2yw9flwrp0q"; + sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck"; }; outputs = [ "out" "dev" ]; @@ -31,4 +31,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer gst-plugins-base ]; enableParallelBuilding = true; + + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + ]; } |