-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gstreamer: Backport 1.24.12 recipes from poky (walnascar)
Change-Type: minor
- Loading branch information
Showing
29 changed files
with
1,646 additions
and
0 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
...es-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
From 67809420230cd4fcc63069f78efdc90c7b4c4ee1 Mon Sep 17 00:00:00 2001 | ||
From: Khem Raj <[email protected]> | ||
Date: Sun, 9 Sep 2018 17:38:10 -0700 | ||
Subject: [PATCH] connect has a different signature on musl | ||
|
||
On linux when not using glibc and using musl for C library, connect | ||
API has a different signature, this patch fixes this so it can compile | ||
on musl, the functionality should remain same as it is immediately | ||
typcasted to struct sockaddr_in* type inside the function before use | ||
|
||
Upstream-Status: Pending | ||
|
||
Signed-off-by: Khem Raj <[email protected]> | ||
--- | ||
validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- | ||
1 file changed, 6 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/validate/plugins/fault_injection/socket_interposer.c b/validate/plugins/fault_injection/socket_interposer.c | ||
index 53c1ebb..ad7adf8 100644 | ||
--- a/validate/plugins/fault_injection/socket_interposer.c | ||
+++ b/validate/plugins/fault_injection/socket_interposer.c | ||
@@ -100,10 +100,15 @@ socket_interposer_set_callback (struct sockaddr_in *addrin, | ||
} | ||
|
||
int | ||
-connect (int socket, const struct sockaddr_in *addrin, socklen_t address_len) | ||
+#if defined(__linux__) && !defined(__GLIBC__) | ||
+connect (int socket, const struct sockaddr *addr, socklen_t address_len) | ||
+#else | ||
+connect (int socket, const struct sockaddr_in *addr, socklen_t address_len) | ||
+#endif | ||
{ | ||
size_t i; | ||
int override_errno = 0; | ||
+ struct sockaddr_in* addrin = (struct sockaddr_in*)addr; | ||
typedef ssize_t (*real_connect_fn) (int, const struct sockaddr_in *, | ||
socklen_t); | ||
static real_connect_fn real_connect = 0; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
SUMMARY = "Gstreamer validation tool" | ||
DESCRIPTION = "A Tool to test GStreamer components" | ||
HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html" | ||
SECTION = "multimedia" | ||
|
||
LICENSE = "LGPL-2.1-or-later" | ||
LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
|
||
#S = "${WORKDIR}/gst-devtools-${PV}" | ||
|
||
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \ | ||
file://0001-connect-has-a-different-signature-on-musl.patch \ | ||
" | ||
|
||
SRC_URI[sha256sum] = "4ef3dd12e5827068d6db7ad01876d1216a80717116c24a0d5b3b57fd7e3c3478" | ||
|
||
DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" | ||
RRECOMMENDS:${PN} = "git" | ||
|
||
FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" | ||
|
||
inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection | ||
|
||
# TODO: put this in a gettext.bbclass patch | ||
def gettext_oemeson(d): | ||
if d.getVar('USE_NLS') == 'no': | ||
return '-Dnls=disabled' | ||
# Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set | ||
if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): | ||
return '-Dnls=disabled' | ||
return '-Dnls=enabled' | ||
|
||
# Build GstValidateVideo | ||
PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" | ||
|
||
EXTRA_OEMESON += " \ | ||
-Ddoc=disabled \ | ||
-Ddebug_viewer=disabled \ | ||
-Dtests=disabled \ | ||
-Dvalidate=enabled \ | ||
${@gettext_oemeson(d)} \ | ||
" | ||
|
||
do_install:append () { | ||
for fn in ${bindir}/gst-validate-launcher \ | ||
${libdir}/gst-validate-launcher/python/launcher/config.py; do | ||
sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn | ||
done | ||
} | ||
|
||
GIR_MESON_ENABLE_FLAG = "enabled" | ||
GIR_MESON_DISABLE_FLAG = "disabled" |
37 changes: 37 additions & 0 deletions
37
recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 7924016fce2d0b435891a335cdae52fc939c7e3b Mon Sep 17 00:00:00 2001 | ||
From: Jussi Kukkonen <[email protected]> | ||
Date: Thu, 17 Aug 2017 11:07:02 +0300 | ||
Subject: [PATCH] Make player examples installable | ||
|
||
Signed-off-by: Jussi Kukkonen <[email protected]> | ||
Upstream-Status: Denied [Upstream considers these code examples, for now a least] | ||
|
||
https://bugzilla.gnome.org/show_bug.cgi?id=777827 | ||
|
||
--- | ||
playback/player/gst-play/meson.build | 1 + | ||
playback/player/gtk/meson.build | 1 + | ||
2 files changed, 2 insertions(+) | ||
|
||
diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build | ||
index 8ec021d..977cc5c 100644 | ||
--- a/playback/player/gst-play/meson.build | ||
+++ b/playback/player/gst-play/meson.build | ||
@@ -2,5 +2,6 @@ executable('gst-play', | ||
['gst-play.c', | ||
'gst-play-kb.c', | ||
'gst-play-kb.h'], | ||
+ install: true, | ||
dependencies : [gst_dep, gstplayer_dep, m_dep]) | ||
|
||
diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build | ||
index f7a7419..6281130 100644 | ||
--- a/playback/player/gtk/meson.build | ||
+++ b/playback/player/gtk/meson.build | ||
@@ -13,5 +13,6 @@ if gtk_dep.found() | ||
gtk_play_resources, | ||
'gtk-video-renderer.h', | ||
'gtk-video-renderer.c'], | ||
+ install: true, | ||
dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep]) | ||
endif |
10 changes: 10 additions & 0 deletions
10
recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
[Desktop Entry] | ||
Name=Media Player | ||
Comment=Basic media player | ||
Icon=video-player | ||
TryExec=gtk-play | ||
Exec=gtk-play | ||
StartupNotify=true | ||
Terminal=false | ||
Type=Application | ||
Categories=GTK;AudioVideo; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
SUMMARY = "GStreamer examples (including gtk-play, gst-play)" | ||
DESCRIPTION = "GStreamer example applications" | ||
HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples" | ||
BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues" | ||
LICENSE = "LGPL-2.0-or-later" | ||
LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" | ||
|
||
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" | ||
|
||
SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \ | ||
file://0001-Make-player-examples-installable.patch \ | ||
file://gst-player.desktop \ | ||
" | ||
|
||
SRCREV = "70e4fcf4fc8ae19641aa990de5f37d758cdfcea4" | ||
|
||
S = "${WORKDIR}/git" | ||
|
||
inherit meson pkgconfig features_check | ||
|
||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" | ||
|
||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
|
||
do_install:append() { | ||
install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop | ||
} | ||
|
||
RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" | ||
RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \ | ||
gstreamer1.0-plugins-good-meta \ | ||
gstreamer1.0-plugins-bad-meta \ | ||
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \ | ||
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" | ||
RPROVIDES:${PN} += "gst-player gst-player-bin" |
29 changes: 29 additions & 0 deletions
29
recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.12.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
SUMMARY = "Libav-based GStreamer 1.x plugin" | ||
DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \ | ||
muxers, and demuxers provided by FFmpeg." | ||
HOMEPAGE = "http://gstreamer.freedesktop.org/" | ||
SECTION = "multimedia" | ||
|
||
# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency | ||
LICENSE_FLAGS = "commercial" | ||
LICENSE = "LGPL-2.1-or-later" | ||
LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ | ||
file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ | ||
" | ||
|
||
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" | ||
SRC_URI[sha256sum] = "ef72c1c70a17b3c0bb283d16d09aba496d3401c927dcf5392a8a7866d9336379" | ||
|
||
S = "${WORKDIR}/gst-libav-${PV}" | ||
|
||
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg" | ||
|
||
inherit meson pkgconfig upstream-version-is-even | ||
|
||
EXTRA_OEMESON += " \ | ||
-Dtests=disabled \ | ||
-Ddoc=disabled \ | ||
" | ||
|
||
FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" | ||
FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
SUMMARY = "Gstreamer1.0 package groups" | ||
LICENSE = "MIT" | ||
|
||
# Due to use of COMBINED_FEATURES | ||
PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
|
||
inherit packagegroup | ||
|
||
COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}" | ||
DEPENDS_UGLY = "${@'gstreamer1.0-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}" | ||
DEPENDS_BAD = "${@'gstreamer1.0-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}" | ||
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}" | ||
|
||
PACKAGES = "\ | ||
gstreamer1.0-meta-base \ | ||
gstreamer1.0-meta-x11-base \ | ||
gstreamer1.0-meta-audio \ | ||
gstreamer1.0-meta-debug \ | ||
gstreamer1.0-meta-video" | ||
|
||
ALLOW_EMPTY:gstreamer1.0-meta-base = "1" | ||
ALLOW_EMPTY:gstreamer1.0-meta-x11-base = "1" | ||
ALLOW_EMPTY:gstreamer1.0-meta-audio = "1" | ||
ALLOW_EMPTY:gstreamer1.0-meta-debug = "1" | ||
ALLOW_EMPTY:gstreamer1.0-meta-video = "1" | ||
|
||
RDEPENDS:gstreamer1.0-meta-base = "\ | ||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \ | ||
gstreamer1.0 \ | ||
gstreamer1.0-plugins-base-playback \ | ||
gstreamer1.0-plugins-base-gio \ | ||
${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '',d)} \ | ||
gstreamer1.0-plugins-base-volume \ | ||
gstreamer1.0-plugins-base-audioconvert \ | ||
gstreamer1.0-plugins-base-audioresample \ | ||
gstreamer1.0-plugins-base-typefindfunctions \ | ||
gstreamer1.0-plugins-base-videoconvertscale \ | ||
gstreamer1.0-plugins-good-autodetect \ | ||
gstreamer1.0-plugins-good-soup" | ||
|
||
RRECOMMENDS:gstreamer1.0-meta-x11-base = "\ | ||
gstreamer1.0-plugins-base-ximagesink \ | ||
gstreamer1.0-plugins-base-xvimagesink" | ||
|
||
RDEPENDS:gstreamer1.0-meta-audio = "\ | ||
gstreamer1.0-meta-base \ | ||
gstreamer1.0-plugins-base-vorbis \ | ||
gstreamer1.0-plugins-base-ogg \ | ||
gstreamer1.0-plugins-good-wavparse \ | ||
gstreamer1.0-plugins-good-flac \ | ||
${COMMERCIAL_AUDIO_PLUGINS}" | ||
|
||
RDEPENDS:gstreamer1.0-meta-debug = "\ | ||
gstreamer1.0-meta-base \ | ||
gstreamer1.0-plugins-good-debug \ | ||
gstreamer1.0-plugins-base-audiotestsrc \ | ||
gstreamer1.0-plugins-base-videotestsrc" | ||
|
||
RDEPENDS:gstreamer1.0-meta-video = "\ | ||
gstreamer1.0-meta-base \ | ||
gstreamer1.0-plugins-good-avi \ | ||
gstreamer1.0-plugins-good-matroska \ | ||
gstreamer1.0-plugins-base-theora \ | ||
${COMMERCIAL_VIDEO_PLUGINS}" | ||
|
||
RRECOMMENDS:gstreamer1.0-meta-video = "\ | ||
gstreamer1.0-meta-audio" |
25 changes: 25 additions & 0 deletions
25
.../gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 9456674cea4a933d5fbc24230d307fe0f52588f3 Mon Sep 17 00:00:00 2001 | ||
From: Andre McCurdy <[email protected]> | ||
Date: Tue, 26 Jan 2016 15:16:01 -0800 | ||
Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os | ||
|
||
Upstream-Status: Pending | ||
|
||
Signed-off-by: Andre McCurdy <[email protected]> | ||
--- | ||
gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c | ||
index f9af175..6661e2e 100644 | ||
--- a/gst-libs/gst/codecparsers/gstvc1parser.c | ||
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c | ||
@@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size, | ||
GstVC1SeqLayer * seqlayer) | ||
{ | ||
guint32 tmp; | ||
- guint8 tmp8; | ||
+ guint8 tmp8 = 0; | ||
guint8 structA[8] = { 0, }; | ||
guint8 structB[12] = { 0, }; | ||
GstBitReader br; |
27 changes: 27 additions & 0 deletions
27
...timedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From dd2b92fb70fed2799809c423fea79221a3e17108 Mon Sep 17 00:00:00 2001 | ||
From: Andre McCurdy <[email protected]> | ||
Date: Wed, 3 Feb 2016 18:05:41 -0800 | ||
Subject: [PATCH] avoid including <sys/poll.h> directly | ||
|
||
musl libc generates warnings if <sys/poll.h> is included directly. | ||
|
||
Upstream-Status: Pending | ||
|
||
Signed-off-by: Andre McCurdy <[email protected]> | ||
--- | ||
sys/dvb/gstdvbsrc.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c | ||
index 33ee3ff..b8ddea9 100644 | ||
--- a/sys/dvb/gstdvbsrc.c | ||
+++ b/sys/dvb/gstdvbsrc.c | ||
@@ -98,7 +98,7 @@ | ||
#include <gst/gst.h> | ||
#include <gst/glib-compat-private.h> | ||
#include <sys/ioctl.h> | ||
-#include <sys/poll.h> | ||
+#include <poll.h> | ||
#include <fcntl.h> | ||
#include <errno.h> | ||
#include <stdio.h> |
32 changes: 32 additions & 0 deletions
32
.../gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From bd389203124592cfd91fb020ea05a5e4ad1c1394 Mon Sep 17 00:00:00 2001 | ||
From: Andrey Zhizhikin <[email protected]> | ||
Date: Mon, 27 Jan 2020 10:22:35 +0000 | ||
Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build | ||
|
||
When Yocto build is performed, opencv searches for data dir using simple | ||
'test' command, this fails because pkg-config provides an absolute | ||
path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR | ||
in order for the 'test' utility to pick up the absolute path. | ||
|
||
Upstream-Status: Inappropriate [OE-specific] | ||
|
||
Signed-off-by: Andrey Zhizhikin <[email protected]> | ||
Signed-off-by: Jose Quaresma <[email protected]> | ||
--- | ||
gst-libs/gst/opencv/meson.build | 3 +++ | ||
1 file changed, 3 insertions(+) | ||
|
||
diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build | ||
index 1d337f1..f47939a 100644 | ||
--- a/gst-libs/gst/opencv/meson.build | ||
+++ b/gst-libs/gst/opencv/meson.build | ||
@@ -52,6 +52,9 @@ if opencv_found | ||
# /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] | ||
gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) | ||
|
||
+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | ||
+ opencv_prefix = pkgconf_sysroot + opencv_prefix | ||
+ | ||
# Check the data dir used by opencv for its xml data files | ||
# Use prefix from pkg-config to be compatible with cross-compilation | ||
r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) |
Oops, something went wrong.