* xine-lib: updated to 1.1.16.3.
* xine-lib: dropped the dependency on SDL, which is not really necessary. (And it caused Phonon/KDE to depend on SDL.) svn path=/nixpkgs/trunk/; revision=16680
This commit is contained in:
parent
604d42d560
commit
4d7e5187d8
|
@ -11,13 +11,15 @@ stdenv.mkDerivation {
|
|||
buildInputs =
|
||||
[ pkgconfig xineLib libpng readline ncurses curl
|
||||
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
|
||||
] ++ stdenv.lib.optional xineLib.xineramaSupport xineLib.libXinerama;
|
||||
xlibs.libXinerama
|
||||
];
|
||||
|
||||
configureFlags = "--with-readline=${readline}";
|
||||
|
||||
NIX_LDFLAGS = "-lXext -lgcc_s";
|
||||
|
||||
meta = {
|
||||
meta = {
|
||||
homepage = http://www.xine-project.org/;
|
||||
description = "Xlib-based interface to Xine, a video player";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,14 +1,28 @@
|
|||
args: with args;
|
||||
{ stdenv, fetchurl, pkgconfig, xlibs, alsaLib, mesa, aalib
|
||||
, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
|
||||
}:
|
||||
|
||||
(stdenv.mkDerivation rec {
|
||||
name = "xine-lib-1.1.12";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xine-lib-1.1.16.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xine/${name}.tar.bz2";
|
||||
sha256 = "49088635c29a38527bd8590139691951783c5c1c7fdb691a8a3a9954097d4dd0";
|
||||
sha256 = "0lkvss7r8q16gyisiy3dkgbbk6vvpflfydi3927pvp2mz8g28nnj";
|
||||
};
|
||||
buildInputs = [ x11 pkgconfig libXv libXinerama alsaLib mesa aalib SDL
|
||||
libvorbis libtheora speex ];
|
||||
configureFlags = "--with-xv-path=${libXv}/lib";
|
||||
|
||||
buildInputs =
|
||||
[ xlibs.xlibs pkgconfig xlibs.libXv xlibs.libXinerama alsaLib mesa aalib
|
||||
libvorbis libtheora speex perl ffmpeg
|
||||
# removed SDL dependency; it's a big dependency and doesn't seem
|
||||
# particularly useful here.
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";
|
||||
|
||||
propagatedBuildInputs = [zlib];
|
||||
}) // { xineramaSupport = true; inherit libXinerama; }
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xine-project.org/;
|
||||
description = "A high-performance, portable and reusable multimedia playback engine";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4125,9 +4125,8 @@ let
|
|||
};
|
||||
|
||||
xineLib = import ../development/libraries/xine-lib {
|
||||
inherit fetchurl stdenv zlib x11 libdvdcss alsaLib pkgconfig mesa aalib SDL
|
||||
libvorbis libtheora speex;
|
||||
inherit (xlibs) libXv libXinerama;
|
||||
inherit fetchurl stdenv zlib libdvdcss alsaLib pkgconfig mesa aalib
|
||||
libvorbis libtheora speex xlibs perl ffmpeg;
|
||||
};
|
||||
|
||||
xautolock = import ../misc/screensavers/xautolock {
|
||||
|
|
Loading…
Reference in a new issue