commit f2fd4a5219fc4fc0d10cd29a842f0c1683095bdb · pyrox.dev/nixpkgs

+23 -10

pkgs/applications/video/gnome-mplayer/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}:

     

       1
       1
       +
       {stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib

     

       2
       2
       +
       , libnotify, libpulseaudio, mplayer, wrapGAppsHook }:

     

       2
       3
        
       

     

       3
       4
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "gnome-mplayer-1.0.4";

     

       5
       5
       +
         name = "gnome-mplayer-${version}";

     

       6
       6
       +
         version = "1.0.9";

     

       5
       7
        
       

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "kdekorte";

     

       10
       10
       +
           repo = "gnome-mplayer";

     

       11
       11
       +
           rev = "v${version}";

     

       12
       12
       +
           sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr";

     

       9
       13
        
         };

     

       10
       14
        
       

     

       11
       11
       -
         nativeBuildInputs = [ pkgconfig ];

     

       12
       12
       -
         buildInputs = [ glib gtk2 dbus dbus_glib GConf];

     

       15
       15
       +
         nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];

     

       16
       16
       +
         buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ];

     

       13
       17
        
       

     

       14
       14
       -
         hardeningDisable = [ "format" ];

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           (substituteAll {

     

       20
       20
       +
             src = ./fix-paths.patch;

     

       21
       21
       +
             mencoder = "${mplayer}/bin/mencoder";

     

       22
       22
       +
             mplayer = "${mplayer}/bin/mplayer";

     

       23
       23
       +
           })

     

       24
       24
       +
         ];

     

       15
       25
        
       

     

       16
       16
       -
         meta = {

     

       17
       17
       -
           homepage = http://kdekorte.googlepages.com/gnomemplayer;

     

       26
       26
       +
         meta = with stdenv.lib; {

     

       18
       27
        
           description = "Gnome MPlayer, a simple GUI for MPlayer";

     

       28
       28
       +
           homepage = https://sites.google.com/site/kdekorte2/gnomemplayer;

     

       29
       29
       +
           license = licenses.gpl2;

     

       30
       30
       +
           maintainers = with maintainers; [];

     

       31
       31
       +
           platforms = platforms.linux;

     

       19
       32
        
         };

     

       20
       33
        
       }

+87

pkgs/applications/video/gnome-mplayer/fix-paths.patch

···

       1
       1
       +
       --- a/src/gui.c

     

       2
       2
       +
       +++ b/src/gui.c

     

       3
       3
       +
       @@ -7470,7 +7470,7 @@

     

       4
       4
       +
                filename = g_strdup_printf("%s/00000001.jpg", dirname);

     

       5
       5
       +
                g_free(basepath);

     

       6
       6
       +
                // run mplayer and try to get the first frame and convert it to a jpeg

     

       7
       7
       +
       -        av[ac++] = g_strdup_printf("mplayer");

     

       8
       8
       +
       +        av[ac++] = g_strdup_printf("@mplayer@");

     

       9
       9
       +
                av[ac++] = g_strdup_printf("-vo");

     

       10
       10
       +
                av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname);

     

       11
       11
       +
                av[ac++] = g_strdup_printf("-ao");

     

       12
       12
       +
       --- a/src/property_page_common.c

     

       13
       13
       +
       +++ b/src/property_page_common.c

     

       14
       14
       +
       @@ -80,7 +80,7 @@

     

       15
       15
       +
            MetaData *ret;

     

       16
       16
       +
            ret = g_new0(MetaData, 1);

     

       17
       17
       +
        

     

       18
       18
       +
       -    av[ac++] = g_strdup_printf("mplayer");

     

       19
       19
       +
       +    av[ac++] = g_strdup_printf("@mplayer@");

     

       20
       20
       +
            av[ac++] = g_strdup_printf("-vo");

     

       21
       21
       +
            av[ac++] = g_strdup_printf("null");

     

       22
       22
       +
            av[ac++] = g_strdup_printf("-ao");

     

       23
       23
       +
       --- a/src/support.c

     

       24
       24
       +
       +++ b/src/support.c

     

       25
       25
       +
       @@ -566,7 +566,7 @@

     

       26
       26
       +
            } else {

     

       27
       27
       +
                playlist = FALSE;

     

       28
       28
       +
                if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {

     

       29
       29
       +
       -            av[ac++] = g_strdup_printf("mplayer");

     

       30
       30
       +
       +            av[ac++] = g_strdup_printf("@mplayer@");

     

       31
       31
       +
                } else {

     

       32
       32
       +
                    av[ac++] = g_strdup_printf("%s", mplayer_bin);

     

       33
       33
       +
                }

     

       34
       34
       +
       @@ -728,7 +728,7 @@

     

       35
       35
       +
                playlist = FALSE;

     

       36
       36
       +
                // run mplayer and try to get the first frame and convert it to a jpeg

     

       37
       37
       +
                if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {

     

       38
       38
       +
       -            av[ac++] = g_strdup_printf("mplayer");

     

       39
       39
       +
       +            av[ac++] = g_strdup_printf("@mplayer@");

     

       40
       40
       +
                } else {

     

       41
       41
       +
                    av[ac++] = g_strdup_printf("%s", mplayer_bin);

     

       42
       42
       +
                }

     

       43
       43
       +
       @@ -825,7 +825,7 @@

     

       44
       44
       +
                playlist = FALSE;

     

       45
       45
       +
        

     

       46
       46
       +
                if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {

     

       47
       47
       +
       -            av[ac++] = g_strdup_printf("mplayer");

     

       48
       48
       +
       +            av[ac++] = g_strdup_printf("@mplayer@");

     

       49
       49
       +
                } else {

     

       50
       50
       +
                    av[ac++] = g_strdup_printf("%s", mplayer_bin);

     

       51
       51
       +
                }

     

       52
       52
       +
       @@ -1251,7 +1251,7 @@

     

       53
       53
       +
            gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name);

     

       54
       54
       +
        

     

       55
       55
       +
            if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {

     

       56
       56
       +
       -        av[ac++] = g_strdup_printf("mplayer");

     

       57
       57
       +
       +        av[ac++] = g_strdup_printf("@mplayer@");

     

       58
       58
       +
            } else {

     

       59
       59
       +
                av[ac++] = g_strdup_printf("%s", mplayer_bin);

     

       60
       60
       +
            }

     

       61
       61
       +
       @@ -1532,7 +1532,7 @@

     

       62
       62
       +
                return 0;

     

       63
       63
       +
        

     

       64
       64
       +
            if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {

     

       65
       65
       +
       -        av[ac++] = g_strdup_printf("mplayer");

     

       66
       66
       +
       +        av[ac++] = g_strdup_printf("@mplayer@");

     

       67
       67
       +
            } else {

     

       68
       68
       +
                av[ac++] = g_strdup_printf("%s", mplayer_bin);

     

       69
       69
       +
            }

     

       70
       70
       +
       @@ -1597,7 +1597,7 @@

     

       71
       71
       +
        

     

       72
       72
       +
            if (control_id == 0) {

     

       73
       73
       +
                ac = 0;

     

       74
       74
       +
       -        av[ac++] = g_strdup_printf("mencoder");

     

       75
       75
       +
       +        av[ac++] = g_strdup_printf("@mencoder@");

     

       76
       76
       +
                av[ac++] = g_strdup_printf("-ovc");

     

       77
       77
       +
                av[ac++] = g_strdup_printf("copy");

     

       78
       78
       +
                av[ac++] = g_strdup_printf("-oac");

     

       79
       79
       +
       @@ -2830,7 +2830,7 @@

     

       80
       80
       +
            gboolean ret = TRUE;

     

       81
       81
       +
        

     

       82
       82
       +
            if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {

     

       83
       83
       +
       -        av[ac++] = g_strdup_printf("mplayer");

     

       84
       84
       +
       +        av[ac++] = g_strdup_printf("@mplayer@");

     

       85
       85
       +
            } else {

     

       86
       86
       +
                av[ac++] = g_strdup_printf("%s", mplayer_bin);

     

       87
       87
       +
            }

+32

pkgs/development/libraries/gmtk/default.nix

···

       1
       1
       +
       {stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3

     

       2
       2
       +
       , libpulseaudio, mplayer, gnome_mplayer }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "gmtk-${version}";

     

       6
       6
       +
         version = "1.0.9";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "kdekorte";

     

       10
       10
       +
           repo = "gmtk";

     

       11
       11
       +
           rev = "v${version}";

     

       12
       12
       +
           sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = [ libtool pkgconfig intltool ];

     

       16
       16
       +
         buildInputs = [ glib gtk3 libpulseaudio ];

     

       17
       17
       +
       

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           (substituteAll {

     

       20
       20
       +
             src = ./fix-paths.patch;

     

       21
       21
       +
             mplayer = "${mplayer}/bin/mplayer";

     

       22
       22
       +
           })

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with stdenv.lib; {

     

       26
       26
       +
           description = "Common functions for gnome-mplayer and gecko-mediaplayer";

     

       27
       27
       +
           homepage = https://sites.google.com/site/kdekorte2/gnomemplayer;

     

       28
       28
       +
           license = licenses.gpl2;

     

       29
       29
       +
           maintainers = gnome_mplayer.meta.maintainers;

     

       30
       30
       +
           platforms = platforms.linux;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+20

pkgs/development/libraries/gmtk/fix-paths.patch

···

       1
       1
       +
       --- a/src/gmtk_media_player.c

     

       2
       2
       +
       +++ b/src/gmtk_media_player.c

     

       3
       3
       +
       @@ -2449,7 +2449,7 @@

     

       4
       4
       +
                player->minimum_mplayer = detect_mplayer_features(player);

     

       5
       5
       +
        

     

       6
       6
       +
                if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) {

     

       7
       7
       +
       -            argv[argn++] = g_strdup_printf("mplayer");

     

       8
       8
       +
       +            argv[argn++] = g_strdup_printf("@mplayer@");

     

       9
       9
       +
                } else {

     

       10
       10
       +
                    argv[argn++] = g_strdup_printf("%s", player->mplayer_binary);

     

       11
       11
       +
                }

     

       12
       12
       +
       @@ -4135,7 +4135,7 @@

     

       13
       13
       +
                return ret;

     

       14
       14
       +
        

     

       15
       15
       +
            if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) {

     

       16
       16
       +
       -        av[ac++] = g_strdup_printf("mplayer");

     

       17
       17
       +
       +        av[ac++] = g_strdup_printf("@mplayer@");

     

       18
       18
       +
            } else {

     

       19
       19
       +
                av[ac++] = g_strdup_printf("%s", player->mplayer_binary);

     

       20
       20
       +
            }

+3 -3

pkgs/top-level/all-packages.nix

···

       15248
       15248
        
           inherit (darwin) IOKit;

     

       15249
       15249
        
         };

     

       15250
       15250
        
       

     

       15251
       15251
       +
         gmtk = callPackage ../development/libraries/gmtk { };

     

       15252
       15252
       +
       

     

       15251
       15253
        
         gmu = callPackage ../applications/audio/gmu { };

     

       15252
       15254
        
       

     

       15253
       15253
       -
         gnome_mplayer = callPackage ../applications/video/gnome-mplayer {

     

       15254
       15254
       -
           inherit (gnome2) GConf;

     

       15255
       15255
       -
         };

     

       15255
       15255
       +
         gnome_mplayer = callPackage ../applications/video/gnome-mplayer { };

     

       15256
       15256
        
       

     

       15257
       15257
        
         gnumeric = callPackage ../applications/office/gnumeric { };

     

       15258
       15258