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

gstreamer1.0-plugins-bad: upgrade to version 1.18.0

Browse Source 
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
      Removed since these are included in 1.18.0

PACKAGECONFIG:
 - vdpau has been removed upstream
 - vulkan needs now needs shaderc-native to build

EXTRA_OEMESON:
 - yadif has been removed upstream
 - nvdec and nvenc has been replaced with nvcodec

FILES:
 - add new files for transcode plugin

(From OE-Core rev: b4916863bc0bc685344dd3637ef890d90af15c5f)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jose Quaresma
2020-10-29 14:27:52 +00:00
committed by Richard Purdie
parent 40f827d2f2
commit 0be89e058d
6 changed files with 48 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch → meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From a67781000e82bd9ae3813da29401e8c0c852328a Mon Sep 17 00:00:00 2001 From f08ab3ac2ce43ac91d3bf65b26f26436690f499b Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com> From: Andre McCurdy <armccurdy@gmail.com>
Date: Tue, 26 Jan 2016 15:16:01 -0800 Date: Tue, 26 Jan 2016 15:16:01 -0800
Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os Subject: [PATCH 1/4] fix maybe-uninitialized warnings when compiling with -Os
Upstream-Status: Pending Upstream-Status: Pending
@@ -11,7 +11,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
index fd16ee0..ddb890c 100644 index 2c60ced..e8226d8 100644
--- a/gst-libs/gst/codecparsers/gstvc1parser.c --- a/gst-libs/gst/codecparsers/gstvc1parser.c
+++ b/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, @@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
@@ -24,5 +24,5 @@ index fd16ee0..ddb890c 100644
guint8 structB[12] = { 0, }; guint8 structB[12] = { 0, };
GstBitReader br; GstBitReader br;
-- --
1.9.1 2.28.0
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
-36
View File
@@ -1,36 +0,0 @@
From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 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:39:12 +0100
Subject: [PATCH 1/2] 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 [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19]
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 67aeeb4d0..7b3314bd9 100644
--- a/meson.build
+++ b/meson.build
@@ -411,7 +411,7 @@ python3 = import('python').find_installation()
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-plugins-bad/avoid-including-sys-poll.h-directly.patch → meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001 From 3b05e91720c10fcf6e0e408595b7217f6fa145c2 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com> From: Andre McCurdy <armccurdy@gmail.com>
Date: Wed, 3 Feb 2016 18:05:41 -0800 Date: Wed, 3 Feb 2016 18:05:41 -0800
Subject: [PATCH] avoid including <sys/poll.h> directly Subject: [PATCH 2/4] avoid including <sys/poll.h> directly
musl libc generates warnings if <sys/poll.h> is included directly. musl libc generates warnings if <sys/poll.h> is included directly.
@@ -13,7 +13,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index b93255f..49f145a 100644 index ca6b92a..b2772db 100644
--- a/sys/dvb/gstdvbsrc.c --- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
@@ -26,5 +26,5 @@ index b93255f..49f145a 100644
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
-- --
1.9.1 2.28.0
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch → meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch
+23 -20
View File
@@ -1,7 +1,7 @@
From 2262ba4b686d5cc0d3e894707fe1d31619a3a8f1 Mon Sep 17 00:00:00 2001 From 5ed27de9f662fe063b8b3d5d4335aa64cd4718c9 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com> From: Andre McCurdy <armccurdy@gmail.com>
Date: Tue, 9 Feb 2016 14:00:00 -0800 Date: Tue, 9 Feb 2016 14:00:00 -0800
Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc Subject: [PATCH 3/4] ensure valid sentinals for gst_structure_get() etc
For GStreamer functions declared with G_GNUC_NULL_TERMINATED, For GStreamer functions declared with G_GNUC_NULL_TERMINATED,
ie __attribute__((__sentinel__)), gcc will generate a warning if the ie __attribute__((__sentinel__)), gcc will generate a warning if the
@@ -23,20 +23,20 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
sys/decklink/gstdecklinkvideosink.cpp | 2 +- sys/decklink/gstdecklinkvideosink.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-) 3 files changed, 7 insertions(+), 7 deletions(-)
Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
=================================================================== index 4dac7e1..43762ce 100644
--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp --- a/sys/decklink/gstdecklink.cpp
+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp
@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDeck @@ -674,7 +674,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e)
"pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
"interlace-mode", G_TYPE_STRING, "interlace-mode", G_TYPE_STRING,
mode->interlaced ? "interleaved" : "progressive", mode->interlaced ? "interleaved" : "progressive",
- "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL); - "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL);
+ "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void*)NULL); + "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void*)NULL);
if (input && mode->interlaced) { return s;
if (mode->tff) }
@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDeck @@ -699,16 +699,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
case bmdFormat8BitYUV: /* '2vuy' */ case bmdFormat8BitYUV: /* '2vuy' */
gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
"colorimetry", G_TYPE_STRING, mode->colorimetry, "colorimetry", G_TYPE_STRING, mode->colorimetry,
@@ -57,11 +57,11 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
break; break;
case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
=================================================================== index 2fef934..c47229a 100644
--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp --- a/sys/decklink/gstdecklinkaudiosrc.cpp
+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp +++ b/sys/decklink/gstdecklinkaudiosrc.cpp
@@ -387,7 +387,7 @@ gst_decklink_audio_src_set_caps (GstBase @@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
g_mutex_unlock (&self->input->lock); g_mutex_unlock (&self->input->lock);
if (videosrc) { if (videosrc) {
@@ -70,11 +70,11 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
gst_object_unref (videosrc); gst_object_unref (videosrc);
switch (vconn) { switch (vconn) {
Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
=================================================================== index e3a6775..f1a5aae 100644
--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp --- a/sys/decklink/gstdecklinkvideosink.cpp
+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp +++ b/sys/decklink/gstdecklinkvideosink.cpp
@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * featu @@ -286,7 +286,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
gpointer user_data) gpointer user_data)
{ {
gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
@@ -83,3 +83,6 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp
return TRUE; return TRUE;
} }
--
2.28.0
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch → meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 From f19ff66640f2f472c4e9d9055253032d34e125c6 Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.z@gmail.com> From: Andrey Zhizhikin <andrey.z@gmail.com>
Date: Mon, 27 Jan 2020 10:22:35 +0000 Date: Mon, 27 Jan 2020 10:22:35 +0000
Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build Subject: [PATCH 4/4] opencv: resolve missing opencv data dir in yocto build
When Yocto build is performed, opencv searches for data dir using simple When Yocto build is performed, opencv searches for data dir using simple
'test' command, this fails because pkg-config provides an absolute 'test' command, this fails because pkg-config provides an absolute
@@ -16,7 +16,7 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index f38b55dfe..a26403482 100644 index 0b0b3fc..0ed3344 100644
--- a/ext/opencv/meson.build --- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build +++ b/ext/opencv/meson.build
@@ -78,20 +78,21 @@ else @@ -78,20 +78,21 @@ else
@@ -45,5 +45,5 @@ index f38b55dfe..a26403482 100644
gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"'
else else
-- --
2.17.1 2.28.0
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb → meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.bb
+13 -15
View File
@@ -1,15 +1,13 @@
require gstreamer1.0-plugins-common.inc require gstreamer1.0-plugins-common.inc
SRC_URI = " \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0002-avoid-including-sys-poll.h-directly.patch \
file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \
file://avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ "
file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ SRC_URI[md5sum] = "c1b5f2fb2d76ace6a3d04df73a8c72ea"
" SRC_URI[sha256sum] = "f382ab1caddd64aaa7acb7c4787487f63fd39bd0fde9c757655cbaa457c1185f"
SRC_URI[md5sum] = "ccc7404230afddec723bbdb63c89feec"
SRC_URI[sha256sum] = "f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74"
S = "${WORKDIR}/gst-plugins-bad-${PV}" S = "${WORKDIR}/gst-plugins-bad-${PV}"
@@ -75,10 +73,9 @@ PACKAGECONFIG[srtp] = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp"
PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa" PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa"
PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo" PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo"
PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev" PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev"
PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc" PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc"
PACKAGECONFIG[voamrwbenc] = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc" PACKAGECONFIG[voamrwbenc] = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc"
PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader" PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native"
PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm" PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm"
PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice" PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
@@ -93,6 +90,7 @@ PACKAGECONFIG[zbar] = "-Dzbar=enabled,-Dzbar=disabled,zbar"
# winscreencap wpe x265 # winscreencap wpe x265
EXTRA_OEMESON += " \ EXTRA_OEMESON += " \
-Ddoc=disabled \
-Ddecklink=enabled \ -Ddecklink=enabled \
-Ddvb=enabled \ -Ddvb=enabled \
-Dfbdev=enabled \ -Dfbdev=enabled \
@@ -118,8 +116,7 @@ EXTRA_OEMESON += " \
-Dmpeg2enc=disabled \ -Dmpeg2enc=disabled \
-Dmplex=disabled \ -Dmplex=disabled \
-Dmusepack=disabled \ -Dmusepack=disabled \
-Dnvdec=disabled \ -Dnvcodec=disabled \
-Dnvenc=disabled \
-Dofa=disabled \ -Dofa=disabled \
-Dopenexr=disabled \ -Dopenexr=disabled \
-Dopenni2=disabled \ -Dopenni2=disabled \
@@ -134,7 +131,6 @@ EXTRA_OEMESON += " \
-Dwinscreencap=disabled \ -Dwinscreencap=disabled \
-Dwpe=disabled \ -Dwpe=disabled \
-Dx265=disabled \ -Dx265=disabled \
${@bb.utils.contains("TUNE_FEATURES", "mx32", "-Dyadif=disabled", "", d)} \
" "
export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
@@ -144,4 +140,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs" FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs"
FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
FILES_${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles"
FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"