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

* Enable Xinerama support in MPlayer.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4163
This commit is contained in:
Eelco Dolstra 2005-10-29 19:07:27 +00:00
parent 27e06147ad
commit 9b6e112573
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/video/MPlayer/default.nix
View File

@ -1,20 +1,22 @@
{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
, xineramaSupport ? false
, stdenv, fetchurl, x11, freetype, zlib , stdenv, fetchurl, x11, freetype, zlib
, alsa ? null, libXv ? null, libtheora ? null, libcaca ? null , alsa ? null, libXv ? null, libtheora ? null, libcaca ? null, libXinerama ? null
}: }:
assert alsaSupport -> alsa != null; assert alsaSupport -> alsa != null;
assert xvSupport -> libXv != null; assert xvSupport -> libXv != null;
assert theoraSupport -> libtheora != null; assert theoraSupport -> libtheora != null;
assert cacaSupport -> libcaca != null; assert cacaSupport -> libcaca != null;
assert xineramaSupport -> libXinerama != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "MPlayer-1.0pre7"; name = "MPlayer-1.0pre7";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre7.tar.bz2; url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre7try2.tar.bz2;
md5 = "5fadd6957d3aab989cd760ff38fb8fdf"; md5 = "aaca4fd327176c1afb463f0f047ef6f4";
}; };
fonts = fetchurl { fonts = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2;
@ -31,6 +33,7 @@ stdenv.mkDerivation {
(if xvSupport then libXv else null) (if xvSupport then libXv else null)
(if theoraSupport then libtheora else null) (if theoraSupport then libtheora else null)
(if cacaSupport then libcaca else null) (if cacaSupport then libcaca else null)
(if xineramaSupport then libXinerama else null)
]; ];
configureFlags = if cacaSupport then "--enable-caca" else "--disable-caca"; configureFlags = if cacaSupport then "--enable-caca" else "--disable-caca";

3
pkgs/system/all-packages-generic.nix
View File

@ -1577,11 +1577,12 @@ rec {
MPlayer = (import ../applications/video/MPlayer) { MPlayer = (import ../applications/video/MPlayer) {
inherit fetchurl stdenv freetype x11 zlib libtheora libcaca; inherit fetchurl stdenv freetype x11 zlib libtheora libcaca;
inherit (xlibs) libXv; inherit (xlibs) libXv libXinerama;
alsaSupport = true; alsaSupport = true;
alsa = alsaLib; alsa = alsaLib;
theoraSupport = true; theoraSupport = true;
cacaSupport = true; cacaSupport = true;
xineramaSupport = true;
}; };
MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) { MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) {