summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf/include
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-bsp/conf/include')
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc13
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc11
2 files changed, 7 insertions, 17 deletions
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index e38cdc70f..e2ebd85c6 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -1,5 +1,8 @@
SOC_FAMILY = "r8a7795"
+# Enable AGL virtualization features
+MACHINE_FEATURES_append = " agl-egvirt"
+
# for Wayland/Weston weston-laucher
DISTRO_FEATURES_append = " pam"
@@ -16,19 +19,14 @@ PREFERRED_PROVIDER_virtual/mesa = "mesa"
PREFERRED_PROVIDER_libgbm = "libgbm"
PREFERRED_RPROVIDER_libgbm-dev = "libgbm"
+PREFERRED_RPROVIDER_libomxil = "omx-user-module"
+
# Mask the gstreamer recipe for MMP
BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
# Add for gstreamer plugins ugly
LICENSE_FLAGS_WHITELIST = "commercial"
-PREFERRED_VERSION_gstreamer1.0 = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-vspfilter = "1.0%"
MACHINE_FEATURES_append = " multimedia"
@@ -48,7 +46,6 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
omx-user-module \
"
-BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/"
OSTREE_BOOTLOADER ?= "u-boot"
WKS_FILE = "singlepart-noloader.wks"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 808f74e3b..cce7dbd5e 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -19,19 +19,14 @@ PREFERRED_PROVIDER_virtual/mesa = "mesa"
PREFERRED_PROVIDER_libgbm = "libgbm"
PREFERRED_RPROVIDER_libgbm-dev = "libgbm"
+PREFERRED_RPROVIDER_libomxil = "omx-user-module"
+
# Mask the gstreamer recipe for MMP
BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
# Add for gstreamer plugins ugly
LICENSE_FLAGS_WHITELIST = "commercial"
-PREFERRED_VERSION_gstreamer1.0 = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-libav = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.6.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-vspfilter = "1.0%"
MACHINE_FEATURES_append = " multimedia"
@@ -51,8 +46,6 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
omx-user-module \
"
-BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/"
-
DISTRO_FEATURES_append = " sota"
OSTREE_KERNEL = "Image"
IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb"
/* * Copyright (C) 2015, 2016 "IoT.bzh" * Author "Romain Forlot" <romain.forlot@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ /* This is a classic observer design pattern a bit enhanced to be able to pull and push info in 2 ways */ #include <list> #include <mutex> #include <algorithm> template<class T> class Observable; template<class T> class Observer { private: std::mutex observableListMutex_; protected: virtual ~Observer() { std::lock_guard<std::mutex> lock(observableListMutex_); for(const auto& sig: observableList_) { sig->delObserver(this); } } std::list<Observable<T>*> observableList_; typedef typename std::list<Observable<T>*>::iterator iterator_; typedef typename std::list<Observable<T>*>::const_iterator const_iterator_; public: virtual void update(T* observable) = 0; void addObservable(Observable<T>* observable) { std::lock_guard<std::mutex> lock(observableListMutex_); for (auto& obs : observableList_) { if (obs == observable) {return;} } observableList_.push_back(observable); } void delObservable(Observable<T>* observable) { std::lock_guard<std::mutex> lock(observableListMutex_); const_iterator_ it = std::find(observableList_.cbegin(), observableList_.cend(), observable); if(it != observableList_.cend()) {observableList_.erase(it);} } }; template <class T> class Observable { public: void addObserver(Observer<T>* observer) { std::lock_guard<std::mutex> lock(observerListMutex_); observerList_.push_back(observer); observer->addObservable(this); } void delObserver(Observer<T>* observer) { std::lock_guard<std::mutex> lock(observerListMutex_); const_iterator_ it = find(observerList_.cbegin(), observerList_.cend(), observer); if(it != observerList_.cend()) {observerList_.erase(it);} } virtual int initialRecursionCheck() = 0; virtual int recursionCheck(T* obs) = 0; virtual ~Observable() { std::lock_guard<std::mutex> lock(observerListMutex_); for(const auto& obs: observerList_) { obs->delObservable(this); } } protected: std::list<Observer<T>*> observerList_; typedef typename std::list<Observer<T>*>::iterator iterator_; typedef typename std::list<Observer<T>*>::const_iterator const_iterator_; void notify() { std::lock_guard<std::mutex> lock(observerListMutex_); for(const auto& obs: observerList_) { obs->update(static_cast<T*>(this)); } } private: std::mutex observerListMutex_; };