This reverts commit 8ce691e47f5b3f795821a439536f4b54b24f887f.
The above commit introduced an issue now being seen on Ubuntu 20.
ERROR: mpv-0.32.0-r0 do_configure: Error executing a python function in
exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
0001:
*** 0002:waf_preconfigure(d)
[Gitlab issue #304 ]
error log: https://errors.yoctoproject.org/Errors/Details/539929/
Signed-off-by: Armin Kuster <[email protected]>
---
meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
index 70a39c7b60b..f7b0f30fb9d 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
@@ -18,9 +18,7 @@ LICENSE_FLAGS = "commercial"
SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7"
SRC_URI = " \
git://github.com/mpv-player/mpv;name=mpv \
- https://waf.io/waf-2.0.20;name=waf;subdir=git \
"
-SRC_URI[waf.sha256sum] =
"bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f"
S = "${WORKDIR}/git"
@@ -103,10 +101,14 @@ EXTRA_OECONF = " \
${PACKAGECONFIG_CONFARGS} \
"
-link_waf() {
- ln -s waf-2.0.20 ${S}/waf
+do_patch[postfuncs] += "get_waf"
+
+get_waf() {
+ cd ${S}
+ ./bootstrap.py
+ sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/waf
+ cd -
}
-do_unpack[postfuncs] += "link_waf"
FILES_${PN} += " \
${datadir}/icons \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#146233):
https://lists.openembedded.org/g/openembedded-core/message/146233
Mute This Topic: https://lists.openembedded.org/mt/79255178/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
