commit 5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

add jpeg support to mplayer and mplayer2

Closes #4288

authored by muflax and committed by Mateusz Kowalczyk 11 years ago 5861898f ff8f23ab

2 changed files

expand all

unified split

pkgs

applications

video

mplayer

default.nix

mplayer2

default.nix

pkgs/applications/video/mplayer/default.nix

··· 21 , bs2bSupport ? false, libbs2b ? null 22 # For screenshots 23 , libpngSupport ? true, libpng ? null 24 , useUnfreeCodecs ? false 25 }: 26 ··· 46 assert pulseSupport -> pulseaudio != null; 47 assert bs2bSupport -> libbs2b != null; 48 assert libpngSupport -> libpng != null; 49 50 let 51 ··· 121 ++ optional vdpauSupport libvdpau 122 ++ optional speexSupport speex 123 ++ optional libpngSupport libpng 124 ++ optional bs2bSupport libbs2b 125 ; 126

··· 21 , bs2bSupport ? false, libbs2b ? null 22 # For screenshots 23 , libpngSupport ? true, libpng ? null 24 + , libjpegSupport ? true, libjpeg ? null 25 , useUnfreeCodecs ? false 26 }: 27 ··· 47 assert pulseSupport -> pulseaudio != null; 48 assert bs2bSupport -> libbs2b != null; 49 assert libpngSupport -> libpng != null; 50 + assert libjpegSupport -> libjpeg != null; 51 52 let 53 ··· 123 ++ optional vdpauSupport libvdpau 124 ++ optional speexSupport speex 125 ++ optional libpngSupport libpng 126 + ++ optional libjpegSupport libjpeg 127 ++ optional bs2bSupport libbs2b 128 ; 129

pkgs/applications/video/mplayer2/default.nix

··· 15 , bs2bSupport ? false, libbs2b ? null 16 # For screenshots 17 , libpngSupport ? true, libpng ? null 18 , useUnfreeCodecs ? false 19 }: 20 ··· 32 assert pulseSupport -> pulseaudio != null; 33 assert bs2bSupport -> libbs2b != null; 34 assert libpngSupport -> libpng != null; 35 36 let 37 ··· 96 ++ optional speexSupport speex 97 ++ optional bs2bSupport libbs2b 98 ++ optional libpngSupport libpng 99 ; 100 101 nativeBuildInputs = [ yasm python3 ];

··· 15 , bs2bSupport ? false, libbs2b ? null 16 # For screenshots 17 , libpngSupport ? true, libpng ? null 18 + , libjpegSupport ? true, libjpeg ? null 19 , useUnfreeCodecs ? false 20 }: 21 ··· 33 assert pulseSupport -> pulseaudio != null; 34 assert bs2bSupport -> libbs2b != null; 35 assert libpngSupport -> libpng != null; 36 + assert libjpegSupport -> libjpeg != null; 37 38 let 39 ··· 98 ++ optional speexSupport speex 99 ++ optional bs2bSupport libbs2b 100 ++ optional libpngSupport libpng 101 + ++ optional libjpegSupport libjpeg 102 ; 103 104 nativeBuildInputs = [ yasm python3 ];