From 4b9c06ee6ed5839f46b982839567bbf313d9bb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 1 Sep 2010 08:36:24 +0000 Subject: [PATCH] Updating gstreamer, and setting some patch tricks so it builds with gnumake 3.82 svn path=/nixpkgs/branches/stdenv-updates/; revision=23579 --- pkgs/development/libraries/gstreamer/default.nix | 2 +- .../libraries/gstreamer/gnonlin/default.nix | 8 ++++---- .../libraries/gstreamer/gst-ffmpeg/default.nix | 4 ++-- .../libraries/gstreamer/gst-plugins-base/default.nix | 9 ++++++--- .../libraries/gstreamer/gst-plugins-good/default.nix | 4 ++-- .../libraries/gstreamer/gstreamer/default.nix | 12 ++++++++---- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 3bb8ea84a2a..a41e6948892 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -2,7 +2,7 @@ args: with args; rec { gstreamer = makeOverridable (import ./gstreamer) { inherit (args) fetchurl stdenv perl bison flex - pkgconfig python which gtkdoc glib libxml2; + pkgconfig python which glib libxml2; }; gstPluginsBase = makeOverridable (import ./gst-plugins-base) { diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 35f7f3b0986..aac3889ecd7 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -1,14 +1,14 @@ args: with args; stdenv.mkDerivation rec { - name = "gnonlin-0.10.14"; + name = "gnonlin-0.10.15"; src = fetchurl { urls = [ - "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.gz" - "mirror://gentoo/distfiles/${name}.tar.gz" + "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" + "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "10gp3hz9a6hrrmdaa3i2ry79fyr402il1qr0vpsd6ayn02gcj93w"; + sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0"; }; buildInputs = [ gstPluginsBase gstreamer pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index c45af907aab..65eb2bb034f 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }: stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.9"; + name = "gst-ffmpeg-0.10.11"; src = fetchurl { urls = [ "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "05cg5jzl8wccsr495hgs7cgdkc6dfi1v218fsm5fv2slgly1pvb3"; + sha256 = "0bk9k9sccx9nvhjakacvq8gd6vp63x9ddmjrqkfdhkmgwlwa2dpz"; }; propagatedBuildInputs = [ gstPluginsBase ]; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 37d0a058fff..db817918e02 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -4,17 +4,20 @@ , liboil, gtk, which, gtkdoc }: stdenv.mkDerivation rec { - name = "gst-plugins-base-0.10.26"; + name = "gst-plugins-base-0.10.30"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "0znxs3ls0hgc7vmllna3bazw217q1h9lmn5vhnclfadbb3flhvg0"; + sha256 = "1mw5n1w7l0hgyzf75srdxlh3knfgrmddbs2ah1f97s8b710qd4v3"; }; - patchPhase = "sed -i 's@/bin/echo@echo@g' configure"; + patchPhase = '' + sed -i 's@/bin/echo@echo@g' configure + sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in + ''; # TODO : v4l, libvisual propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 2998c89a51e..8256a0afd45 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.18"; + name = "gst-plugins-good-0.10.24"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1fabn9h4z1p4h35nrw9fyjhcnl1z6cnikmpcb9q6fd312mr8hfqj"; + sha256 = "1gnhw86yx0362hvmnihiq5d7i710ag9zlg636dlcdvxqqp4slx7j"; }; propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 91a699f564f..abb445b57a3 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, perl, bison, flex, pkgconfig, python -, which, gtkdoc, glib, libxml2 }: +, which, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.10.26"; + name = "gstreamer-0.10.30"; # TODO: Remove gtkdoc dependency on next upgrade src = fetchurl { @@ -10,12 +10,16 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gstreamer/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1gah0ggfavl5z2wmwmwgs3h3ppwk6q1a6k0klk7zj1ph5n2isbc6"; + sha256 = "0ajkfkchwpk5zlcis19laqbv84mi61cn3cqbdbrpyy93whdk1vz8"; }; - buildInputs = [perl bison flex pkgconfig python which gtkdoc ]; + buildInputs = [perl bison flex pkgconfig python which ]; propagatedBuildInputs = [glib libxml2]; + patchPhase = '' + sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in + ''; + configureFlags = '' --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook '';