diff --git a/media-video/mpv/mpv-0.31.0.recipe b/media-video/mpv/mpv-0.34.0.recipe similarity index 94% rename from media-video/mpv/mpv-0.31.0.recipe rename to media-video/mpv/mpv-0.34.0.recipe index 89f18e53b..0a6859034 100644 --- a/media-video/mpv/mpv-0.31.0.recipe +++ b/media-video/mpv/mpv-0.34.0.recipe @@ -3,13 +3,13 @@ DESCRIPTION="mpv is a media player based on MPlayer and mplayer2. It supports \ a wide variety of video file formats, audio and video codecs, and subtitle \ types." HOMEPAGE="https://mpv.io/" -COPYRIGHT="2013-2018 MPV Developers" +COPYRIGHT="2013-2021 MPV Developers" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="805a3ac8cf51bfdea6087a6480c18835101da0355c8e469b6d488a1e290585a5" +CHECKSUM_SHA256="f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309" SOURCE_FILENAME="mpv-$portVersion.tar.gz" -wafVersion="2.0.11" +wafVersion="2.0.20" SOURCE_URI_2="https://waf.io/waf-$wafVersion#noarchive" CHECKSUM_SHA256_2="25807bc064dce3fe66eab5977ed5730f3b59af981c028a0dc4f889cd64b80928" SOURCE_FILENAME_2="waf-$wafVersion" @@ -93,7 +93,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:perl cmd:pkg_config$secondaryArchSuffix - cmd:python + cmd:python3 cmd:yasm " @@ -107,9 +107,8 @@ BUILD() export LDFLAGS=-lnetwork - waf configure \ + python3 waf configure \ --enable-dvdnav \ - --enable-libsmbclient \ --disable-libavdevice \ --disable-openal \ --disable-libmpv-static \ @@ -124,12 +123,12 @@ BUILD() --libdir=$libDir \ --includedir=$includeDir - waf build + python3 waf build } INSTALL() { - waf install + python3 waf install rm -rf $dataDir/applications rm -rf $dataDir/icons diff --git a/media-video/mpv/patches/mpv-0.31.0.patchset b/media-video/mpv/patches/mpv-0.31.0.patchset deleted file mode 100644 index e39370ffc..000000000 --- a/media-video/mpv/patches/mpv-0.31.0.patchset +++ /dev/null @@ -1,30 +0,0 @@ -From b16e4a9c378eb86ffa8ce9782dd9145aed56b053 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -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 983f463..6fd587b 100644 ---- a/player/main.c -+++ b/player/main.c -@@ -258,6 +258,7 @@ static bool check_locale(void) - - struct MPContext *mp_create(void) - { -+#ifndef __HAIKU__ - if (!check_locale()) { - // Normally, we never print anything (except if the "terminal" option - // is enabled), so this is an exception. -@@ -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) - enable_talloc = HAVE_TA_LEAK_REPORT ? "1" : "0"; --- -2.24.1 - diff --git a/media-video/mpv/patches/mpv-0.34.0.patchset b/media-video/mpv/patches/mpv-0.34.0.patchset new file mode 100644 index 000000000..0f4241d5f --- /dev/null +++ b/media-video/mpv/patches/mpv-0.34.0.patchset @@ -0,0 +1,53 @@ +From 010c0d38a54c7da2deeeb9efdfaf7239172caf7d Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +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 e039f61..b4e941c 100644 +--- a/player/main.c ++++ b/player/main.c +@@ -235,6 +235,7 @@ static bool check_locale(void) + + struct MPContext *mp_create(void) + { ++#ifndef __HAIKU__ + if (!check_locale()) { + // Normally, we never print anything (except if the "terminal" option + // is enabled), so this is an exception. +@@ -242,7 +243,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) + enable_talloc = HAVE_TA_LEAK_REPORT ? "1" : "0"; +-- +2.30.2 + + +From 4b9b3b1d07674b92d371ee3c784571ad82459f5f Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Tue, 2 Nov 2021 12:19:55 +0300 +Subject: Fix build on Haiku + + +diff --git a/common/stats.c b/common/stats.c +index ce50bdc..79f1343 100644 +--- a/common/stats.c ++++ b/common/stats.c +@@ -69,7 +69,7 @@ struct stat_entry { + // Overflows only after I'm dead. + static int64_t get_thread_cpu_time_ns(pthread_t thread) + { +-#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(_POSIX_THREAD_CPUTIME) ++#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(_POSIX_THREAD_CPUTIME) && !defined(__HAIKU__) + clockid_t id; + struct timespec tv; + if (pthread_getcpuclockid(thread, &id) == 0 && +-- +2.30.2 +