* Xine updated to 1.0.
* Xine UI updated to 0.99.3. svn path=/nixpkgs/trunk/; revision=2046
This commit is contained in:
parent
a1f2fad0fe
commit
c90e049b98
|
@ -1,11 +1,10 @@
|
|||
{stdenv, fetchurl, x11, xineLib, libpng}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xine-ui-0.99.2";
|
||||
# builder = ./builder.sh;
|
||||
name = "xine-ui-0.99.3";
|
||||
src = fetchurl {
|
||||
url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.2.tar.gz;
|
||||
md5 = "4a4cf5cc68bf65e6845f501ea87fdf94";
|
||||
url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.3.tar.gz;
|
||||
md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
|
||||
};
|
||||
buildInputs = [x11 xineLib libpng];
|
||||
configureFlags = "--without-readline";
|
||||
|
|
|
@ -6,4 +6,8 @@ if test -n "$libdvdcss"; then
|
|||
export NIX_LDFLAGS="-rpath $libdvdcss/lib -L$libdvdcss/lib -ldvdcss $NIX_LDFLAGS"
|
||||
fi
|
||||
|
||||
if test -n "$libXv"; then
|
||||
configureFlags="--with-xv-path=$libXv/lib $configureFlags"
|
||||
fi
|
||||
|
||||
genericBuild
|
|
@ -12,11 +12,11 @@ assert encryptedDVDSupport -> libdvdcss != null;
|
|||
assert alsaSupport -> alsaLib != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xine-lib-1-pre-rc7";
|
||||
name = "xine-lib-1.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz;
|
||||
md5 = "b3eaa0dd44fdbb8e3915399895c8414a";
|
||||
url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.tar.gz;
|
||||
md5 = "96e5195c366064e7778af44c3e71f43a";
|
||||
};
|
||||
buildInputs = [
|
||||
x11
|
||||
|
@ -24,6 +24,7 @@ stdenv.mkDerivation {
|
|||
(if xineramaSupport then libXinerama else null)
|
||||
(if alsaSupport then alsaLib else null)
|
||||
];
|
||||
libXv = if xvideoSupport then libXv else null;
|
||||
libdvdcss = if encryptedDVDSupport then libdvdcss else null;
|
||||
propagatedBuildInputs = [zlib];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue