diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-02-15 00:06:47 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-02-15 08:05:07 -0800 |
| commit | 3dcfe3269010de846e2a2b0cbc208e3634c5bf8f (patch) | |
| tree | a25c6d2253be6129b7de9e7a34f3eab3853a6c3c /meta-oe/recipes-multimedia | |
| parent | 693ab66388122096a16c051d8ead0e7c4cd34cbc (diff) | |
| download | meta-openembedded-3dcfe3269010de846e2a2b0cbc208e3634c5bf8f.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-multimedia')
| -rw-r--r-- | meta-oe/recipes-multimedia/mplayer/mpv/python3.patch | 12 | ||||
| -rw-r--r-- | 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 df208cf878..0000000000 --- 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@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 bd2e389fee..066e18aa86 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 \ |