diff options
| author | Peter Simons <simons@cryp.to> | 2014-08-19 17:19:19 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-08-19 17:19:19 +0200 |
| commit | 301be245c4c6173076e9a61e8422902a3ff8ea89 (patch) | |
| tree | 04822023c90fa6037abdf896872a5f35bdcd91eb /pkgs | |
| parent | a72e2d6046ac0fabbbf8a8765c3572fd165e8ac3 (diff) | |
| parent | 4de6b9a0c79e6881ed688ef8bab45ce5d1fb9c9a (diff) | |
| download | nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.tar nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.tar.gz nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.tar.bz2 nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.tar.lz nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.tar.xz nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.tar.zst nixpkgs-301be245c4c6173076e9a61e8422902a3ff8ea89.zip | |
Merge pull request #3676 from ruediger/up/mplayer
mplayer: Update to 1.1.1.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f3cef6db69f..07bcb26569e 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, freetype, yasm , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null +, fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -25,6 +26,7 @@ assert fontconfigSupport -> (fontconfig != null); assert (!fontconfigSupport) -> (freefont_ttf != null); +assert fribidiSupport -> (fribidi != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); @@ -78,7 +80,7 @@ let in stdenv.mkDerivation rec { - name = "mplayer-1.1"; + name = "mplayer-1.1.1"; src = fetchurl { # Old kind of URL: @@ -89,8 +91,8 @@ stdenv.mkDerivation rec { #url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2; #sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb"; - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz"; - sha256 = "173cmsfz7ckzy1hay9mpnc5as51127cfnxl20b521d2jvgm4gjvn"; + url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz"; + sha256 = "ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76"; }; prePatch = '' @@ -100,6 +102,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig freetype ] ++ optional fontconfigSupport fontconfig + ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext mesa ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv @@ -150,6 +153,7 @@ stdenv.mkDerivation rec { ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} + ${optionalString fribidiSupport "--enable-fribidi"} --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc @@ -160,6 +164,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = with stdenv.lib; optional fontconfigSupport "-lfontconfig" + ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] ; |