From 9e9746f5a72176b5815ba1f9b30bc7d30be2d9e6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Nov 2020 20:22:24 +0100 Subject: 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 --- ...dd-vchostif-library-as-it-is-required-to-.patch | 31 ---------------------- .../gstreamer1.0-plugins-good_1.18.%.bbappend | 7 ----- 2 files changed, 38 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch 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 @@ -From 3ec4fe5507a39383b161f1ab7687acb4a57c32f8 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma -Date: Sun, 15 Nov 2020 11:30:07 +0000 -Subject: [PATCH] rpicamsrc: add vchostif library as it is required to build - successful - -fix: undefined reference to `vc_gencmd' -/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' - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/818] -Signed-off-by: Jose Quaresma ---- - sys/rpicamsrc/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build -index dc18a8345..48b2ceb66 100644 ---- a/sys/rpicamsrc/meson.build -+++ b/sys/rpicamsrc/meson.build -@@ -34,7 +34,7 @@ if not cc.has_header('bcm_host.h', args: rpi_inc_args) - endif - - mmal_deps = [] --foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host'] -+foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'vchostif', 'bcm_host'] - l = cc.find_library(rpi_lib, dirs: rpi_lib_path, required: false) - if not l.found() - if get_option('rpicamsrc').enabled() --- -2.29.2 - 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 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" - -SRC_URI_append_rpi = " file://0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch" - -EXTRA_OEMESON_remove_rpi = "-Drpicamsrc=disabled" -PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" - PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" -- cgit v1.2.3-54-g00ecf