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

* Added libcaca.

Browse Source 
* Libcaca support in MPlayer.
* Hopefully fix X11 detection in MPlayer.

svn path=/nixpkgs/trunk/; revision=3684
This commit is contained in:
Eelco Dolstra 2005-08-24 15:02:30 +00:00
parent 99780f00ce
commit c0506b8029
5 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/MPlayer/builder.sh
View File

@ -11,7 +11,9 @@ postUnpack=postUnpack
configureFlags="\ configureFlags="\
--with-win32libdir=$win32codecs \ --with-win32libdir=$win32codecs \
--with-reallibdir=$win32codecs \ --with-reallibdir=$win32codecs \
--enable-runtime-cpudetection" --enable-runtime-cpudetection \
--enable-x11 --with-x11incdir=/no-such-dir --with-x11libdir=/no-such-dir
$configureFlags"
postInstall() { postInstall() {
cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font

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

@ -1,10 +1,12 @@
{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
, stdenv, fetchurl, x11, freetype, zlib , stdenv, fetchurl, x11, freetype, zlib
, alsa ? null, libXv ? null, libtheora ? null}: , alsa ? null, libXv ? null, libtheora ? null, libcaca ? null
}:
assert alsaSupport -> alsa != null; assert alsaSupport -> alsa != null;
assert xvSupport -> libXv != null; assert xvSupport -> libXv != null;
assert theoraSupport -> libtheora != null; assert theoraSupport -> libtheora != null;
assert cacaSupport -> libcaca != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "MPlayer-1.0pre7"; name = "MPlayer-1.0pre7";
@ -28,5 +30,8 @@ stdenv.mkDerivation {
(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) (if theoraSupport then libtheora else null)
(if cacaSupport then libcaca else null)
]; ];
configureFlags = if cacaSupport then "--enable-caca" else "--disable-caca";
} }

6
pkgs/development/libraries/libcaca/builder.sh Normal file
View File

@ -0,0 +1,6 @@
source $stdenv/setup
configureFlags="--disable-x11 --disable-imlib2 --disable-doc"
export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses -I$ncurses/include $NIX_CFLAGS_COMPILE"
genericBuild

12
pkgs/development/libraries/libcaca/default.nix Normal file
View File

@ -0,0 +1,12 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation {
name = "libcaca-0.9";
builder = ./builder.sh;
src = fetchurl {
url = http://sam.zoy.org/libcaca/libcaca-0.9.tar.bz2;
md5 = "c7d5c46206091a9203fcb214abb25e4a";
};
inherit ncurses;
propagatedBuildInputs = [ncurses];
}

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

@ -721,6 +721,10 @@ rec {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
libcaca = (import ../development/libraries/libcaca) {
inherit fetchurl stdenv ncurses;
};
libsigsegv = (import ../development/libraries/libsigsegv) { libsigsegv = (import ../development/libraries/libsigsegv) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -1279,11 +1283,12 @@ rec {
}; };
MPlayer = (import ../applications/video/MPlayer) { MPlayer = (import ../applications/video/MPlayer) {
inherit fetchurl stdenv freetype x11 zlib libtheora; inherit fetchurl stdenv freetype x11 zlib libtheora libcaca;
inherit (xlibs) libXv; inherit (xlibs) libXv;
alsaSupport = true; alsaSupport = true;
alsa = alsaLib; alsa = alsaLib;
theoraSupport = true; theoraSupport = true;
cacaSupport = true;
}; };
MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) { MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) {