diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-28 17:43:05 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-28 17:43:05 +0100 |
| commit | 163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b (patch) | |
| tree | 3dc6c0c2ca34b3ab717842fa248760b9ec81db11 /pkgs/development/libraries/gstreamer | |
| parent | dbedbdc9397283c39aa9e572567613e3098b07c0 (diff) | |
| download | nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.tar nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.tar.gz nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.tar.bz2 nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.tar.lz nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.tar.xz nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.tar.zst nixlib-163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b.zip | |
gst-plugins-good: Fix build
http://hydra.nixos.org/build/3891290
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 4298a88f65e8..85468b309c55 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,16 +5,18 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.30"; + name = "gst-plugins-good-0.10.31"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i"; + sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy"; }; + patches = [ ./v4l.patch ]; + configureFlags = "--disable-oss"; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch b/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch new file mode 100644 index 000000000000..22cff574134f --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch @@ -0,0 +1,11 @@ +diff -ru -x '*~' gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c +--- gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c 2011-12-30 14:59:13.000000000 +0100 ++++ gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c 2013-01-28 17:41:25.549523708 +0100 +@@ -181,7 +181,6 @@ + GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", + ret->vbuffer.m.offset); + GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); +- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); + + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, + PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, |