From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170])
 by mx.groups.io with SMTP id smtpd.web10.36534.1609095870464982665
 for <openembedded-core@lists.openembedded.org>;
 Sun, 27 Dec 2020 11:04:30 -0800
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@gmail.com header.s=20161025 header.b=Y5+mGYkv;
 spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: akuster808@gmail.com)
Received: by mail-pg1-f170.google.com with SMTP id z21so6107904pgj.4
        for <openembedded-core@lists.openembedded.org>; Sun, 27 Dec 2020 11:04:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:subject:date:message-id;
        bh=6mVCDrAK+yKHtBvc1Jer9cizg/Jyjd0zHPraDI96DSw=;
        b=Y5+mGYkvTKrbWbRd/vXvOLW1Msg5uIP0UbapXa2wWsk9GdW4faNCxoZn52Ah67yRTz
         ASi0J+IGrI6WGB4KpUHZtFfC2OdXOL76ZlNDHLlceguh37CDMZDC+Tj4mkWRYuZvtAv6
         PXr7gWenVlhc+0g80PjFCti1psj5jyRVSoMtbD3G2e77dgUtljJXdwNwEeKtQJ0CFIz9
         qag/C22TYfh9bIXZO+6JtYF79YsdAfz9wmG+w6YeXm8mWYtwb0f8D5VqficKFYvnXAj3
         sO++HqC6tETGVu6Lk1hGD2hhSyDStvQpc8pC8ZoPGgXxgE8Vm0DE+gKxXUWwAkXrHMOZ
         6EHw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:subject:date:message-id;
        bh=6mVCDrAK+yKHtBvc1Jer9cizg/Jyjd0zHPraDI96DSw=;
        b=ppgvpM1pDrfzXP6nPwylrzbKPYQzJ2KoaXl+cSpPME+zYI0zcWmPwuS8bum7rITJH5
         3uiAqo1KTkobI//MP+g4lpOiVDBjVq3HWrcDGblfwgmBi8ImfIIJjyGLAHh6x09UdoXq
         fi+HaKxVWZKUi8l0W/kS83boHgowzpYUgwduhCjkzxYVSHO2zpQU4d7VRoP9cYL5N8eb
         cGZ22iYUvp5lcr8JHDJ8n8osC1GCTVpodboUrI1W0SvQKDocF4NYzIDHFhP3UKufbGAu
         OD+8FvmfgfNXE1HLahxivNVwiW3dHwJfqnmnP23TjSUbY8+9/sHfrYNF7J5HegOf79vG
         K0tQ==
X-Gm-Message-State: AOAM533lqa91zlVG94SQ/tDWjS3SuJL/F48pbD13eDAyhMmHQZZyyhCx
	bof/yoA3vu/bmbLY3JVXP+9U9XkGFBZtHQ==
X-Google-Smtp-Source: ABdhPJzVnzo8EvU5F3U7X5bCNs7lY27ug7LG0KmlsOQc/BzJpu1OZYjJ6rJ945nS+6EojYalY/qHlg==
X-Received: by 2002:a63:4c06:: with SMTP id z6mr32653056pga.250.1609095869799;
        Sun, 27 Dec 2020 11:04:29 -0800 (PST)
Return-Path: <akuster808@gmail.com>
Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:a5c0:3c00:c891:9f96:ef06])
        by smtp.gmail.com with ESMTPSA id f7sm11537034pjs.25.2020.12.27.11.04.28
        for <openembedded-core@lists.openembedded.org>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Sun, 27 Dec 2020 11:04:29 -0800 (PST)
From: "akuster" <akuster808@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [Dunfell][meta-oe][PATCH] Revert "mpv: fetch waf in do_fetch"
Date: Sun, 27 Dec 2020 11:04:27 -0800
Message-Id: <20201227190427.28926-1-akuster808@gmail.com>
X-Mailer: git-send-email 2.17.1

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 <akuster808@gmail.com>
---
 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