summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2020-10-29 14:27:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-31 08:54:12 +0000
commite45136d86aa3956dd58bff7875e105b4aa33ee15 (patch)
treeb451fc10155679eb0c836da6374dd4d9c1476a5a /meta/recipes-multimedia
parentd1a625b4e7e27149bc6bdf5aaf7da96760b8d9a5 (diff)
downloadpoky-e45136d86aa3956dd58bff7875e105b4aa33ee15.tar.gz
gstreamer1.0-vaapi: upgrade to version 1.18.0
* 0001-vaapsink-downgrade-to-marginal.patch Removed since these are included in 1.18.0 https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/commit/13d090b5660a2e2e2c997db44ba9a391101e8bd6 API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc. Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch. (From OE-Core rev: 864421dffcddb1e62de9c0a26767cb4cea7a82c9) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch46
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb)16
2 files changed, 6 insertions, 56 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch
deleted file mode 100644
index 7945a923c9..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-vaapsink-downgrade-to-marginal.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 0c28cf7bfa90f8947833722cddf23d513490c6c3 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 28 Nov 2018 15:08:48 +0800
4Subject: [PATCH] vaapsink: downgrade to marginal
5
6Using vaapisink with default poky configuration results in an
7unresponsive display as of today because DRI2 rendering is currently broken
8in non composited environments [1] and libva doesn't support DRI3 [2].
9
10Downgrade vaapisink to marginal for now so playbin (and in turn gst-play
11and gtk-play examples) use xvimagesink or others out of box.
12
13[1] https://gitlab.freedesktop.org/xorg/xserver/issues/13
14[2] https://github.com/intel/libva/issues/122
15
16Upstream-Status: Pending
17
18Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
19---
20 gst/vaapi/gstvaapi.c | 6 +-----
21 1 file changed, 1 insertion(+), 5 deletions(-)
22
23diff --git a/gst/vaapi/gstvaapi.c b/gst/vaapi/gstvaapi.c
24index 9a82454..4d94f2b 100644
25--- a/gst/vaapi/gstvaapi.c
26+++ b/gst/vaapi/gstvaapi.c
27@@ -195,7 +195,6 @@ plugin_init (GstPlugin * plugin)
28 {
29 GstVaapiDisplay *display;
30 GArray *decoders;
31- guint rank;
32
33 plugin_add_dependencies (plugin);
34
35@@ -220,10 +219,7 @@ plugin_init (GstPlugin * plugin)
36 gst_element_register (plugin, "vaapidecodebin",
37 GST_RANK_PRIMARY + 2, GST_TYPE_VAAPI_DECODE_BIN);
38
39- rank = GST_RANK_PRIMARY;
40- if (g_getenv ("WAYLAND_DISPLAY"))
41- rank = GST_RANK_MARGINAL;
42- gst_element_register (plugin, "vaapisink", rank, GST_TYPE_VAAPISINK);
43+ gst_element_register (plugin, "vaapisink", GST_RANK_MARGINAL, GST_TYPE_VAAPISINK);
44
45 #if USE_ENCODERS
46 gst_vaapiencode_register (plugin, display);
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.0.bb
index 1bedf25128..60a975bf4d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.0.bb
@@ -8,28 +8,24 @@ REALPN = "gstreamer-vaapi"
8LICENSE = "LGPLv2.1+" 8LICENSE = "LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" 9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
10 10
11SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ 11SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
12 file://0001-vaapsink-downgrade-to-marginal.patch \
13 "
14 12
15SRC_URI[md5sum] = "13f7cb6a64bde24e67f563377487dcce" 13SRC_URI[md5sum] = "079a3739857e0cf4904afe92659d8a18"
16SRC_URI[sha256sum] = "191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601" 14SRC_URI[sha256sum] = "c6efeb8c736f75bb1b53ab18413c60c4321300e7aee66641bcc07d59c2fe9e31"
17 15
18S = "${WORKDIR}/${REALPN}-${PV}" 16S = "${WORKDIR}/${REALPN}-${PV}"
19DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" 17DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
20 18
21inherit meson pkgconfig gtk-doc features_check upstream-version-is-even 19inherit meson pkgconfig features_check upstream-version-is-even
22 20
23REQUIRED_DISTRO_FEATURES ?= "opengl" 21REQUIRED_DISTRO_FEATURES ?= "opengl"
24 22
25EXTRA_OEMESON += " \ 23EXTRA_OEMESON += " \
24 -Ddoc=disabled \
26 -Dexamples=disabled \ 25 -Dexamples=disabled \
26 -Dtests=enabled \
27" 27"
28 28
29GTKDOC_MESON_OPTION = "gtk_doc"
30GTKDOC_MESON_ENABLE_FLAG = "enabled"
31GTKDOC_MESON_DISABLE_FLAG = "disabled"
32
33PACKAGES =+ "${PN}-tests" 29PACKAGES =+ "${PN}-tests"
34 30
35# OpenGL packageconfig factored out to make it easy for distros 31# OpenGL packageconfig factored out to make it easy for distros