diff options
3 files changed, 95 insertions, 0 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 10f74c5d..277ce450 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -482,6 +482,7 @@ PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.20.3.imx" | |||
482 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.20.3.imx" | 482 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.20.3.imx" |
483 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.20.3.imx" | 483 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.20.3.imx" |
484 | PREFERRED_VERSION_gstreamer1.0-omx:mx8-nxp-bsp ??= "1.20.3.imx" | 484 | PREFERRED_VERSION_gstreamer1.0-omx:mx8-nxp-bsp ??= "1.20.3.imx" |
485 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.20.3.imx" | ||
485 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" | 486 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" |
486 | 487 | ||
487 | # Determines if the SoC has support for Vivante kernel driver | 488 | # Determines if the SoC has support for Vivante kernel driver |
diff --git a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch new file mode 100644 index 00000000..c0e45813 --- /dev/null +++ b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 73b1002eda17451db1f58431b42c25203f1d3097 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 9 Sep 2018 17:38:10 -0700 | ||
4 | Subject: [PATCH] connect has a different signature on musl | ||
5 | |||
6 | On linux when not using glibc and using musl for C library, connect | ||
7 | API has a different signature, this patch fixes this so it can compile | ||
8 | on musl, the functionality should remain same as it is immediately | ||
9 | typcasted to struct sockaddr_in* type inside the function before use | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- | ||
16 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/validate/plugins/fault_injection/socket_interposer.c b/validate/plugins/fault_injection/socket_interposer.c | ||
19 | index 53c1ebb..ad7adf8 100644 | ||
20 | --- a/validate/plugins/fault_injection/socket_interposer.c | ||
21 | +++ b/validate/plugins/fault_injection/socket_interposer.c | ||
22 | @@ -100,10 +100,15 @@ socket_interposer_set_callback (struct sockaddr_in *addrin, | ||
23 | } | ||
24 | |||
25 | int | ||
26 | -connect (int socket, const struct sockaddr_in *addrin, socklen_t address_len) | ||
27 | +#if defined(__linux__) && !defined(__GLIBC__) | ||
28 | +connect (int socket, const struct sockaddr *addr, socklen_t address_len) | ||
29 | +#else | ||
30 | +connect (int socket, const struct sockaddr_in *addr, socklen_t address_len) | ||
31 | +#endif | ||
32 | { | ||
33 | size_t i; | ||
34 | int override_errno = 0; | ||
35 | + struct sockaddr_in* addrin = (struct sockaddr_in*)addr; | ||
36 | typedef ssize_t (*real_connect_fn) (int, const struct sockaddr_in *, | ||
37 | socklen_t); | ||
38 | static real_connect_fn real_connect = 0; | ||
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.20.3.imx.bb new file mode 100644 index 00000000..5daba9d7 --- /dev/null +++ b/recipes-multimedia/gstreamer/gst-devtools_1.20.3.imx.bb | |||
@@ -0,0 +1,56 @@ | |||
1 | SUMMARY = "Gstreamer validation tool" | ||
2 | DESCRIPTION = "A Tool to test GStreamer components" | ||
3 | HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html" | ||
4 | SECTION = "multimedia" | ||
5 | |||
6 | LICENSE = "LGPL-2.1-or-later" | ||
7 | LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
8 | |||
9 | S = "${WORKDIR}/gst-devtools-${@get_gst_ver('${PV}')}" | ||
10 | |||
11 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver('${PV}')}.tar.xz \ | ||
12 | file://0001-connect-has-a-different-signature-on-musl.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[sha256sum] = "bbbd45ead703367ea8f4be9b3c082d7b62bef47b240a39083f27844e28758c47" | ||
16 | |||
17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" | ||
18 | RRECOMMENDS:${PN} = "git" | ||
19 | |||
20 | FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" | ||
21 | |||
22 | inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection | ||
23 | |||
24 | # Drop .imx from PV | ||
25 | def get_gst_ver(v): | ||
26 | return oe.utils.trim_version(v, 3) | ||
27 | |||
28 | # TODO: put this in a gettext.bbclass patch | ||
29 | def gettext_oemeson(d): | ||
30 | if d.getVar('USE_NLS') == 'no': | ||
31 | return '-Dnls=disabled' | ||
32 | # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set | ||
33 | if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): | ||
34 | return '-Dnls=disabled' | ||
35 | return '-Dnls=enabled' | ||
36 | |||
37 | # Build GstValidateVideo | ||
38 | PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" | ||
39 | |||
40 | EXTRA_OEMESON += " \ | ||
41 | -Ddoc=disabled \ | ||
42 | -Ddebug_viewer=disabled \ | ||
43 | -Dtests=disabled \ | ||
44 | -Dvalidate=enabled \ | ||
45 | ${@gettext_oemeson(d)} \ | ||
46 | " | ||
47 | |||
48 | do_install:append () { | ||
49 | for fn in ${bindir}/gst-validate-launcher \ | ||
50 | ${libdir}/gst-validate-launcher/python/launcher/config.py; do | ||
51 | sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn | ||
52 | done | ||
53 | } | ||
54 | |||
55 | GIR_MESON_ENABLE_FLAG = "enabled" | ||
56 | GIR_MESON_DISABLE_FLAG = "disabled" | ||