alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Make mplayer build on the loongson2f

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23578
This commit is contained in:
Lluís Batlle i Rossell 2010-09-01 08:36:09 +00:00
parent 50b3cc05c7
commit a88f348d5b
4 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/video/MPlayer/default.nix
View file

@ -5,7 +5,7 @@
, libXinerama ? null, libXrandr ? null, libdvdnav ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null
, cdparanoia ? null, cddaSupport ? true , cdparanoia ? null, cddaSupport ? true
, amrnb ? null, amrwb ? null, amrSupport ? false , amrnb ? null, amrwb ? null, amrSupport ? false
, x11Support ? true, libX11 ? null , x11Support ? true, libX11 ? null, libXext ? null
, jackaudioSupport ? false, jackaudio ? null , jackaudioSupport ? false, jackaudio ? null
, x264Support ? false, x264 ? null , x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null , xvidSupport ? false, xvidcore ? null
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ freetype zlib pkgconfig ] [ freetype zlib pkgconfig ]
++ stdenv.lib.optional x11Support [ libX11 mesa ] ++ stdenv.lib.optional x11Support [ libX11 libXext mesa ]
++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional alsaSupport alsaLib
++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional xvSupport libXv
++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional theoraSupport libtheora
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""} ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""}
${if codecs != null then "--codecsdir=${codecs}" else ""} ${if codecs != null then "--codecsdir=${codecs}" else ""}
--enable-runtime-cpudetection ${if (stdenv.isi686 || stdenv.isx86_64) then "--enable-runtime-cpudetection" else ""}
${if x11Support then "--enable-x11" else ""} ${if x11Support then "--enable-x11" else ""}
--disable-xanim --disable-xanim
--disable-ivtv --disable-ivtv

39
pkgs/development/libraries/ffmpeg/default.nix
View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm {stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm
, libvpx}: , vpxSupport ? false, libvpx ? null}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ffmpeg-0.6"; name = "ffmpeg-0.6";
@ -12,25 +12,26 @@ stdenv.mkDerivation {
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed # the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications. # applications.
configureFlags = '' configureFlags = [
--enable-gpl "--enable-gpl"
--enable-postproc "--enable-postproc"
--enable-swscale "--enable-swscale"
--disable-ffserver "--disable-ffserver"
--disable-ffplay "--disable-ffplay"
--enable-libfaad "--enable-libfaad"
--enable-shared "--enable-shared"
--enable-libtheora "--enable-libtheora"
--enable-libvorbis "--enable-libvorbis"
--enable-libspeex "--enable-libspeex"
--enable-libx264 "--enable-libx264"
--enable-libxvid "--enable-libxvid"
--enable-libmp3lame "--enable-libmp3lame"
--enable-runtime-cpudetect "--enable-runtime-cpudetect"
--enable-libvpx ] ++
''; stdenv.lib.optional vpxSupport "--enable-libvpx";
buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm libvpx]; buildInputs = [ faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm ]
++ stdenv.lib.optional vpxSupport libvpx;
meta = { meta = {
homepage = http://www.ffmpeg.org/; homepage = http://www.ffmpeg.org/;

15
pkgs/development/libraries/libvpx/default.nix
View file

@ -11,14 +11,25 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \ sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \
examples/gen_example_code.sh examples/gen_example_code.sh
sed -e '/enable linux/d' -i configure
''; '';
configurePhase = '' configureScript = "../configure";
preConfigure = ''
mkdir -p build mkdir -p build
cd build cd build
../configure --disable-install-srcs --disable-examples --enable-vp8 --enable-runtime-cpu-detect --enable-shared --enable-pic
''; '';
configureFlags = [
"--disable-install-srcs"
"--disable-examples"
"--enable-vp8"
"--enable-runtime-cpu-detect"
"--enable-shared"
"--enable-pic"
];
installPhase = '' installPhase = ''
make quiet=false DIST_DIR=$out install make quiet=false DIST_DIR=$out install
''; '';

4
pkgs/top-level/all-packages.nix
View file

@ -2723,7 +2723,9 @@ let
fcgi = callPackage ../development/libraries/fcgi { }; fcgi = callPackage ../development/libraries/fcgi { };
ffmpeg = callPackage ../development/libraries/ffmpeg { }; ffmpeg = callPackage ../development/libraries/ffmpeg {
vpxSupport = if !stdenv.isMips then true else false;
};
fftw = callPackage ../development/libraries/fftw { fftw = callPackage ../development/libraries/fftw {
singlePrecision = false; singlePrecision = false;