Skip to content

Commit 4d39fd9

Browse files
committedDec 6, 2021
Updated mpv to 0.34.0
1 parent 17155c3 commit 4d39fd9

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed
 

‎download.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh -e
22

33
# Change to preferred versions
4-
MPV_VERSION="0.33.1"
4+
MPV_VERSION="0.34.0"
55
FFMPEG_VERSION="4.4"
66
LIBASS_VERSION="0.14.0"
77
FREETYPE_VERSION="2.10.0"

‎mpv-patch.diff

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
--- src/mpv-0.33.1/bootstrap.py 2021-04-05 12:45:41.000000000 -0400
2-
+++ src/mpv-0.33.1/bootstrap.py 2021-05-08 11:21:44.000000000 -0400
3-
@@ -5,10 +5,10 @@
4-
from __future__ import print_function
5-
import os, sys, stat, hashlib, subprocess
6-
7-
-WAFRELEASE = "waf-2.0.20"
8-
+WAFRELEASE = "waf-2.0.9"
9-
WAFURLS = ["https://waf.io/" + WAFRELEASE,
10-
"http://www.freehackers.org/~tnagy/release/" + WAFRELEASE]
11-
-SHA256HASH = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f"
12-
+SHA256HASH = "2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48"
13-
14-
if os.path.exists("waf"):
15-
wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode()
16-
--- src/mpv-0.33.1/wscript 2021-05-08 11:09:56.000000000 -0400
17-
+++ src/mpv-0.33.1/wscript 2021-05-08 10:36:14.000000000 -0400
18-
@@ -242,6 +242,12 @@
19-
'deps': 'os-win32 || os-cygwin',
20-
'func': check_true
21-
}, {
22-
+ 'name': 'posix-spawn',
23-
+ 'desc': 'spawnp()/kill() POSIX support',
24-
+ 'func': check_statement(['spawn.h', 'signal.h'],
25-
+ 'posix_spawnp(0,0,0,0,0,0); kill(0,0)'),
26-
+ 'deps': '!mingw && !tvos',
27-
+ }, {
28-
'name': 'glob-posix',
29-
'desc': 'glob() POSIX support',
30-
'deps': '!(os-win32 || os-cygwin)',
31-
--- src/mpv-0.33.1/wscript_build.py 2021-05-08 11:10:19.000000000 -0400
32-
+++ src/mpv-0.33.1/wscript_build.py 2021-05-08 10:35:41.000000000 -0400
33-
@@ -209,7 +209,7 @@
34-
])
35-
36-
subprocess_c = ctx.pick_first_matching_dep([
37-
- ( "osdep/subprocess-posix.c", "posix" ),
38-
+ ( "osdep/subprocess-posix.c", "posix-spawn" ),
39-
( "osdep/subprocess-win.c", "win32-desktop" ),
40-
( "osdep/subprocess-dummy.c" ),
41-
])
1+
--- src/mpv-0.34.0/bootstrap.py
2+
+++ src/mpv-0.34.0/bootstrap.py
3+
@@ -5,10 +5,10 @@
4+
import os, sys, stat, hashlib, subprocess
5+
from urllib.request import urlopen, URLError
6+
7+
-WAFRELEASE = "waf-2.0.20"
8+
+WAFRELEASE = "waf-2.0.9"
9+
WAFURLS = ["https://waf.io/" + WAFRELEASE,
10+
"http://www.freehackers.org/~tnagy/release/" + WAFRELEASE]
11+
-SHA256HASH = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f"
12+
+SHA256HASH = "2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48"
13+
14+
if os.path.exists("waf"):
15+
wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode()
16+
--- src/mpv-0.34.0/wscript
17+
+++ src/mpv-0.34.0/wscript
18+
@@ -245,6 +245,12 @@ iconv support use --disable-iconv.",
19+
'desc': 'w32/dos paths',
20+
'deps': 'os-win32 || os-cygwin',
21+
'func': check_true
22+
+ }, {
23+
+ 'name': 'posix-spawn',
24+
+ 'desc': 'spawnp()/kill() POSIX support',
25+
+ 'func': check_statement(['spawn.h', 'signal.h'],
26+
+ 'posix_spawnp(0,0,0,0,0,0); kill(0,0)'),
27+
+ 'deps': '!mingw && !tvos',
28+
}, {
29+
'name': 'glob-posix',
30+
'desc': 'glob() POSIX support',
31+
--- src/mpv-0.34.0/wscript_build.py
32+
+++ src/mpv-0.34.0/wscript_build.py
33+
@@ -209,7 +209,7 @@ def build(ctx):
34+
])
35+
36+
subprocess_c = ctx.pick_first_matching_dep([
37+
- ( "osdep/subprocess-posix.c", "posix" ),
38+
+ ( "osdep/subprocess-posix.c", "posix-spawn" ),
39+
( "osdep/subprocess-win.c", "win32-desktop" ),
40+
( "osdep/subprocess-dummy.c" ),
41+
])

0 commit comments

Comments
 (0)
Please sign in to comment.