From 9f2f4ccf0047f4837cacba1d6e1066d66d4c05a1 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 2 Jan 2020 23:20:39 +0300
Subject: [PATCH] mpv: bump version

---
 .../mpv/{mpv-0.30.0.recipe => mpv-0.31.0.recipe} |  4 ++--
 .../{mpv-0.30.0.patchset => mpv-0.31.0.patchset} | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename media-video/mpv/{mpv-0.30.0.recipe => mpv-0.31.0.recipe} (97%)
 rename media-video/mpv/patches/{mpv-0.30.0.patchset => mpv-0.31.0.patchset} (62%)

diff --git a/media-video/mpv/mpv-0.30.0.recipe b/media-video/mpv/mpv-0.31.0.recipe
similarity index 97%
rename from media-video/mpv/mpv-0.30.0.recipe
rename to media-video/mpv/mpv-0.31.0.recipe
index e3c1e4f5b..d8f4512ee 100644
--- a/media-video/mpv/mpv-0.30.0.recipe
+++ b/media-video/mpv/mpv-0.31.0.recipe
@@ -5,9 +5,9 @@ types."
 HOMEPAGE="https://mpv.io/"
 COPYRIGHT="2013-2018 MPV Developers"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35"
+CHECKSUM_SHA256="805a3ac8cf51bfdea6087a6480c18835101da0355c8e469b6d488a1e290585a5"
 SOURCE_FILENAME="mpv-$portVersion.tar.gz"
 wafVersion="2.0.11"
 SOURCE_URI_2="https://waf.io/waf-$wafVersion#noarchive"
diff --git a/media-video/mpv/patches/mpv-0.30.0.patchset b/media-video/mpv/patches/mpv-0.31.0.patchset
similarity index 62%
rename from media-video/mpv/patches/mpv-0.30.0.patchset
rename to media-video/mpv/patches/mpv-0.31.0.patchset
index d61805db4..e39370ffc 100644
--- a/media-video/mpv/patches/mpv-0.30.0.patchset
+++ b/media-video/mpv/patches/mpv-0.31.0.patchset
@@ -1,14 +1,14 @@
-From eb5d9214f0314a13c7cb245d9950c5c9aa180f61 Mon Sep 17 00:00:00 2001
+From b16e4a9c378eb86ffa8ce9782dd9145aed56b053 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Fri, 7 Sep 2018 22:22:58 +1000
+Date: Thu, 2 Jan 2020 21:16:37 +0300
 Subject: disable setlocale for haiku
 
 
 diff --git a/player/main.c b/player/main.c
-index f56191a..89aa0cd 100644
+index 983f463..6fd587b 100644
 --- a/player/main.c
 +++ b/player/main.c
-@@ -257,6 +257,7 @@ static bool check_locale(void)
+@@ -258,6 +258,7 @@ static bool check_locale(void)
  
  struct MPContext *mp_create(void)
  {
@@ -16,15 +16,15 @@ index f56191a..89aa0cd 100644
      if (!check_locale()) {
          // Normally, we never print anything (except if the "terminal" option
          // is enabled), so this is an exception.
-@@ -264,7 +265,7 @@ struct MPContext *mp_create(void)
+@@ -265,7 +266,7 @@ struct MPContext *mp_create(void)
                          "Call 'setlocale(LC_NUMERIC, \"C\");' in your code.\n");
          return NULL;
      }
 -
 +#endif
      char *enable_talloc = getenv("MPV_LEAK_REPORT");
-     if (enable_talloc && strcmp(enable_talloc, "1") == 0)
-         talloc_enable_leak_report();
+     if (!enable_talloc)
+         enable_talloc = HAVE_TA_LEAK_REPORT ? "1" : "0";
 -- 
-2.16.4
+2.24.1