jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/gstreamer1/gst1-plugins-bad: add introspection support

Browse Source 
If gobject-introspection is selected, explicitly set -Dintrospection=enabled in
the configure options and add a dependency for gobject-introspection.

This feature requires an upstream patch that allows introspection support even
when cross-compiling.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Adam Duskett 2020-03-15 13:10:30 -07:00 committed by Yann E. MORIN
parent 1dfa7f8e19
commit 4cbe598a9f
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package/gstreamer1/gst1-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introspection.patch Normal file
View File

@ -0,0 +1,36 @@
From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
From: Tim Philipp <tim@centricular.com>
Date: Fri, 18 Oct 2019 00:39:12 +0100
Subject: [PATCH] meson: build gir even when cross-compiling if introspection
was enabled explicitly
This can be made to work in certain circumstances when
cross-compiling, so default to not building g-i stuff
when cross-compiling, but allow it if introspection was
enabled explicitly via -Dintrospection=enabled.
See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
Upstream commit: 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19
Signed-off-by: Tim Philipp <tim@centricular.com>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 67aeeb4d03..7b3314bd9f 100644
--- a/meson.build
+++ b/meson.build
@@ -405,7 +405,7 @@ python3 = import('python').find_installation()
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')
-build_gir = gir.found() and not meson.is_cross_build()
+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
--
2.24.1

8
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
View File

@ -23,7 +23,6 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
-Dwinks=disabled \ -Dwinks=disabled \
-Dandroidmedia=disabled \ -Dandroidmedia=disabled \
-Dapplemedia=disabled \ -Dapplemedia=disabled \
-Dintrospection=disabled \
-Dgobject-cast-checks=disabled \ -Dgobject-cast-checks=disabled \
-Dglib-asserts=disabled \ -Dglib-asserts=disabled \
-Dglib-checks=disabled -Dglib-checks=disabled
@ -63,6 +62,13 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
GST1_PLUGINS_BAD_CONF_OPTS += -Dintrospection=enabled
GST1_PLUGINS_BAD_DEPENDENCIES += gobject-introspection
else
GST1_PLUGINS_BAD_CONF_OPTS += -Dintrospection=disabled
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled
GST1_PLUGINS_BAD_DEPENDENCIES += libdrm wayland wayland-protocols GST1_PLUGINS_BAD_DEPENDENCIES += libdrm wayland wayland-protocols