* [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-imx: allow to build with Waf on Python3
@ 2020-02-04 21:53 Titouan Christophe
2020-02-05 15:47 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Titouan Christophe @ 2020-02-04 21:53 UTC (permalink / raw)
To: 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 <titouan.christophe@railnova.eu>
---
.../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 <max.krummenacher@toradex.com>
+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 <max.krummenacher@toradex.com>
+[Titouan: backport part from upstream, but drop the update of waf itself]
+Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
+---
+ 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 \
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-imx: allow to build with Waf on Python3
2020-02-04 21:53 [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-imx: allow to build with Waf on Python3 Titouan Christophe
@ 2020-02-05 15:47 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2020-02-05 15:47 UTC (permalink / raw)
To: buildroot
On Tue, 4 Feb 2020 22:53:57 +0100
Titouan Christophe <titouan.christophe@railnova.eu> wrote:
> 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 <titouan.christophe@railnova.eu>
> ---
> .../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
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-05 15:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 21:53 [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-imx: allow to build with Waf on Python3 Titouan Christophe
2020-02-05 15:47 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.