diff options
Diffstat (limited to 'pkgs/applications/video/MPlayer/default.nix')
-rw-r--r-- | pkgs/applications/video/MPlayer/default.nix | 67 |
1 files changed, 29 insertions, 38 deletions
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 0c1e9548c8d..6d2de592f42 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -1,10 +1,11 @@ { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true -, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib +, stdenv, fetchurl, x11, freetype, fontconfig, zlib , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null , cdparanoia ? null, cddaSupport ? true , amrnb ? null, amrwb ? null, amrSupport ? false +, jackaudioSupport ? false, jackaudio ? null , mesa, pkgconfig, unzip }: @@ -16,78 +17,68 @@ assert xineramaSupport -> libXinerama != null; assert randrSupport -> libXrandr != null; assert dvdnavSupport -> libdvdnav != null; assert cddaSupport -> cdparanoia != null; +assert jackaudioSupport -> jackaudio != null; assert amrSupport -> (amrnb != null && amrwb != null); let - win32codecs = (import ./win32codecs) { - inherit stdenv fetchurl; - }; + codecs = stdenv.mkDerivation { + name = "MPlayer-codecs-essential-20071007"; + + src = fetchurl { + url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2; + sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; + }; - rp9codecs = (import ./rp9codecs) { - inherit stdenv fetchurl; + installPhase = '' + mkdir $out + cp -prv * $out + ''; + + meta = { + license = "unfree"; + }; }; - srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-530.zip; - sha256 = "1qyla52jjymhcnbidhwc6a1vm4v1wl27mj4ygp3cpn33swcmkgd0"; - }; - - srcAmrFloat = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip; - sha256 = "1d337h3051w7azipsq7nzf4d25csia2snq3qlhw2sj7282ab042z"; - }; - - srcAmrWBFloat = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-540.zip; - sha256 = "1mb7g3fy5faz26jjbibxvlbb5b81vwmdsldl3kl8hzg14vcrv1q9"; - }; - -in +in stdenv.mkDerivation { - name = "MPlayer-1.0rc2-r28450"; + name = "MPlayer-1.0-pre-rc4-20100213"; - # 1.0_rc2 is outdated according to website - use trunk instead src = fetchurl { - url = mirror://gentoo/distfiles/mplayer-1.0_rc2_p28450.tar.bz2; - sha256 = "0cbils58mq20nablywgjfpfx2pzjgnhin23sb8k1s5h2rxgvi3vf"; + url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100213.tbz2; + sha256 = "1c5w49vqavs9pnc5av89v502wfa5g7hfn65ffhpx25ddi1irzh2r"; }; buildInputs = - [x11 libXv freetype zlib mesa pkgconfig] + [ x11 libXv freetype zlib mesa pkgconfig ] ++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional cacaSupport libcaca ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optional randrSupport libXrandr - ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread] + ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ stdenv.lib.optional cddaSupport cdparanoia - ++ stdenv.lib.optionals amrSupport [amrnb amrwb]; + ++ stdenv.lib.optional jackaudioSupport jackaudio + ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]; configureFlags = '' ${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} - --win32codecsdir=${win32codecs} - --realcodecsdir=${rp9codecs} + --codecsdir=${codecs} --enable-runtime-cpudetection - --enable-x11 --with-extraincdir=${libX11}/include + --enable-x11 --disable-xanim --disable-ivtv ''; NIX_LDFLAGS = "-lX11 -lXext"; - # Provide a reasonable standard font. Maybe we should symlink here. - postInstall = '' - ensureDir $out/share/mplayer - cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf - ''; - meta = { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } |