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

gstreamer: 1.4.x -> 1.6.x (all modules)

Browse Source 
(And while at it, gst-vaapi 0.6.0 -> 0.6.1.)

* gst-editing-services grew additional build time dependencies, flex and
  perl.

* gst-libav switched from libav to ffmpeg as "libav" provider, see
  http://gstreamer.freedesktop.org/releases/1.6/.
  Without using ffmpeg, one may hit issues such as this (which I
  initially did):

  (gst-plugin-scanner:19751): GStreamer-WARNING **: Failed to load plugin '/nix/store/0wgpq2yx9wrkp2mh4rn1c7zbiq2bqa2l-gst-libav-1.6.1/lib/gstreamer-1.0/libgstlibav.so':
  /nix/store/0wgpq2yx9wrkp2mh4rn1c7zbiq2bqa2l-gst-libav-1.6.1/lib/gstreamer-1.0/libgstlibav.so: undefined symbol: av_frame_get_sample_rate
This commit is contained in:
Bjørn Forsman
2015-12-05 21:52:33 +01:00
parent eeb2935ac5
commit 84bc6d64ba
10 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gstreamer/bad/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@ let
inherit (stdenv.lib) optional optionalString; inherit (stdenv.lib) optional optionalString;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.4.5"; name = "gst-plugins-bad-1.6.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins"; description = "Gstreamer Bad Plugins";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm"; sha256 = "0rjla9zcal9b5ynagq7cscjs53qrd9bafjkjssrp8s2z2apsjxp1";
}; };
nativeBuildInputs = [ pkgconfig python ]; nativeBuildInputs = [ pkgconfig python ];
pkgs/development/libraries/gstreamer/base/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-base-1.4.5"; name = "gst-plugins-base-1.6.1";
meta = { meta = {
description = "Base plugins and helper libraries"; description = "Base plugins and helper libraries";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp"; sha256 = "18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgs/development/libraries/gstreamer/core/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gstreamer-1.4.5"; name = "gstreamer-1.6.1";
meta = { meta = {
description = "Open source multimedia framework"; description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020"; sha256 = "172w1bpnkn6mm1wi37n03apdbb6cdkykhzjf1vfxchcd7hhkyflp";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgs/development/libraries/gstreamer/default.nix
+2
View File
@@ -15,6 +15,8 @@ rec {
gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
# TODO: gnonlin is deprecated in gst-editing-services, better switch to nle
# (Non Linear Engine).
gst-editing-services = callPackage ./ges { inherit gnonlin; }; gst-editing-services = callPackage ./ges { inherit gnonlin; };
gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; };
pkgs/development/libraries/gstreamer/ges/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection { stdenv, fetchurl, pkgconfig, python, gobjectIntrospection
, gnonlin, libxml2 , gnonlin, libxml2, flex, perl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gstreamer-editing-services-1.4.0"; name = "gstreamer-editing-services-1.6.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for creation of audio/video non-linear editors"; description = "Library for creation of audio/video non-linear editors";
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
sha256 = "1cwbh244an6zsxsscvg6xjnb34ylci34g9zx59xjbv5wnw7vj86c"; sha256 = "1lkvkrsipn35341hwwkhwn44n90y49sjwra1r5pazbjgn1yykxzm";
}; };
nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];
propagatedBuildInputs = [ gnonlin libxml2 ]; propagatedBuildInputs = [ gnonlin libxml2 ];
} }
pkgs/development/libraries/gstreamer/good/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@ let
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-good-1.4.5"; name = "gst-plugins-good-1.6.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Gstreamer Good Plugins"; description = "Gstreamer Good Plugins";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"; sha256 = "0darc3058kbnql3mnlpizl0sq0hhli7vkm0rpqb7nywz14abim46";
}; };
nativeBuildInputs = [ pkgconfig python ]; nativeBuildInputs = [ pkgconfig python ];
pkgs/development/libraries/gstreamer/libav/default.nix
+5 -2
View File
@@ -3,10 +3,13 @@
, withSystemLibav ? true, libav ? null , withSystemLibav ? true, libav ? null
}: }:
# Note that since gst-libav-1.6, libav is actually ffmpeg. See
# http://gstreamer.freedesktop.org/releases/1.6/ for more info.
assert withSystemLibav -> libav != null; assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-libav-1.4.5"; name = "gst-libav-1.6.1";
meta = { meta = {
homepage = "http://gstreamer.freedesktop.org"; homepage = "http://gstreamer.freedesktop.org";
@@ -17,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"; sha256 = "1a9pc7zp5rg0cvpx8gqkr21w73i6p9xa505a34day9f8p3lfim94";
}; };
configureFlags = stdenv.lib.optionalString withSystemLibav configureFlags = stdenv.lib.optionalString withSystemLibav
pkgs/development/libraries/gstreamer/ugly/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-ugly-1.4.5"; name = "gst-plugins-ugly-1.6.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Gstreamer Ugly Plugins"; description = "Gstreamer Ugly Plugins";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw"; sha256 = "0mvasl1pwq70w2kmrkcrg77kggl5q7jqybi7fkvy3vr28c7gkhqc";
}; };
nativeBuildInputs = [ pkgconfig python ]; nativeBuildInputs = [ pkgconfig python ];
pkgs/development/libraries/gstreamer/vaapi/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-vaapi-${version}"; name = "gst-vaapi-${version}";
version = "0.6.0"; version = "0.6.1";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n"; sha256 = "1cv7zlz5wj6b3acv0pr5cq5wqzd5vcs1lrrlvyl9wrzcnzz8mz1n";
}; };
nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -6518,7 +6518,7 @@ let
gperftools = callPackage ../development/libraries/gperftools { }; gperftools = callPackage ../development/libraries/gperftools { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; }); callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
}); });
gst_all = { gst_all = {