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

* Added Ogg Theora support to MPlayer.

Browse Source 
svn path=/nixpkgs/trunk/; revision=2245
This commit is contained in:
Eelco Dolstra 2005-02-16 16:18:43 +00:00
parent 31c65a13a1
commit 419f172ddb
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/MPlayer/default.nix
View File

@ -1,8 +1,10 @@
{ alsaSupport ? false, xvSupport ? true { alsaSupport ? false, xvSupport ? true, theoraSupport ? false
, stdenv, fetchurl, x11, libXv, freetype, zlib, alsa ? null}: , stdenv, fetchurl, x11, freetype, zlib
, alsa ? null, libXv ? null, libtheora ? null}:
assert alsaSupport -> alsa != null; assert alsaSupport -> alsa != null;
assert xvSupport -> libXv != null; assert xvSupport -> libXv != null;
assert theoraSupport -> libtheora != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "MPlayer-1.0pre6"; name = "MPlayer-1.0pre6";
@ -25,5 +27,6 @@ stdenv.mkDerivation {
x11 libXv freetype zlib x11 libXv freetype zlib
(if alsaSupport then alsa else null) (if alsaSupport then alsa else null)
(if xvSupport then libXv else null) (if xvSupport then libXv else null)
(if theoraSupport then libtheora else null)
]; ];
} }

10
pkgs/development/libraries/libtheora/default.nix Normal file
View File

@ -0,0 +1,10 @@
{stdenv, fetchurl, libogg, libvorbis}:
stdenv.mkDerivation {
name = "libtheora-1.0alpha4";
src = fetchurl {
url = http://downloads.xiph.org/releases/theora/libtheora-1.0alpha4.tar.bz2;
md5 = "a71ac42ec0f848da327930841a80ff2b";
};
propagatedBuildInputs = [libogg libvorbis];
}

3
pkgs/development/libraries/libvorbis/default.nix
View File

@ -4,8 +4,7 @@ stdenv.mkDerivation {
name = "libvorbis-1.1.0"; name = "libvorbis-1.1.0";
src = fetchurl { src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libvorbis-1.1.0.tar.gz; url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libvorbis-1.1.0.tar.gz;
md5 = "bb764aeabde613d1a424a29b1f15e7e6" ; md5 = "bb764aeabde613d1a424a29b1f15e7e6";
}; };
buildInputs = [libogg]; buildInputs = [libogg];
} }

7
pkgs/system/all-packages-generic.nix
View File

@ -547,6 +547,10 @@ rec {
inherit fetchurl stdenv libogg; inherit fetchurl stdenv libogg;
}; };
libtheora = (import ../development/libraries/libtheora) {
inherit fetchurl stdenv libogg libvorbis;
};
libxml2 = (import ../development/libraries/libxml2) { libxml2 = (import ../development/libraries/libxml2) {
inherit fetchurl stdenv zlib python; inherit fetchurl stdenv zlib python;
}; };
@ -983,10 +987,11 @@ rec {
}; };
MPlayer = (import ../applications/video/MPlayer) { MPlayer = (import ../applications/video/MPlayer) {
inherit fetchurl stdenv freetype x11 zlib; inherit fetchurl stdenv freetype x11 zlib libtheora;
inherit (xlibs) libXv; inherit (xlibs) libXv;
alsaSupport = true; alsaSupport = true;
alsa = alsaLib; alsa = alsaLib;
theoraSupport = true;
}; };
MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) { MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) {