From 7aa05153ebb5f3aa900151a8be3496fade949ddc Mon Sep 17 00:00:00 2001 From: Conn O'Griofa Date: Sun, 20 Aug 2017 10:25:33 +0100 Subject: [PATCH] config.lib.sh: use brcm vg/egl/glesv2 packages on RPI --- qb/config.libs.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 1031488fd8..a98d94ef05 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -48,6 +48,7 @@ if [ "$HAVE_VIDEOCORE" = 'yes' ]; then [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux HAVE_OPENGLES='auto' EXTRA_GL_LIBS="-lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvcos -lvchiq_arm" + BRCM_PREFIX="brcm" fi if [ "$HAVE_NEON" = "yes" ]; then @@ -101,7 +102,7 @@ if [ "$HAVE_SSE" = "yes" ]; then fi if [ "$HAVE_EGL" != "no" -a "$OS" != 'Win32' ]; then - check_pkgconf EGL egl + check_pkgconf EGL "$BRCM_PREFIX"egl # some systems have EGL libs, but no pkgconfig if [ "$HAVE_EGL" = "no" ]; then HAVE_EGL=auto && check_lib EGL "-lEGL $EXTRA_GL_LIBS" @@ -378,12 +379,12 @@ if [ "$HAVE_EGL" = "yes" ]; then add_define_make OPENGLES_LIBS "$OPENGLES_LIBS" add_define_make OPENGLES_CFLAGS "$OPENGLES_CFLAGS" else - HAVE_OPENGLES=auto check_pkgconf OPENGLES glesv2 + HAVE_OPENGLES=auto check_pkgconf OPENGLES "$BRCM_PREFIX"glesv2 [ "$HAVE_OPENGLES" = "no" ] && HAVE_OPENGLES=auto check_lib OPENGLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make OPENGLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS" fi fi if [ "$HAVE_VG" != "no" ]; then - check_pkgconf VG vg + check_pkgconf VG "$BRCM_PREFIX"vg if [ "$HAVE_VG" = "no" ]; then HAVE_VG=auto check_lib VG "-lOpenVG $EXTRA_GL_LIBS" [ "$HAVE_VG" = "yes" ] && VG_LIBS=-lOpenVG