[oe-commits] [meta-openembedded] 28/31: mpv: Fix build with python3

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 3dcfe3269010de846e2a2b0cbc208e3634c5bf8f
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sat Feb 15 00:06:47 2020 -0800

    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 at gmail.com>
---
 meta-oe/recipes-multimedia/mplayer/mpv/python3.patch | 12 ------------
 meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb     | 15 +++++++--------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch
deleted file mode 100644
index df208cf..0000000
--- a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use Python 3 instead of Python 2.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton at 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
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 bd2e389..066e18a 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
@@ -17,11 +17,7 @@ LICENSE_FLAGS = "commercial"
 SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7"
 SRC_URI = " \
     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"
 
@@ -102,11 +98,14 @@ EXTRA_OECONF = " \
     ${PACKAGECONFIG_CONFARGS} \
 "
 
-adjust_waf_perms() {
-    chmod +x ${S}/waf
-}
+do_patch[postfuncs] += "get_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} += " \
     ${datadir}/icons \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.