From 0fabfb6e12317435ad7eedf7800068323f624167 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 26 Apr 2015 18:46:40 +0300
Subject: [PATCH] mpv: bump version

---
 .../{mpv-0.8.2.recipe => mpv-0.9.0.recipe}    |  4 +-
 .../mpv/patches/mpv_x86-0.8.2.patchset        | 42 -------------------
 .../mpv/patches/mpv_x86-0.9.0.patchset        | 40 ++++++++++++++++++
 3 files changed, 42 insertions(+), 44 deletions(-)
 rename media-video/mpv/{mpv-0.8.2.recipe => mpv-0.9.0.recipe} (95%)
 delete mode 100644 media-video/mpv/patches/mpv_x86-0.8.2.patchset
 create mode 100644 media-video/mpv/patches/mpv_x86-0.9.0.patchset

diff --git a/media-video/mpv/mpv-0.8.2.recipe b/media-video/mpv/mpv-0.9.0.recipe
similarity index 95%
rename from media-video/mpv/mpv-0.8.2.recipe
rename to media-video/mpv/mpv-0.9.0.recipe
index 2132f652c..a17d0fbee 100644
--- a/media-video/mpv/mpv-0.8.2.recipe
+++ b/media-video/mpv/mpv-0.9.0.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://mpv.io"
 REVISION="1"
 
 SRC_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.zip"
-CHECKSUM_SHA256="d2cf6f36fc1bf2bdfcd8cd4e94720c9debe62dcc503e1c056df803891ec66dc8"
+CHECKSUM_SHA256="fff7f9cbd83cfc9785b482b4bfa5994e88ed73bac06153f2cb141abcd365b33e"
 
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -75,7 +75,7 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="mpv-$portVersion"
 
-PATCHES="mpv_x86-0.8.2.patchset"
+PATCHES="mpv_x86-$portVersion.patchset"
 
 GLOBAL_WRITABLE_FILES="settings/encoding-profiles.conf"
 
diff --git a/media-video/mpv/patches/mpv_x86-0.8.2.patchset b/media-video/mpv/patches/mpv_x86-0.8.2.patchset
deleted file mode 100644
index c73115a3d..000000000
--- a/media-video/mpv/patches/mpv_x86-0.8.2.patchset
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5aab1c265b3d6d0339453bce590707fb2ba25a3d Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Mon, 16 Mar 2015 20:44:40 +0300
-Subject: Haiku: comment out subprocess functions
-
-* We lack spawn.h header so we can't use posix-spawn from subprocess-posix.c
-* subprocess-haiku.c probably needs to be implemented
-
-diff --git a/player/command.c b/player/command.c
-index b89f7c0..71058c3 100644
---- a/player/command.c
-+++ b/player/command.c
-@@ -4014,7 +4014,7 @@ static void overlay_uninit(struct MPContext *mpctx)
-         overlay_remove(mpctx, id);
-     osd_set_external2(mpctx->osd, NULL);
- }
--
-+/*
- struct subprocess_args {
-     struct mp_log *log;
-     char **args;
-@@ -4047,7 +4047,7 @@ static void subprocess_detached(struct mp_log *log, char **args)
-     if (pthread_create(&thread, NULL, run_subprocess, p))
-         talloc_free(p);
- }
--
-+*/
- struct cycle_counter {
-     char **args;
-     int counter;
-@@ -4631,7 +4631,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
-         char *args[MP_CMD_MAX_ARGS + 1] = {0};
-         for (int n = 0; n < cmd->nargs; n++)
-             args[n] = cmd->args[n].v.s;
--        subprocess_detached(mpctx->log, args);
-+//        subprocess_detached(mpctx->log, args);
-         break;
-     }
- 
--- 
-2.2.2
-
diff --git a/media-video/mpv/patches/mpv_x86-0.9.0.patchset b/media-video/mpv/patches/mpv_x86-0.9.0.patchset
new file mode 100644
index 000000000..c422835e2
--- /dev/null
+++ b/media-video/mpv/patches/mpv_x86-0.9.0.patchset
@@ -0,0 +1,40 @@
+From f12700aa37882c3ac2fcb37ae522cec6143ac584 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Sun, 26 Apr 2015 18:39:57 +0300
+Subject: Haiku: comment out subprocess functions
+
+
+diff --git a/osdep/subprocess.c b/osdep/subprocess.c
+index 84a1b52..beed2d0 100644
+--- a/osdep/subprocess.c
++++ b/osdep/subprocess.c
+@@ -22,7 +22,7 @@
+ #include "common/msg_control.h"
+ 
+ #include "subprocess.h"
+-
++/*
+ struct subprocess_args {
+     struct mp_log *log;
+     char **args;
+@@ -55,3 +55,4 @@ void mp_subprocess_detached(struct mp_log *log, char **args)
+     if (pthread_create(&thread, NULL, run_subprocess, p))
+         talloc_free(p);
+ }
++*/
+diff --git a/player/command.c b/player/command.c
+index 3556986..d914848 100644
+--- a/player/command.c
++++ b/player/command.c
+@@ -4615,7 +4615,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
+         char *args[MP_CMD_MAX_ARGS + 1] = {0};
+         for (int n = 0; n < cmd->nargs; n++)
+             args[n] = cmd->args[n].v.s;
+-        mp_subprocess_detached(mpctx->log, args);
++//        mp_subprocess_detached(mpctx->log, args);
+         break;
+     }
+ 
+-- 
+2.2.2
+