mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

gstreamer1.0-rtsp-server: Transition to meson based build

Browse Source 
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch is a
  fix for GIR support in the meson.build file.

(From OE-Core rev: 63217812467f4d225c80c145edbbceca1dc8efc0)

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Carlos Rafael Giani
2020-01-12 14:59:52 +01:00
committed by Richard Purdie
parent ae3d39ddfd
commit 5197e71a8f
2 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
+36
View File
@@ -0,0 +1,36 @@
From 95ce953e34cd0e9f5d42ce7900a9572e7bc8ca47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Fri, 18 Oct 2019 00:42: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-Status: Backport [95ce953e34cd0e9f5d42ce7900a9572e7bc8ca47]
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index e1e3b1d..3f45f0e 100644
--- a/meson.build
+++ b/meson.build
@@ -173,7 +173,7 @@ endif
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.17.1
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb
+10 -13
View File
@@ -9,8 +9,7 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
PNREAL = "gst-rtsp-server"
SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
file://gtk-doc-tweaks.patch \
file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
"
SRC_URI[md5sum] = "380d6a42e856c32fcefa508ad57129e0"
@@ -18,17 +17,15 @@ SRC_URI[sha256sum] = "b0abacad2f86f60d63781d2b24443c5668733e8b08664bbef94124906d
S = "${WORKDIR}/${PNREAL}-${PV}"
inherit autotools pkgconfig upstream-version-is-even gobject-introspection gtk-doc
inherit meson pkgconfig upstream-version-is-even gobject-introspection
EXTRA_OECONF = "--disable-examples --disable-tests"
EXTRA_OEMESON += " \
-Dexamples=disabled \
-Dtests=disabled \
"
GIR_MESON_ENABLE_FLAG = "enabled"
GIR_MESON_DISABLE_FLAG = "disabled"
# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
LIBV = "1.0"
require gst-plugins-package.inc
delete_pkg_m4_file() {
# This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection
rm "${S}/common/m4/pkg.m4" || true
}
do_configure[prefuncs] += " delete_pkg_m4_file"
require gstreamer1.0-plugins-packaging.inc