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

Merge pull request #3676 from ruediger/up/mplayer

Browse Source 
mplayer: Update to 1.1.1.
This commit is contained in:
Peter Simons 2014-08-19 17:19:19 +02:00
commit 301be245c4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/video/mplayer/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, yasm { stdenv, fetchurl, pkgconfig, freetype, yasm
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
, xineramaSupport ? true, libXinerama ? null , xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null , xvSupport ? true, libXv ? null
@ -25,6 +26,7 @@
assert fontconfigSupport -> (fontconfig != null); assert fontconfigSupport -> (fontconfig != null);
assert (!fontconfigSupport) -> (freefont_ttf != null); assert (!fontconfigSupport) -> (freefont_ttf != null);
assert fribidiSupport -> (fribidi != null);
assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null);
assert xineramaSupport -> (libXinerama != null && x11Support); assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support); assert xvSupport -> (libXv != null && x11Support);
@ -78,7 +80,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mplayer-1.1"; name = "mplayer-1.1.1";
src = fetchurl { src = fetchurl {
# Old kind of URL: # Old kind of URL:
@ -89,8 +91,8 @@ stdenv.mkDerivation rec {
#url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2; #url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2;
#sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb"; #sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb";
url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz"; url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz";
sha256 = "173cmsfz7ckzy1hay9mpnc5as51127cfnxl20b521d2jvgm4gjvn"; sha256 = "ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76";
}; };
prePatch = '' prePatch = ''
@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig freetype ] [ pkgconfig freetype ]
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi
++ optionals x11Support [ libX11 libXext mesa ] ++ optionals x11Support [ libX11 libXext mesa ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional xvSupport libXv ++ optional xvSupport libXv
@ -150,6 +153,7 @@ stdenv.mkDerivation rec {
${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
${optionalString fribidiSupport "--enable-fribidi"}
--disable-xanim --disable-xanim
--disable-ivtv --disable-ivtv
--disable-xvid --disable-xvid-lavc --disable-xvid --disable-xvid-lavc
@ -160,6 +164,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = with stdenv.lib; NIX_LDFLAGS = with stdenv.lib;
optional fontconfigSupport "-lfontconfig" optional fontconfigSupport "-lfontconfig"
++ optional fribidiSupport "-lfribidi"
++ optionals x11Support [ "-lX11" "-lXext" ] ++ optionals x11Support [ "-lX11" "-lXext" ]
; ;