GNU Gnash 0.8.9.

svn path=/nixpkgs/trunk/; revision=26498
This commit is contained in:
Ludovic Courtès 2011-03-24 22:25:03 +00:00
parent 7df7521dd1
commit 37e69af39e
2 changed files with 22 additions and 8 deletions

View File

@ -3,19 +3,21 @@
, gstFfmpeg, speex , gstFfmpeg, speex
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
, boost, freetype, agg, dbus, curl, pkgconfig, gettext , boost, freetype, agg, dbus, curl, pkgconfig, gettext
, glib, gtk, gtkglext, x11, ming, dejagnu, python , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
, lib, makeWrapper }: , freefont_ttf, haxe, swftools
, lib, makeWrapper
, xulrunner }:
assert stdenv ? glibc; assert stdenv ? glibc;
let version = "0.8.8"; in let version = "0.8.9"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnash-${version}"; name = "gnash-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gnash/${version}/${name}.tar.bz2"; url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
sha256 = "0872qrgzpy76lxq5b2xigyzaghn53xrpqba2qp3nrk8yz20lpb6w"; sha256 = "1ga8khwaympj4fphhpyqx6ddcikv0zmcpnlykcipny1xy33bs3gr";
}; };
patchPhase = '' patchPhase = ''
@ -32,19 +34,27 @@ stdenv.mkDerivation rec {
do do
sed -i "$file" -es'|/tmp/|$TMPDIR/|g' sed -i "$file" -es'|/tmp/|$TMPDIR/|g'
done done
# Provide a default font.
sed -i "configure" \
-e 's|/usr/share/fonts/truetype/freefont/|${freefont_ttf}/share/fonts/truetype/|g'
''; '';
enableParallelBuilding = true;
# XXX: KDE is supported as well so we could make it available optionally. # XXX: KDE is supported as well so we could make it available optionally.
buildInputs = [ buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood
gstFfmpeg speex libtool gstFfmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
dbus curl pkgconfig glib gtk gtkglext dbus curl pkgconfig glib gtk gtkglext
xulrunner
makeWrapper makeWrapper
]
# For the test suite ++ (stdenv.lib.optionals doCheck [
ming dejagnu python ming dejagnu python perl haxe swftools
]; ]);
preConfigure = preConfigure =
'' configureFlags=" \ '' configureFlags=" \
@ -58,12 +68,15 @@ stdenv.mkDerivation rec {
# Work around this using GCC's $CPATH variable. # Work around this using GCC's $CPATH variable.
export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10" export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10"
echo "\$CPATH set to \`$CPATH'" echo "\$CPATH set to \`$CPATH'"
echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
''; '';
# Make sure `gtk-gnash' gets `libXext' in its `RPATH'. # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
NIX_LDFLAGS="-lX11 -lXext"; NIX_LDFLAGS="-lX11 -lXext";
doCheck = true; # XXX: Tests currently fail.
doCheck = false;
preInstall = ''ensureDir $out/plugins''; preInstall = ''ensureDir $out/plugins'';
postInstall = '' postInstall = ''

View File

@ -6085,6 +6085,7 @@ let
gmu = callPackage ../applications/audio/gmu { }; gmu = callPackage ../applications/audio/gmu { };
gnash = callPackage ../applications/video/gnash { gnash = callPackage ../applications/video/gnash {
xulrunner = icecatXulrunner3;
inherit (gnome) gtkglext; inherit (gnome) gtkglext;
inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
}; };