summaryrefslogtreecommitdiffstats
path: root/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia')
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils/0001-aplay-Fix-invalid-file-size-check-for-non-regular-fi.patch36
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils_1.1.6.bbappend5
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend10
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter/gstvspfilter-m3nulcb_r8a77965.conf2
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bbappend2
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0001-install-wayland.h-header.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0001-install-wayland.h-header.patch)6
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0002-pkgconfig-libgstwayland.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0002-pkgconfig-libgstwayland.patch)6
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0003-gstkmssink-add-rcar-du-to-driver-list.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0003-gstkmssink-add-rcar-du-to-driver-list.patch)4
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bbappend (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend)0
-rw-r--r--bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_13.0.bbappend (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_12.2.bbappend)0
10 files changed, 18 insertions, 53 deletions
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils/0001-aplay-Fix-invalid-file-size-check-for-non-regular-fi.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils/0001-aplay-Fix-invalid-file-size-check-for-non-regular-fi.patch
deleted file mode 100644
index 586f9731..00000000
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils/0001-aplay-Fix-invalid-file-size-check-for-non-regular-fi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From da4d5bd53a1a57d1b39318b83d3280fbcd78e9f6 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 15 May 2018 22:17:01 +0200
-Subject: [PATCH] aplay: Fix invalid file size check for non-regular files
-
-aplay tries to check the file size via fstat() at parsing the format
-headers and avoids parsing when the size is shorter than the given
-size. This works fine for regular files, but when a special file like
-pipe is passed, it fails, eventually leading to the fallback mode
-wrongly.
-
-A proper fix is to do this sanity check only for a regular file.
-
-Reported-by: Jay Foster <jay@systech.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- aplay/aplay.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index bbd7fff..63ec9ef 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -2821,7 +2821,8 @@ static int read_header(int *loaded, int header_size)
-
- /* don't be adventurous, get out if file size is smaller than
- * requested header size */
-- if (buf.st_size < header_size)
-+ if ((buf.st_mode & S_IFMT) == S_IFREG &&
-+ buf.st_size < header_size)
- return -1;
-
- if (*loaded < header_size) {
---
-2.7.4
-
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils_1.1.6.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils_1.1.6.bbappend
deleted file mode 100644
index a8c60aec..00000000
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/alsa/alsa-utils_1.1.6.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append = " \
- file://0001-aplay-Fix-invalid-file-size-check-for-non-regular-fi.patch \
-"
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
new file mode 100644
index 00000000..0b6b1a5a
--- /dev/null
+++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
@@ -0,0 +1,10 @@
+OMX_LIBS = "mp3dec_lib"
+
+do_configure_append() {
+ for lib in ${OMX_LIBS}; do
+ if ${@bb.utils.contains('DISTRO_FEATURES', '$lib', 'false', 'true', d)}; then
+ lib="omx${lib%%_lib}"
+ sed -i "/^\[$lib\]/,/^$/d" ${S}/config/rcar/gstomx.conf
+ fi
+ done
+}
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter/gstvspfilter-m3nulcb_r8a77965.conf b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter/gstvspfilter-m3nulcb_r8a77965.conf
deleted file mode 100644
index 890c5ad9..00000000
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter/gstvspfilter-m3nulcb_r8a77965.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-input-device-name=/dev/video6
-output-device-name=/dev/video7
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bbappend
deleted file mode 100644
index 6d4804d1..00000000
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0001-install-wayland.h-header.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0001-install-wayland.h-header.patch
index 0d9ed62e..d98ca26d 100644
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0001-install-wayland.h-header.patch
+++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0001-install-wayland.h-header.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] install wayland.h header
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gst-libs/gst/wayland/Makefile.am b/gst-libs/gst/wayland/Makefile.am
-index 743a489..c59b06d 100644
+index a9f3f7b..7281a6e 100644
--- a/gst-libs/gst/wayland/Makefile.am
+++ b/gst-libs/gst/wayland/Makefile.am
@@ -5,6 +5,8 @@ libgstwayland_@GST_API_VERSION@_la_SOURCES = wayland.c
@@ -20,7 +20,7 @@ index 743a489..c59b06d 100644
libgstwayland_@GST_API_VERSION@_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
-@@ -21,7 +23,3 @@ libgstwayland_@GST_API_VERSION@_la_LDFLAGS = \
+@@ -22,7 +24,3 @@ libgstwayland_@GST_API_VERSION@_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \
$(GST_ALL_LDFLAGS) \
$(GST_LT_LDFLAGS)
@@ -29,5 +29,5 @@ index 743a489..c59b06d 100644
- wayland.h
-
--
-2.7.4
+2.5.0
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0002-pkgconfig-libgstwayland.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0002-pkgconfig-libgstwayland.patch
index 5f5e9948..f677b432 100644
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0002-pkgconfig-libgstwayland.patch
+++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0002-pkgconfig-libgstwayland.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] fix
1 file changed, 2 insertions(+)
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
-index 0e69cd1..b76f7b5 100644
+index 8e74a8e..f641285 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,6 +1,7 @@
@@ -20,7 +20,7 @@ index 0e69cd1..b76f7b5 100644
gstreamer-codecparsers-@GST_API_VERSION@.pc \
gstreamer-insertbin-@GST_API_VERSION@.pc \
@@ -11,6 +12,7 @@ pcverfiles = \
- gstreamer-bad-video-@GST_API_VERSION@.pc
+ gstreamer-bad-audio-@GST_API_VERSION@.pc
pcverfiles_uninstalled = \
+ gstreamer-wayland-@GST_API_VERSION@-uninstalled.pc \
@@ -28,5 +28,5 @@ index 0e69cd1..b76f7b5 100644
gstreamer-codecparsers-@GST_API_VERSION@-uninstalled.pc \
gstreamer-insertbin-@GST_API_VERSION@-uninstalled.pc \
--
-2.7.4
+2.5.0
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0003-gstkmssink-add-rcar-du-to-driver-list.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0003-gstkmssink-add-rcar-du-to-driver-list.patch
index 6a8050ef..6b421ac6 100644
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.%/0003-gstkmssink-add-rcar-du-to-driver-list.patch
+++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.16.2/0003-gstkmssink-add-rcar-du-to-driver-list.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] gstkmssink: add rcar-du to driver list
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/kms/gstkmssink.c b/sys/kms/gstkmssink.c
-index 1331883..5e45796 100644
+index cdecbf6..0b11233 100644
--- a/sys/kms/gstkmssink.c
+++ b/sys/kms/gstkmssink.c
-@@ -168,7 +168,7 @@ kms_open (gchar ** driver)
+@@ -177,7 +177,7 @@ kms_open (gchar ** driver)
{
static const char *drivers[] = { "i915", "radeon", "nouveau", "vmwgfx",
"exynos", "amdgpu", "imx-drm", "rockchip", "atmel-hlcdc", "msm",
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bbappend
index 1e630f9e..1e630f9e 100644
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend
+++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bbappend
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_12.2.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_13.0.bbappend
index 7d28801e..7d28801e 100644
--- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_12.2.bbappend
+++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_13.0.bbappend