summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-11-18 20:22:24 +0100
committerAndrei Gherzan <andrei@gherzan.ro>2020-11-19 12:25:15 +0000
commit9e9746f5a72176b5815ba1f9b30bc7d30be2d9e6 (patch)
tree06dab194da27c519459b4df4683b1a49d36b6f05
parent3db2e1e9672c7416f4b92a068069fcc2316bf45b (diff)
downloadmeta-raspberrypi-9e9746f5a72176b5815ba1f9b30bc7d30be2d9e6.tar.gz
Revert "gstreamer1.0-plugins-good: add package config knob to enable rpicamsrc plugin"
This reverts commit 0ecec6a1f9a7eca0d58acd26f51b47898a950fde. The patch as well as PACKAGECONFIG were merged to oe-core recipe in: https://git.openembedded.org/openembedded-core/commit/?id=fe828754467db0a09bbc5d6fd54bf6245bd0a747
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch31
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend7
2 files changed, 0 insertions, 38 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
deleted file mode 100644
index ea5ee71..0000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
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]
11Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
12---
13 sys/rpicamsrc/meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build
17index dc18a8345..48b2ceb66 100644
18--- a/sys/rpicamsrc/meson.build
19+++ b/sys/rpicamsrc/meson.build
20@@ -34,7 +34,7 @@ if not cc.has_header('bcm_host.h', args: rpi_inc_args)
21 endif
22
23 mmal_deps = []
24-foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host']
25+foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'vchostif', 'bcm_host']
26 l = cc.find_library(rpi_lib, dirs: rpi_lib_path, required: false)
27 if not l.found()
28 if get_option('rpicamsrc').enabled()
29--
302.29.2
31
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
index c2a1877..80a324f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
@@ -1,8 +1 @@
1FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:"
2
3SRC_URI_append_rpi = " file://0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch"
4
5EXTRA_OEMESON_remove_rpi = "-Drpicamsrc=disabled"
6PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
7
8PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}"