mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
package/gstreamer1/gstreamer1: add introspection support
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:
parent
b7255cba48
commit
83127d5dd0
@ -0,0 +1,36 @@
|
|||||||
|
From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tim Philipp <tim@centricular.com>
|
||||||
|
Date: Thu, 17 Oct 2019 12:13:35 +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.
|
||||||
|
|
||||||
|
Fixes #454 and #381.
|
||||||
|
|
||||||
|
Upstream commit: 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8
|
||||||
|
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 90d98d8eb00..a47e7f34e8a 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -453,7 +453,7 @@ rt_lib = cc.find_library('rt', required : false)
|
||||||
|
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_DISABLE", "yes", TRUE);' + \
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
@ -16,7 +16,6 @@ GSTREAMER1_CONF_OPTS = \
|
|||||||
-Dtests=disabled \
|
-Dtests=disabled \
|
||||||
-Dbenchmarks=disabled \
|
-Dbenchmarks=disabled \
|
||||||
-Dgtk_doc=disabled \
|
-Dgtk_doc=disabled \
|
||||||
-Dintrospection=disabled \
|
|
||||||
-Dglib-asserts=disabled \
|
-Dglib-asserts=disabled \
|
||||||
-Dglib-checks=disabled \
|
-Dglib-checks=disabled \
|
||||||
-Dgobject-cast-checks=disabled \
|
-Dgobject-cast-checks=disabled \
|
||||||
@ -36,6 +35,13 @@ GSTREAMER1_DEPENDENCIES = \
|
|||||||
$(if $(BR2_PACKAGE_VALGRIND),valgrind) \
|
$(if $(BR2_PACKAGE_VALGRIND),valgrind) \
|
||||||
$(TARGET_NLS_DEPENDENCIES)
|
$(TARGET_NLS_DEPENDENCIES)
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||||
|
GSTREAMER1_CONF_OPTS += -Dintrospection=enabled
|
||||||
|
GSTREAMER1_DEPENDENCIES += gobject-introspection
|
||||||
|
else
|
||||||
|
GSTREAMER1_CONF_OPTS += -Dintrospection=disabled
|
||||||
|
endif
|
||||||
|
|
||||||
GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||||
|
|
||||||
$(eval $(meson-package))
|
$(eval $(meson-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user