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

mplayer: Add GNU FriBiDi support.

Browse Source 
This is required by new versions of SMPlayer and other distros seem to
enable it by default now as well.
This commit is contained in:
Rüdiger Sonderfeld 2014-08-19 16:24:58 +02:00
parent 033c9bd18c
commit 4de6b9a0c7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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);
@ -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" ]
; ;