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

add jpeg support to mplayer and mplayer2

Browse Source 
Closes #4288
This commit is contained in:
muflax 2014-09-27 07:06:54 +01:00 committed by Mateusz Kowalczyk
parent ff8f23ab26
commit 5861898fc2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
, bs2bSupport ? false, libbs2b ? null , bs2bSupport ? false, libbs2b ? null
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
, libjpegSupport ? true, libjpeg ? null
, useUnfreeCodecs ? false , useUnfreeCodecs ? false
}: }:
@ -46,6 +47,7 @@ assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null; assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
assert libjpegSupport -> libjpeg != null;
let let
@ -121,6 +123,7 @@ stdenv.mkDerivation rec {
++ optional vdpauSupport libvdpau ++ optional vdpauSupport libvdpau
++ optional speexSupport speex ++ optional speexSupport speex
++ optional libpngSupport libpng ++ optional libpngSupport libpng
++ optional libjpegSupport libjpeg
++ optional bs2bSupport libbs2b ++ optional bs2bSupport libbs2b
; ;

3
pkgs/applications/video/mplayer2/default.nix
View File

@ -15,6 +15,7 @@
, bs2bSupport ? false, libbs2b ? null , bs2bSupport ? false, libbs2b ? null
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
, libjpegSupport ? true, libjpeg ? null
, useUnfreeCodecs ? false , useUnfreeCodecs ? false
}: }:
@ -32,6 +33,7 @@ assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null; assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
assert libjpegSupport -> libjpeg != null;
let let
@ -96,6 +98,7 @@ stdenv.mkDerivation rec {
++ optional speexSupport speex ++ optional speexSupport speex
++ optional bs2bSupport libbs2b ++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng ++ optional libpngSupport libpng
++ optional libjpegSupport libjpeg
; ;
nativeBuildInputs = [ yasm python3 ]; nativeBuildInputs = [ yasm python3 ];