public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gstreamer: 1.15.1 -> 1.16.0

Browse Source 
Changes needed:

* core: dbghelp disabled as it's not needed
* core: Fixed script not being executable and skipped by patchShebangs
* base: gtk_doc disabled because of wayland symbol error
* ges: Patch removed that was merged upstream:
  https://bugzilla.gnome.org/show_bug.cgi?id=794856#c16
This commit is contained in:
Niklas Hambüchen
2019-06-20 13:36:11 +02:00
parent 1a6e572529
commit 95bea55802
10 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gstreamer/good/default.nix
+15 -11
View File
@@ -6,6 +6,9 @@
, 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
@@ -23,7 +26,7 @@ let
in
stdenv.mkDerivation rec {
name = "gst-plugins-good-${version}";
version = "1.15.1";
version = "1.16.0";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@@ -40,7 +43,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "15f6klr7wg6jlcyx0qspi13s8wmc9fij1bx1bbvy90a9a72v97rb";
sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5";
};
outputs = [ "out" "dev" ];
@@ -56,19 +59,20 @@ 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 # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553
xorg.libXdamage # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553
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 libgudev jack2 ];
++ 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.
@@ -77,7 +81,7 @@ stdenv.mkDerivation rec {
"-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps
]
++ optional (!gtkSupport) "-Dgtk3=disabled"
++ optionals (!stdenv.isLinux) [
++ optionals (!stdenv.isLinux || !enableJack) [
"-Djack=disabled" # unclear whether Jack works on Darwin
]
++ optionals (!stdenv.isLinux) [