* Added gecko-mediaplayer, a browser plugin that uses gnome-mplayer to

play video.  Seems to be more stable than mplayerplug-in.

svn path=/nixpkgs/trunk/; revision=16379
This commit is contained in:
Eelco Dolstra 2009-07-15 20:34:08 +00:00
parent aa699024db
commit 998412adf6
4 changed files with 72 additions and 4 deletions

View File

@ -131,7 +131,7 @@ rec {
};
passthru = {
inherit gtk;
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};

View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
, GConf, gnome_mplayer, MPlayer
}:
stdenv.mkDerivation rec {
name = "gecko-mediaplayer-0.9.6";
src = fetchurl {
url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
sha256 = "1847jv1v9r4xzmvksvjvl2fmp8j5s22hx922hywdflzzq7jsgyr7";
};
buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf];
# !!! fix this
preBuild =
''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${browser.xulrunner}/include/xulrunner-1.9.1/stable/ -I${browser.nspr}/include/nspr"
echo $NIX_CFLAGS_COMPILE
'';
# This plugin requires Gnome MPlayer and MPlayer to be in the
# browser's $PATH.
postInstall =
''
echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
'';
passthru = {
mozillaPlugin = "/lib/mozilla/plugins";
};
meta = {
description = "A browser plugin that uses GNOME MPlayer to play media in a browser";
homepage = http://kdekorte.googlepages.com/gecko-mediaplayer;
};
}

View File

@ -0,0 +1,17 @@
{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}:
stdenv.mkDerivation rec {
name = "gnome-mplayer-0.9.6";
src = fetchurl {
url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
sha256 = "0gvciiy50y4vc9r6nlmw1q2fgwkywk0cq8rviswd6wbrxvz2gv2x";
};
buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];
meta = {
homepage = http://kdekorte.googlepages.com/gnomemplayer;
description = "Gnome MPlayer, a simple GUI for MPlayer";
};
}

View File

@ -6315,6 +6315,12 @@ let
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg;
};
gnome_mplayer = import ../applications/video/gnome-mplayer {
inherit fetchurl stdenv pkgconfig dbus dbus_glib;
inherit (gtkLibs) glib gtk;
inherit (gnome) GConf;
};
gnunet = import ../applications/networking/p2p/gnunet {
inherit fetchurl stdenv libextractor libmicrohttpd libgcrypt
gmp curl libtool guile adns sqlite gettext zlib pkgconfig
@ -6346,6 +6352,13 @@ let
inherit libpng pkgconfig;
};
gecko_mediaplayer = import ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
inherit fetchurl stdenv pkgconfig dbus dbus_glib x11 gnome_mplayer MPlayer;
inherit (gtkLibs) glib;
inherit (gnome) GConf;
browser = firefox35;
};
gqview = import ../applications/graphics/gqview {
inherit fetchurl stdenv pkgconfig libpng;
inherit (gtkLibs) gtk;
@ -6981,7 +6994,6 @@ let
autoconf = autoconf213;
});*/
timidity = import ../tools/misc/timidity {
inherit fetchurl stdenv alsaLib;
};
@ -7092,10 +7104,11 @@ let
in
([]
++ lib.optional (!enableAdobeFlash) gnash
++ lib.optional (enableAdobeFlash) flashplayer
++ lib.optional enableAdobeFlash flashplayer
# RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser)
++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer
++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
);
};