From patchwork Tue Feb 4 21:53:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1233580 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=eENRfO9r; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Bz4R3RpGz9sRY for ; Wed, 5 Feb 2020 08:54:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C5833816FA; Tue, 4 Feb 2020 21:54:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qLspPOiTbBlT; Tue, 4 Feb 2020 21:54:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D5C50819A8; Tue, 4 Feb 2020 21:54:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 033EA1BF3C2 for ; Tue, 4 Feb 2020 21:54:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EF63C86E64 for ; Tue, 4 Feb 2020 21:54:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bbjzSfldexG2 for ; Tue, 4 Feb 2020 21:54:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6877E86DAC for ; Tue, 4 Feb 2020 21:54:26 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z3so25120402wru.3 for ; Tue, 04 Feb 2020 13:54:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qUE7mGhVkOTxjthKpRJ8v2ttXPZNrAsqF0bqf3yn/0s=; b=eENRfO9rkmqsEJaBj7Kat+540dGXCi0VTokUP6bCFHDOkYch6ohZilbjBLkhXwmyo7 qqeWDJ1PPndMoButRbHAROSHjEBeFoQLwdYcGCTaO5Fi9IetGebqfjBrIFxuGXt2pcLw iEANFUwhMtRDgQ+sH7s9UVx3Az/AORDRuEC/q6lL/LjUIEJBOsuMJ8RxmBo6fPSYYWXx hqBDbQiO7AkyTe2r/uxo+0NaQhFoWqFA04byZKgPxYD/r1LLzqMo4RgowAgUKRC8u9XX tVqFmeJx9Vat8XnRFaaft/+1n8tAvFXxlHYAZGPAwnvBMeK+EcCUj7dmlltnfy54HN/F kzTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qUE7mGhVkOTxjthKpRJ8v2ttXPZNrAsqF0bqf3yn/0s=; b=KI+HmuScez3D95j7v9TzVif6zyM3fwxiVQHBSdP/MBKDKruH0CkxflKHiPR2D04Qo9 nqO8TlsPYxnlbvDtu5eUtJXAWvawTop51L5p/RBLm2NOFGAVySvOXsgnOjbq9Co3rOTe +ipnPAkBa2eSS5XS08/VH53FRLhk1L/iBj/H8kmlxkMvCWmG9UuAlbMCd9l4kloXXmdu JvPJxI7I4SNvKPaU+lMJfYEvj4VaD3vd6PboMsNfnWp3mcY7hMW+6+OXregGgmX1C33H k7GU1sOeYXaudfwsiuPpjnCjWZJrrvV+/ek9vzRU6af6AZDvF68yaV2MZpVi7N7jPPQ2 6x3A== X-Gm-Message-State: APjAAAV6iJgW8gghXMHJATXZPasD4xF+SyTdTXomWi16DDuKkTSI+VQa Xl2g87fQPxfE9TFIyPb1DFvqRQRXOe8= X-Google-Smtp-Source: APXvYqwytJAVGTNKfpbmAYWje77LVeZ6Xti0cj4H0jL/s8EYY1zwGU5GpnT2v1OpmoffkrU58zEdHQ== X-Received: by 2002:adf:fe4d:: with SMTP id m13mr25536096wrs.179.1580853264595; Tue, 04 Feb 2020 13:54:24 -0800 (PST) Received: from localhost.localdomain (cust-12-4-109-94.dyn.as47377.net. [94.109.4.12]) by smtp.gmail.com with ESMTPSA id x6sm5293181wmi.44.2020.02.04.13.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 13:54:24 -0800 (PST) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 22:53:57 +0100 Message-Id: <20200204215357.26259-1-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-imx: allow to build with Waf on Python3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This makes gst1-imx use the Waf package ditributed in Buildroot, instead of its own one, as the latter does not support Python3. Also backport a patch from upstream that tweaks the wscript, such as to make it run on Waf >=2.0.12 Signed-off-by: Titouan Christophe --- .../gst1-imx/0001-waf-update-to-2-0-12.patch | 28 +++++++++++++++++++ package/gstreamer1/gst1-imx/gst1-imx.mk | 1 + 2 files changed, 29 insertions(+) create mode 100644 package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch diff --git a/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch b/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch new file mode 100644 index 0000000000..dcc586311e --- /dev/null +++ b/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch @@ -0,0 +1,28 @@ +From 66bc1c2b9c74dab4706a1ca3696e863ed8d30433 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Sun, 15 Dec 2019 14:24:54 +0000 +Subject: [PATCH] waf: update to 2.0.12 + +Prepare to allow building with python3. + +Signed-off-by: Max Krummenacher +[Titouan: backport part from upstream, but drop the update of waf itself] +Signed-off-by: Titouan Christophe +--- + wscript | 3 ++- + 2 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/wscript b/wscript +index c3a9926..f076b64 100644 +--- a/wscript ++++ b/wscript +@@ -152,7 +152,8 @@ def configure(conf): + + # test for GStreamer libraries + +- gst_version_str = conf.check_cfg(package = 'gstreamer-1.0 >= 1.2.0', modversion = "gstreamer-1.0", uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) ++ conf.check_cfg(package = 'gstreamer-1.0 >= 1.2.0', uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) ++ gst_version_str = conf.check_cfg(modversion = "gstreamer-1.0", uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) + gst_version = [int(x) for x in re.match('(\d*)\.(\d*)\.(\d*)', gst_version_str).groups()] + conf.env['GSTREAMER_VERSION'] = gst_version + diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index 43b4d9b15f..1156077274 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -11,6 +11,7 @@ GST1_IMX_LICENSE = LGPL-2.0+ GST1_IMX_LICENSE_FILES = LICENSE GST1_IMX_INSTALL_STAGING = YES +GST1_IMX_NEEDS_EXTERNAL_WAF = YES GST1_IMX_DEPENDENCIES += \ host-pkgconf \