From 2586e727e77f198d0beadecb5da6e5f7547c6c3d Mon Sep 17 00:00:00 2001
From: orbea <orbea@fredslev.dk>
Date: Wed, 13 Feb 2019 07:42:21 -0800
Subject: [PATCH] qb: Fix the HAVE_OPENGLES check.

Not all systems have the appropriate pkgconfig files.

Fixes https://github.com/libretro/RetroArch/issues/8274
---
 qb/config.libs.sh | 6 +-----
 qb/qb.libs.sh     | 7 +++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 1a698f4c45..a4a1406363 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -409,11 +409,7 @@ if [ "$HAVE_EGL" = "yes" ]; then
          add_define MAKEFILE OPENGLES_LIBS "$OPENGLES_LIBS"
          add_define MAKEFILE OPENGLES_CFLAGS "$OPENGLES_CFLAGS"
       else
-         HAVE_OPENGLES=auto; check_pkgconf OPENGLES "$VC_PREFIX"glesv2
-         if [ "$HAVE_OPENGLES" = "no" ]; then
-            HAVE_OPENGLES=auto; check_lib '' OPENGLES "-l${VC_PREFIX}GLESv2 $EXTRA_GL_LIBS"
-            add_define MAKEFILE OPENGLES_LIBS "-l${VC_PREFIX}GLESv2 $EXTRA_GL_LIBS"
-         fi
+         check_val '' OPENGLES "-l${VC_PREFIX}GLESv2 $EXTRA_GL_LIBS" '' "${VC_PREFIX}glesv2" '' '' true
       fi
    fi
    check_val '' VG "-l${VC_PREFIX}OpenVG $EXTRA_GL_LIBS" '' "${VC_PREFIX}vg" '' '' false
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index b192a03711..c1c6a07e7d 100644
--- a/qb/qb.libs.sh
+++ b/qb/qb.libs.sh
@@ -154,6 +154,7 @@ check_lib()
 # $2 = package ['package' or 'package package1 package2', $1 = name]
 # $3 = version [checked only if non-empty]
 # $4 = critical error message [checked only if non-empty]
+# $5 = force check_lib when true [checked only if non-empty, set by check_val]
 check_pkgconf()
 {	tmpval="$(eval "printf %s \"\$HAVE_$1\"")"
 	eval "TMP_$1=\$tmpval"
@@ -175,6 +176,7 @@ check_pkgconf()
 	val="$1"
 	ver="${3:-0.0}"
 	err="${4:-}"
+	lib="${5:-}"
 	answer='no'
 	version='no'
 
@@ -199,6 +201,7 @@ check_pkgconf()
 	eval "HAVE_$val=\"$answer\""
 
 	if [ "$answer" = 'no' ]; then
+		[ "$lib" != 'true' ] || return 0
 		[ "$err" ] && die 1 "$err"
 		setval="$(eval "printf %s \"\$USER_$val\"")"
 		if [ "$setval" = 'yes' ]; then
@@ -303,13 +306,13 @@ check_switch()
 # $7 = critical error message [checked only if non-empty]
 # $8 = force check_lib when true [checked only if non-empty]
 check_val()
-{	check_pkgconf "$2" "$5" "${6:-}" "${7:-}"
+{	check_pkgconf "$2" "$5" "${6:-}" "${7:-}" "${8:-}"
 	[ "$PKG_CONF_PATH" = "none" ] || [ "${8:-}" = true ] || return 0
 	tmpval="$(eval "printf %s \"\$HAVE_$2\"")"
 	oldval="$(eval "printf %s \"\$TMP_$2\"")"
 	if [ "$tmpval" = 'no' ] && [ "$oldval" != 'no' ]; then
 		eval "HAVE_$2=auto"
-		check_lib "$1" "$2" "$3" '' '' '' "$4" ''
+		check_lib "$1" "$2" "$3" '' '' '' "${4:-}" "${7:-}"
 	fi
 }