Merge pull request #33314 from jtojnar/gnome-mplayer

gnome_mplayer: 1.0.4 → 1.0.9
This commit is contained in:
Jörg Thalheim
2018-01-03 11:10:29 +01:00
committed by GitHub
5 changed files with 165 additions and 13 deletions

View File

@@ -0,0 +1,32 @@
{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3
, libpulseaudio, mplayer, gnome_mplayer }:
stdenv.mkDerivation rec {
name = "gmtk-${version}";
version = "1.0.9";
src = fetchFromGitHub {
owner = "kdekorte";
repo = "gmtk";
rev = "v${version}";
sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i";
};
nativeBuildInputs = [ libtool pkgconfig intltool ];
buildInputs = [ glib gtk3 libpulseaudio ];
patches = [
(substituteAll {
src = ./fix-paths.patch;
mplayer = "${mplayer}/bin/mplayer";
})
];
meta = with stdenv.lib; {
description = "Common functions for gnome-mplayer and gecko-mediaplayer";
homepage = https://sites.google.com/site/kdekorte2/gnomemplayer;
license = licenses.gpl2;
maintainers = gnome_mplayer.meta.maintainers;
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,20 @@
--- a/src/gmtk_media_player.c
+++ b/src/gmtk_media_player.c
@@ -2449,7 +2449,7 @@
player->minimum_mplayer = detect_mplayer_features(player);
if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) {
- argv[argn++] = g_strdup_printf("mplayer");
+ argv[argn++] = g_strdup_printf("@mplayer@");
} else {
argv[argn++] = g_strdup_printf("%s", player->mplayer_binary);
}
@@ -4135,7 +4135,7 @@
return ret;
if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) {
- av[ac++] = g_strdup_printf("mplayer");
+ av[ac++] = g_strdup_printf("@mplayer@");
} else {
av[ac++] = g_strdup_printf("%s", player->mplayer_binary);
}