Found a new phonon (in 'unstable'), and I think kde-4.4 should be able to link with it.

I updated gstreamer too, because this phonon was not finding a header file. As that
did not fix much the phonon build, I helped the generic builder with NIX_CFLAGS_COMPILER for
phonon to find the proper header files. Either the phonon cmake scripts don't find properly
the gstreamer plugins header file, or we install gstreamer in a strange way.

svn path=/nixpkgs/trunk/; revision=19974
This commit is contained in:
Lluís Batlle i Rossell 2010-02-13 14:03:07 +00:00
parent e4b1633d6b
commit ce46e7ff63
7 changed files with 17 additions and 13 deletions

View file

@ -3,12 +3,13 @@
, gst_all, xineLib, automoc4}:
stdenv.mkDerivation {
name = "phonon-4.3.1";
name = "phonon-4.3.80";
src = fetchurl {
url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2;
sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
url = mirror://kde/unstable/phonon/phonon-4.3.80.tar.bz2;
sha256 = "1v4ba2ddphkv0gjki5das5brd1wp4nf5ci73c7r1pnyp8mgjkjw9";
};
includeAllQtDirs=true;
NIX_CFLAGS_COMPILE = "-I${gst_all.gstPluginsBase}/include/${gst_all.prefix}";
buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
meta = {
description = "KDE Multimedia API";

View file

@ -27,4 +27,7 @@ rec {
gnonlin = makeOverridable (import ./gnonlin) {
inherit fetchurl stdenv pkgconfig gstreamer gstPluginsBase;
};
# Header files are in include/${prefix}/
prefix = "gstreamer-0.10";
}

View file

@ -1,14 +1,14 @@
args: with args;
stdenv.mkDerivation rec {
name = "gnonlin-0.10.10";
name = "gnonlin-0.10.14";
src = fetchurl {
urls = [
"http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.gz"
"mirror://gentoo/distfiles/${name}.tar.gz"
];
sha256 = "041in2y0x3755hw29rhnyhsh216v2fl1q1p12m9faxiv2r52x83y";
sha256 = "10gp3hz9a6hrrmdaa3i2ry79fyr402il1qr0vpsd6ayn02gcj93w";
};
buildInputs = [ gstPluginsBase gstreamer pkgconfig ];

View file

@ -1,14 +1,14 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, ... }:
stdenv.mkDerivation rec {
name = "gst-ffmpeg-0.10.5";
name = "gst-ffmpeg-0.10.9";
src = fetchurl {
urls = [
"http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik";
sha256 = "05cg5jzl8wccsr495hgs7cgdkc6dfi1v218fsm5fv2slgly1pvb3";
};
propagatedBuildInputs = [ gstPluginsBase ];

View file

@ -4,14 +4,14 @@
, liboil, gtk, which, gtkdoc, ... }:
stdenv.mkDerivation rec {
name = "gst-plugins-base-0.10.25";
name = "gst-plugins-base-0.10.26";
src = fetchurl {
urls = [
"${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "01s61nm1svs2lqlpjlp3yywa3m39p81awklwx4dszrqqv3hzgcha";
sha256 = "0znxs3ls0hgc7vmllna3bazw217q1h9lmn5vhnclfadbb3flhvg0";
};
patchPhase = "sed -i 's@/bin/echo@echo@g' configure";

View file

@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-good-0.10.14";
name = "gst-plugins-good-0.10.18";
src = fetchurl {
urls = [
"${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "12kq60zdqxkshpjr76iwzykzhjaq3g1rm81nz7b0x44rrc0ms80j";
sha256 = "1fabn9h4z1p4h35nrw9fyjhcnl1z6cnikmpcb9q6fd312mr8hfqj";
};
propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg

View file

@ -2,14 +2,14 @@
, which, gtkdoc, glib, libxml2, ... }:
stdenv.mkDerivation rec {
name = "gstreamer-0.10.25";
name = "gstreamer-0.10.26";
src = fetchurl {
urls = [
"${meta.homepage}/src/gstreamer/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "0y35a9b2m66rsxlkksakdbimfxy2j5q1wim9k3czd3gs7dxvmcir";
sha256 = "1gah0ggfavl5z2wmwmwgs3h3ppwk6q1a6k0klk7zj1ph5n2isbc6";
};
buildInputs = [perl bison flex pkgconfig python which gtkdoc ];