mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
gstreamer: 1.15.1 -> 1.16.0
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
parent
1a6e572529
commit
95bea55802
@ -49,7 +49,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-bad-${version}";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gstreamer Bad Plugins";
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
|
||||
sha256 = "0dpky8a0pbwwkc5r8hawi5yizdqk65j9liwvhxkjwbnpv53n5y10";
|
||||
sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-base-${version}";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Base plugins and helper libraries";
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
|
||||
sha256 = "0qvyx9gs7z2ryhdxxzynn9r1gphfk4xfkhd6dma02sbda9c5jckf";
|
||||
sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@ -61,6 +61,13 @@ stdenv.mkDerivation rec {
|
||||
"-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?
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gstreamer-${version}";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
meta = with lib ;{
|
||||
description = "Open source multimedia framework";
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
|
||||
sha256 = "05ri9y37qkgvkb2xjywf32c3k9479b0af0m6cjigx04pgwsf42kq";
|
||||
sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
|
||||
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
|
||||
];
|
||||
|
||||
@ -60,9 +61,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"
|
||||
|
||||
@ -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
|
||||
];
|
||||
|
||||
|
||||
@ -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) [
|
||||
|
||||
@ -10,7 +10,7 @@ assert withSystemLibav -> libav != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-libav-${version}";
|
||||
version = "1.15.1";
|
||||
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 = "0hq5y8zg6a3fliwip7k85hg6s6amsmbqgrjl6axzrr3y6akcvslk";
|
||||
sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-rtsp-server-${version}";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gstreamer RTSP server";
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
|
||||
sha256 = "0d0jaf7ir40dxpxs41wyb7m7riyl7wsqcb5qvd4vhwpz0dwxhpvl";
|
||||
sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-ugly-${version}";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gstreamer Ugly Plugins";
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
|
||||
sha256 = "17p9x30ywanz1lbk061kzd8bypcv5hkin6iyaqffp8alrwiak3qp";
|
||||
sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-vaapi-${version}";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
|
||||
sha256 = "1aazan6r6p5aabb671znjkh8kmpxkz68wvaickqwzb1bz0ijcivc";
|
||||
sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-validate-${version}";
|
||||
version = "1.15.1";
|
||||
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 = "195hwblagfsnq1xn858al3f32jn5nynr4j5x395dpg3vl3c4k5v4";
|
||||
sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user