Updating gstreamer, and setting some patch tricks so it builds with gnumake 3.82
svn path=/nixpkgs/branches/stdenv-updates/; revision=23579
This commit is contained in:
parent
a88f348d5b
commit
4b9c06ee6e
@ -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) {
|
||||
|
@ -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 ];
|
||||
|
@ -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 ];
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
'';
|
||||
|
Loading…
x
Reference in New Issue
Block a user