summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2020-11-15 14:01:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-17 21:53:14 +0000
commitc2776db1bed09bd900b3098542b6dd58481ecf56 (patch)
tree368ec4d5364f0bfee877c951cdd34e3b5f6e79c1
parentfaa6d2be715e59c9b4cb325e03ab307239e08d59 (diff)
downloadpoky-c2776db1bed09bd900b3098542b6dd58481ecf56.tar.gz
gstreamer1.0-plugins-good: add package config knob for the Raspberry Pi
* 0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/818] (From OE-Core rev: fe828754467db0a09bbc5d6fd54bf6245bd0a747) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb3
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
new file mode 100644
index 0000000000..685ee08e50
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
@@ -0,0 +1,32 @@
1From 3ec4fe5507a39383b161f1ab7687acb4a57c32f8 Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sun, 15 Nov 2020 11:30:07 +0000
4Subject: [PATCH] rpicamsrc: add vchostif library as it is required to build
5 successful
6
7fix: undefined reference to `vc_gencmd'
8/usr/src/debug/gstreamer1.0-plugins-good/1.18.1-r0/build/../gst-plugins-good-1.18.1/sys/rpicamsrc/RaspiCamControl.c:1440: undefined reference to `vc_gencmd'
9
10Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/818]
11
12Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
13---
14 sys/rpicamsrc/meson.build | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build
18index dc18a8345..48b2ceb66 100644
19--- a/sys/rpicamsrc/meson.build
20+++ b/sys/rpicamsrc/meson.build
21@@ -34,7 +34,7 @@ if not cc.has_header('bcm_host.h', args: rpi_inc_args)
22 endif
23
24 mmal_deps = []
25-foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host']
26+foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'vchostif', 'bcm_host']
27 l = cc.find_library(rpi_lib, dirs: rpi_lib_path, required: false)
28 if not l.found()
29 if get_option('rpicamsrc').enabled()
30--
312.29.2
32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb
index bc7550f40b..77e1333ddc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb
@@ -2,6 +2,7 @@ require gstreamer1.0-plugins-common.inc
2 2
3SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ 3SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
4 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ 4 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
5 file://0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch \
5 " 6 "
6 7
7SRC_URI[sha256sum] = "e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c" 8SRC_URI[sha256sum] = "e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c"
@@ -47,6 +48,7 @@ PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
47PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}" 48PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}"
48PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" 49PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4"
49PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" 50PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex"
51PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
50PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" 52PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
51PACKAGECONFIG[v4l2] = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false" 53PACKAGECONFIG[v4l2] = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false"
52PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" 54PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx"
@@ -63,7 +65,6 @@ EXTRA_OEMESON += " \
63 -Doss4=disabled \ 65 -Doss4=disabled \
64 -Dosxaudio=disabled \ 66 -Dosxaudio=disabled \
65 -Dosxvideo=disabled \ 67 -Dosxvideo=disabled \
66 -Drpicamsrc=disabled \
67 -Dshout2=disabled \ 68 -Dshout2=disabled \
68 -Dtwolame=disabled \ 69 -Dtwolame=disabled \
69 -Dwaveform=disabled \ 70 -Dwaveform=disabled \