From 1bc0319f79091212c04b81ba3cfc1f20572e13f2 Mon Sep 17 00:00:00 2001
From: gizmo98 <atz.SE@gmx.de>
Date: Sat, 19 Aug 2017 17:03:01 +0200
Subject: [PATCH 1/2] Broadcom VC4: Add Videocore config option

Add option to disable Videocore autodetect so VC4 open source driver
can be used.
---
 qb/config.libs.sh   | 8 +++++---
 qb/config.params.sh | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 6f2daf2369..26230e57a3 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -35,11 +35,13 @@ fi
 add_define_make DYLIB_LIB "$DYLIB"
 
 [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
-
-[ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib && add_library_dirs /opt/vc/lib/GL
-check_lib VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm"
 check_lib SYSTEMD -lsystemd sd_get_machine_names
 
+if [ "$HAVE_VIDEOCORE" != "no" ]; then
+   [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib && add_library_dirs /opt/vc/lib/GL
+   check_lib VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm"
+fi
+
 if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
    [ -d /opt/vc/include ] && add_include_dirs /opt/vc/include
    [ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 2b4eb22efb..8f9913e9af 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -103,3 +103,4 @@ HAVE_HID=yes               # Low-level HID (Human Interface Device) support
 HAVE_LANGEXTRA=yes         # Multi-language support
 HAVE_OSMESA=no             # Off-screen Mesa rendering
 HAVE_VIDEOPROCESSOR=auto   # Enable video processor core
+HAVE_VIDEOCORE=auto        # Broadcom Videocore 4 support

From e79ed86e384314ecd4a9b58c80e7e14d178ef79d Mon Sep 17 00:00:00 2001
From: gizmo98 <atz.SE@gmx.de>
Date: Sat, 19 Aug 2017 17:03:38 +0200
Subject: [PATCH 2/2] config.lib.sh: add missing $

---
 qb/config.libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 26230e57a3..db496b01cf 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -111,7 +111,7 @@ if [ "$HAVE_EGL" != "no" -a "$OS" != 'Win32' ]; then
    fi
 fi
 
-if [ "HAVE_SSA" != "no" ]; then
+if [ "$HAVE_SSA" != "no" ]; then
    check_lib SSA -lass ass_library_init
 fi