JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Updated xine-lib and xine-ui.

Browse Source 
* xine-ui: compile with Xinerama support if xine-lib was also built
  with it.

svn path=/nixpkgs/trunk/; revision=4165
This commit is contained in:
Eelco Dolstra 2005-10-29 20:50:11 +00:00
parent 0e25817b25
commit 34a3dbbb1d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,11 +1,14 @@
{stdenv, fetchurl, x11, xineLib, libpng}: {stdenv, fetchurl, x11, xineLib, libpng}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xine-ui-0.99.3"; name = "xine-ui-0.99.4";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz; url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.4.tar.gz;
md5 = "aa7805a93e511e3d67dc1bf09a71fcdd"; md5 = "90ea1f76747e9788a30a73e7f4a76cf6";
}; };
buildInputs = [x11 xineLib libpng]; buildInputs = [
x11 xineLib libpng
(if xineLib.xineramaSupport then xineLib.libXinerama else null)
];
configureFlags = "--without-readline"; configureFlags = "--without-readline";
} }

10
pkgs/development/libraries/xine-lib/default.nix
View File

@ -11,12 +11,12 @@ assert xineramaSupport -> libXinerama != null;
assert encryptedDVDSupport -> libdvdcss != null; assert encryptedDVDSupport -> libdvdcss != null;
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
stdenv.mkDerivation { (stdenv.mkDerivation {
name = "xine-lib-1.0.1"; name = "xine-lib-1.1.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.1.tar.gz; url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.1.0.tar.gz;
md5 = "9be804b337c6c3a2e202c5a7237cb0f8"; md5 = "3537cfd58d253b4be20a4975e7086e38";
}; };
buildInputs = [ buildInputs = [
x11 x11
@ -27,4 +27,4 @@ stdenv.mkDerivation {
libXv = if xvideoSupport then libXv else null; libXv = if xvideoSupport then libXv else null;
libdvdcss = if encryptedDVDSupport then libdvdcss else null; libdvdcss = if encryptedDVDSupport then libdvdcss else null;
propagatedBuildInputs = [zlib]; propagatedBuildInputs = [zlib];
} }) // {inherit xineramaSupport libXinerama;}