mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 21:59:27 +00:00
a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001
|
||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
Date: Fri, 16 Oct 2020 23:06:36 +0200
|
||
Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv
|
||
3.4.9
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Use cvScalar instead of CV_RGB to avoid the following build failure with
|
||
opencv 3.4.9:
|
||
|
||
mod_cv.cpp:693:24: error: conversion from ‘cv::Scalar {aka cv::Scalar_<double>}’ to non-scalar type ‘CvScalar’ requested
|
||
CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
|
||
^
|
||
|
||
Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since
|
||
version 3.4.2 and
|
||
https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f
|
||
|
||
It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0)
|
||
|
||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
[Upstream status: https://github.com/signalwire/freeswitch/pull/914]
|
||
---
|
||
src/mod/applications/mod_cv/mod_cv.cpp | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp
|
||
index 582f925abf..bbec755e91 100644
|
||
--- a/src/mod/applications/mod_cv/mod_cv.cpp
|
||
+++ b/src/mod/applications/mod_cv/mod_cv.cpp
|
||
@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context)
|
||
//printf("WTF %d\n", object_neighbors);
|
||
//cout << "Detected " << object_neighbors << " object neighbors" << endl;
|
||
const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors);
|
||
- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
|
||
+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0);
|
||
rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1);
|
||
|
||
parse_stats(&context->nestDetected, nestedObjects.size(), context->skip);
|
||
--
|
||
2.28.0
|
||
|