Skip to content

Commit 2e7e969

Browse files
committed
gstreamer: Backport 1.24.12 recipes from poky (walnascar)
Change-Type: minor
1 parent af3d33c commit 2e7e969

29 files changed

+1646
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 67809420230cd4fcc63069f78efdc90c7b4c4ee1 Mon Sep 17 00:00:00 2001
2+
From: Khem Raj <[email protected]>
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 <[email protected]>
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;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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-${PV}"
10+
11+
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \
12+
file://0001-connect-has-a-different-signature-on-musl.patch \
13+
"
14+
15+
SRC_URI[sha256sum] = "4ef3dd12e5827068d6db7ad01876d1216a80717116c24a0d5b3b57fd7e3c3478"
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+
# TODO: put this in a gettext.bbclass patch
25+
def gettext_oemeson(d):
26+
if d.getVar('USE_NLS') == 'no':
27+
return '-Dnls=disabled'
28+
# Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
29+
if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'):
30+
return '-Dnls=disabled'
31+
return '-Dnls=enabled'
32+
33+
# Build GstValidateVideo
34+
PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
35+
36+
EXTRA_OEMESON += " \
37+
-Ddoc=disabled \
38+
-Ddebug_viewer=disabled \
39+
-Dtests=disabled \
40+
-Dvalidate=enabled \
41+
${@gettext_oemeson(d)} \
42+
"
43+
44+
do_install:append () {
45+
for fn in ${bindir}/gst-validate-launcher \
46+
${libdir}/gst-validate-launcher/python/launcher/config.py; do
47+
sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn
48+
done
49+
}
50+
51+
GIR_MESON_ENABLE_FLAG = "enabled"
52+
GIR_MESON_DISABLE_FLAG = "disabled"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 7924016fce2d0b435891a335cdae52fc939c7e3b Mon Sep 17 00:00:00 2001
2+
From: Jussi Kukkonen <[email protected]>
3+
Date: Thu, 17 Aug 2017 11:07:02 +0300
4+
Subject: [PATCH] Make player examples installable
5+
6+
Signed-off-by: Jussi Kukkonen <[email protected]>
7+
Upstream-Status: Denied [Upstream considers these code examples, for now a least]
8+
9+
https://bugzilla.gnome.org/show_bug.cgi?id=777827
10+
11+
---
12+
playback/player/gst-play/meson.build | 1 +
13+
playback/player/gtk/meson.build | 1 +
14+
2 files changed, 2 insertions(+)
15+
16+
diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build
17+
index 8ec021d..977cc5c 100644
18+
--- a/playback/player/gst-play/meson.build
19+
+++ b/playback/player/gst-play/meson.build
20+
@@ -2,5 +2,6 @@ executable('gst-play',
21+
['gst-play.c',
22+
'gst-play-kb.c',
23+
'gst-play-kb.h'],
24+
+ install: true,
25+
dependencies : [gst_dep, gstplayer_dep, m_dep])
26+
27+
diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build
28+
index f7a7419..6281130 100644
29+
--- a/playback/player/gtk/meson.build
30+
+++ b/playback/player/gtk/meson.build
31+
@@ -13,5 +13,6 @@ if gtk_dep.found()
32+
gtk_play_resources,
33+
'gtk-video-renderer.h',
34+
'gtk-video-renderer.c'],
35+
+ install: true,
36+
dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep])
37+
endif
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[Desktop Entry]
2+
Name=Media Player
3+
Comment=Basic media player
4+
Icon=video-player
5+
TryExec=gtk-play
6+
Exec=gtk-play
7+
StartupNotify=true
8+
Terminal=false
9+
Type=Application
10+
Categories=GTK;AudioVideo;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
SUMMARY = "GStreamer examples (including gtk-play, gst-play)"
2+
DESCRIPTION = "GStreamer example applications"
3+
HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples"
4+
BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues"
5+
LICENSE = "LGPL-2.0-or-later"
6+
LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9"
7+
8+
DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native"
9+
10+
SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \
11+
file://0001-Make-player-examples-installable.patch \
12+
file://gst-player.desktop \
13+
"
14+
15+
SRCREV = "70e4fcf4fc8ae19641aa990de5f37d758cdfcea4"
16+
17+
S = "${WORKDIR}/git"
18+
19+
inherit meson pkgconfig features_check
20+
21+
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
22+
23+
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
24+
25+
do_install:append() {
26+
install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
27+
}
28+
29+
RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
30+
RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
31+
gstreamer1.0-plugins-good-meta \
32+
gstreamer1.0-plugins-bad-meta \
33+
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
34+
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
35+
RPROVIDES:${PN} += "gst-player gst-player-bin"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
SUMMARY = "Libav-based GStreamer 1.x plugin"
2+
DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \
3+
muxers, and demuxers provided by FFmpeg."
4+
HOMEPAGE = "http://gstreamer.freedesktop.org/"
5+
SECTION = "multimedia"
6+
7+
# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency
8+
LICENSE_FLAGS = "commercial"
9+
LICENSE = "LGPL-2.1-or-later"
10+
LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
11+
file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
12+
"
13+
14+
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
15+
SRC_URI[sha256sum] = "ef72c1c70a17b3c0bb283d16d09aba496d3401c927dcf5392a8a7866d9336379"
16+
17+
S = "${WORKDIR}/gst-libav-${PV}"
18+
19+
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
20+
21+
inherit meson pkgconfig upstream-version-is-even
22+
23+
EXTRA_OEMESON += " \
24+
-Dtests=disabled \
25+
-Ddoc=disabled \
26+
"
27+
28+
FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
29+
FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
SUMMARY = "Gstreamer1.0 package groups"
2+
LICENSE = "MIT"
3+
4+
# Due to use of COMBINED_FEATURES
5+
PACKAGE_ARCH = "${MACHINE_ARCH}"
6+
7+
inherit packagegroup
8+
9+
COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}"
10+
DEPENDS_UGLY = "${@'gstreamer1.0-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
11+
DEPENDS_BAD = "${@'gstreamer1.0-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
12+
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}"
13+
14+
PACKAGES = "\
15+
gstreamer1.0-meta-base \
16+
gstreamer1.0-meta-x11-base \
17+
gstreamer1.0-meta-audio \
18+
gstreamer1.0-meta-debug \
19+
gstreamer1.0-meta-video"
20+
21+
ALLOW_EMPTY:gstreamer1.0-meta-base = "1"
22+
ALLOW_EMPTY:gstreamer1.0-meta-x11-base = "1"
23+
ALLOW_EMPTY:gstreamer1.0-meta-audio = "1"
24+
ALLOW_EMPTY:gstreamer1.0-meta-debug = "1"
25+
ALLOW_EMPTY:gstreamer1.0-meta-video = "1"
26+
27+
RDEPENDS:gstreamer1.0-meta-base = "\
28+
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \
29+
gstreamer1.0 \
30+
gstreamer1.0-plugins-base-playback \
31+
gstreamer1.0-plugins-base-gio \
32+
${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '',d)} \
33+
gstreamer1.0-plugins-base-volume \
34+
gstreamer1.0-plugins-base-audioconvert \
35+
gstreamer1.0-plugins-base-audioresample \
36+
gstreamer1.0-plugins-base-typefindfunctions \
37+
gstreamer1.0-plugins-base-videoconvertscale \
38+
gstreamer1.0-plugins-good-autodetect \
39+
gstreamer1.0-plugins-good-soup"
40+
41+
RRECOMMENDS:gstreamer1.0-meta-x11-base = "\
42+
gstreamer1.0-plugins-base-ximagesink \
43+
gstreamer1.0-plugins-base-xvimagesink"
44+
45+
RDEPENDS:gstreamer1.0-meta-audio = "\
46+
gstreamer1.0-meta-base \
47+
gstreamer1.0-plugins-base-vorbis \
48+
gstreamer1.0-plugins-base-ogg \
49+
gstreamer1.0-plugins-good-wavparse \
50+
gstreamer1.0-plugins-good-flac \
51+
${COMMERCIAL_AUDIO_PLUGINS}"
52+
53+
RDEPENDS:gstreamer1.0-meta-debug = "\
54+
gstreamer1.0-meta-base \
55+
gstreamer1.0-plugins-good-debug \
56+
gstreamer1.0-plugins-base-audiotestsrc \
57+
gstreamer1.0-plugins-base-videotestsrc"
58+
59+
RDEPENDS:gstreamer1.0-meta-video = "\
60+
gstreamer1.0-meta-base \
61+
gstreamer1.0-plugins-good-avi \
62+
gstreamer1.0-plugins-good-matroska \
63+
gstreamer1.0-plugins-base-theora \
64+
${COMMERCIAL_VIDEO_PLUGINS}"
65+
66+
RRECOMMENDS:gstreamer1.0-meta-video = "\
67+
gstreamer1.0-meta-audio"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 9456674cea4a933d5fbc24230d307fe0f52588f3 Mon Sep 17 00:00:00 2001
2+
From: Andre McCurdy <[email protected]>
3+
Date: Tue, 26 Jan 2016 15:16:01 -0800
4+
Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
5+
6+
Upstream-Status: Pending
7+
8+
Signed-off-by: Andre McCurdy <[email protected]>
9+
---
10+
gst-libs/gst/codecparsers/gstvc1parser.c | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
14+
index f9af175..6661e2e 100644
15+
--- a/gst-libs/gst/codecparsers/gstvc1parser.c
16+
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
17+
@@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
18+
GstVC1SeqLayer * seqlayer)
19+
{
20+
guint32 tmp;
21+
- guint8 tmp8;
22+
+ guint8 tmp8 = 0;
23+
guint8 structA[8] = { 0, };
24+
guint8 structB[12] = { 0, };
25+
GstBitReader br;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From dd2b92fb70fed2799809c423fea79221a3e17108 Mon Sep 17 00:00:00 2001
2+
From: Andre McCurdy <[email protected]>
3+
Date: Wed, 3 Feb 2016 18:05:41 -0800
4+
Subject: [PATCH] avoid including <sys/poll.h> directly
5+
6+
musl libc generates warnings if <sys/poll.h> is included directly.
7+
8+
Upstream-Status: Pending
9+
10+
Signed-off-by: Andre McCurdy <[email protected]>
11+
---
12+
sys/dvb/gstdvbsrc.c | 2 +-
13+
1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
16+
index 33ee3ff..b8ddea9 100644
17+
--- a/sys/dvb/gstdvbsrc.c
18+
+++ b/sys/dvb/gstdvbsrc.c
19+
@@ -98,7 +98,7 @@
20+
#include <gst/gst.h>
21+
#include <gst/glib-compat-private.h>
22+
#include <sys/ioctl.h>
23+
-#include <sys/poll.h>
24+
+#include <poll.h>
25+
#include <fcntl.h>
26+
#include <errno.h>
27+
#include <stdio.h>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From bd389203124592cfd91fb020ea05a5e4ad1c1394 Mon Sep 17 00:00:00 2001
2+
From: Andrey Zhizhikin <[email protected]>
3+
Date: Mon, 27 Jan 2020 10:22:35 +0000
4+
Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
5+
6+
When Yocto build is performed, opencv searches for data dir using simple
7+
'test' command, this fails because pkg-config provides an absolute
8+
path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR
9+
in order for the 'test' utility to pick up the absolute path.
10+
11+
Upstream-Status: Inappropriate [OE-specific]
12+
13+
Signed-off-by: Andrey Zhizhikin <[email protected]>
14+
Signed-off-by: Jose Quaresma <[email protected]>
15+
---
16+
gst-libs/gst/opencv/meson.build | 3 +++
17+
1 file changed, 3 insertions(+)
18+
19+
diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
20+
index 1d337f1..f47939a 100644
21+
--- a/gst-libs/gst/opencv/meson.build
22+
+++ b/gst-libs/gst/opencv/meson.build
23+
@@ -52,6 +52,9 @@ if opencv_found
24+
# /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
25+
gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral'])
26+
27+
+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
28+
+ opencv_prefix = pkgconf_sysroot + opencv_prefix
29+
+
30+
# Check the data dir used by opencv for its xml data files
31+
# Use prefix from pkg-config to be compatible with cross-compilation
32+
r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)

0 commit comments

Comments
 (0)