Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
@@ -1,43 +0,0 @@
|
||||
From 10707f437f2fc3632067c6a0efa4432f7ebaf362 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Dröge <sebastian@centricular.com>
|
||||
Date: Fri, 13 Dec 2019 10:46:20 +0200
|
||||
Subject: [PATCH] backport of "fix build with Python 3.8 by also checking for
|
||||
python-3.X-embed.pc"
|
||||
|
||||
Since Python 3.8 the normal checks don't include the Python libraries
|
||||
anymore and linking of the gst-python module would fail.
|
||||
|
||||
See also https://github.com/mesonbuild/meson/issues/5629
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
|
||||
|
||||
Upstream commit: 22f28155d86e27c4134de4ed2861264003fcfd23
|
||||
|
||||
Signed-off-by: Sebastian Dröge <sebastian@centricular.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
meson.build | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 744b7ce..492af1a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -25,6 +25,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
|
||||
pymod = import('python')
|
||||
python = pymod.find_installation(get_option('python'))
|
||||
python_dep = python.dependency(required : true)
|
||||
+pythonver = python.language_version()
|
||||
+
|
||||
+# Workaround for https://github.com/mesonbuild/meson/issues/5629
|
||||
+# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
|
||||
+python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false)
|
||||
+if not python_dep.found()
|
||||
+ python_dep = python.dependency(required : true)
|
||||
+endif
|
||||
|
||||
python_abi_flags = python.get_variable('ABIFLAGS', '')
|
||||
pylib_loc = get_option('libpython-dir')
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -6,6 +6,7 @@ config BR2_PACKAGE_GST1_PYTHON
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection
|
||||
depends on BR2_PACKAGE_PYTHON3 # gobject-introspection
|
||||
select BR2_PACKAGE_GOBJECT_INTROSPECTION
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_PYTHON_GOBJECT
|
||||
help
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz.sha256sum
|
||||
sha256 208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8 gst-python-1.16.2.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.3.tar.xz.sha256sum
|
||||
sha256 4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a gst-python-1.18.3.tar.xz
|
||||
sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PYTHON_VERSION = 1.16.2
|
||||
GST1_PYTHON_VERSION = 1.18.3
|
||||
GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz
|
||||
GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python
|
||||
GST1_PYTHON_INSTALL_STAGING = YES
|
||||
@@ -12,6 +12,7 @@ GST1_PYTHON_LICENSE_FILES = COPYING
|
||||
GST1_PYTHON_LICENSE = LGPL-2.1+
|
||||
|
||||
GST1_PYTHON_DEPENDENCIES = \
|
||||
gst1-plugins-base \
|
||||
gstreamer1 \
|
||||
python-gobject
|
||||
|
||||
|
||||
Reference in New Issue
Block a user