mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 13:59:59 +00:00
mpv: Fix build with python3
Use bootstrap.py to download right waf version turn the python3 patch into a sed command Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,12 +0,0 @@
|
|||||||
Use Python 3 instead of Python 2.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
||||||
|
|
||||||
diff --git a/waf b/waf
|
|
||||||
index 6ce2a24..de3c898 100755
|
|
||||||
--- a/waf
|
|
||||||
+++ b/waf
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-#!/usr/bin/env python
|
|
||||||
+#!/usr/bin/env python3
|
|
||||||
@@ -17,11 +17,7 @@ LICENSE_FLAGS = "commercial"
|
|||||||
SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7"
|
SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://github.com/mpv-player/mpv;name=mpv \
|
git://github.com/mpv-player/mpv;name=mpv \
|
||||||
https://www.freehackers.org/~tnagy/release/waf-2.0.19;name=waf;downloadfilename=waf;subdir=git \
|
|
||||||
file://python3.patch \
|
|
||||||
"
|
"
|
||||||
SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71"
|
|
||||||
SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
@@ -102,11 +98,14 @@ EXTRA_OECONF = " \
|
|||||||
${PACKAGECONFIG_CONFARGS} \
|
${PACKAGECONFIG_CONFARGS} \
|
||||||
"
|
"
|
||||||
|
|
||||||
adjust_waf_perms() {
|
do_patch[postfuncs] += "get_waf"
|
||||||
chmod +x ${S}/waf
|
|
||||||
}
|
|
||||||
|
|
||||||
do_patch[postfuncs] += "adjust_waf_perms"
|
get_waf() {
|
||||||
|
cd ${S}
|
||||||
|
./bootstrap.py
|
||||||
|
sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/waf
|
||||||
|
cd -
|
||||||
|
}
|
||||||
|
|
||||||
FILES_${PN} += " \
|
FILES_${PN} += " \
|
||||||
${datadir}/icons \
|
${datadir}/icons \
|
||||||
|
|||||||
Reference in New Issue
Block a user