From 5f1558ffe38d73e1c7fc79f7d234ba5b059fe0bb Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 26 Nov 2021 13:47:42 -0800
Subject: [PATCH] Fixed detecting Raspberry Pi 2/3 video support on Pi 4
---
configure | 9 ++++++---
configure.ac | 7 +++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index ec7d725dd7..4f61328833 100755
--- a/configure
+++ b/configure
@@ -1651,7 +1651,7 @@ Optional Features:
[default=yes]
--enable-libdecor-shared
dynamically load libdecor [default=yes]
- --enable-video-rpi use Raspberry Pi video driver [default=yes]
+ --enable-video-rpi use Raspberry Pi 2/3 video driver [default=yes]
--enable-video-x11 use X11 video driver [default=yes]
--enable-x11-shared dynamically load X11 support [default=maybe]
--enable-video-x11-xcursor
@@ -20220,18 +20220,21 @@ fi
# Add the Raspberry Pi compiler flags and libraries
CFLAGS="$CFLAGS $RPI_CFLAGS"; LIBS="$LIBS $RPI_LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Raspberry Pi" >&5
-$as_echo_n "checking for Raspberry Pi... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Raspberry Pi 2/3" >&5
+$as_echo_n "checking for Raspberry Pi 2/3... " >&6; }
have_video_rpi=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <bcm_host.h>
+ #include <EGL/eglplatform.h>
int
main ()
{
+ EGL_DISPMANX_WINDOW_T window;
+
bcm_host_init();
;
diff --git a/configure.ac b/configure.ac
index 6eda90c89a..2cc063a21e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1674,7 +1674,7 @@ CheckNativeClient()
CheckRPI()
{
AC_ARG_ENABLE(video-rpi,
-[AS_HELP_STRING([--enable-video-rpi], [use Raspberry Pi video driver [default=yes]])],
+[AS_HELP_STRING([--enable-video-rpi], [use Raspberry Pi 2/3 video driver [default=yes]])],
, enable_video_rpi=yes)
if test x$enable_video = xyes -a x$enable_video_rpi = xyes; then
PKG_CHECK_MODULES([RPI], [bcm_host brcmegl], video_rpi=yes, video_rpi=no)
@@ -1695,11 +1695,14 @@ CheckRPI()
# Add the Raspberry Pi compiler flags and libraries
CFLAGS="$CFLAGS $RPI_CFLAGS"; LIBS="$LIBS $RPI_LIBS"
- AC_MSG_CHECKING(for Raspberry Pi)
+ AC_MSG_CHECKING(for Raspberry Pi 2/3)
have_video_rpi=no
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <bcm_host.h>
+ #include <EGL/eglplatform.h>
]], [[
+ EGL_DISPMANX_WINDOW_T window;
+
bcm_host_init();
]])], [have_video_rpi=yes],[])
AC_MSG_RESULT($have_video_rpi)