rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-02-09 08:28:50 +01:00
Code Issues Releases Wiki Activity

MycroftOS: Buildroot: Update to 20.02.1

Browse Source
This commit is contained in:
Peter Steenbergen 2020-04-13 14:10:20 +02:00
parent 1cea3e1618
commit 252f3e83e7
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot

@ -1 +1 @@
Subproject commit 5f5477b0abb1a9d8a455be9b4b29f87345c15721
Subproject commit 80e565bbebc61bf113bcd3b3475fa27a5127f466

42
buildroot-patches/0110-Don-t-build-VLC-with-opencv-support.patch
View File

@ -1,42 +0,0 @@
From af17dc03204f359c76d1ec4f6d8db6ac137f2ea7 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Wed, 8 Apr 2020 14:39:50 +0200
Subject: [PATCH 1/1] Don't build VLC with opencv support
---
package/vlc/vlc.mk | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 4b1cd68d8b..68fd6b6dae 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -84,6 +84,7 @@ VLC_CONF_OPTS += \
--disable-wasapi \
--disable-x262 \
--disable-zvbi \
+ --disable-opencv \
--enable-run-as-root
# Uses __atomic_fetch_add_4
@@ -202,17 +203,6 @@ else
VLC_CONF_OPTS += --disable-gles2
endif
-ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y)
-VLC_CONF_OPTS += --enable-opencv
-ifeq ($(BR2_PACKAGE_OPENCV),y)
-VLC_DEPENDENCIES += opencv
-else
-VLC_DEPENDENCIES += opencv3
-endif
-else
-VLC_CONF_OPTS += --disable-opencv
-endif
-
ifeq ($(BR2_PACKAGE_OPUS),y)
VLC_CONF_OPTS += --enable-opus
VLC_DEPENDENCIES += libvorbis opus
--
2.17.1