From 1a73b4eba2c96447bb6bad86b7e03e64206fd2d2 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sat, 11 Apr 2015 05:58:37 +0000
Subject: [PATCH] Some Raspberry Pi build fixes (including Raspberry Pi 2
 support).

Fixes Bugzilla #2879.
---
 build-scripts/config.guess | 1 +
 configure                  | 3 +++
 configure.in               | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/build-scripts/config.guess b/build-scripts/config.guess
index ddb36220a6fd9..68c1be32a428a 100644
--- a/build-scripts/config.guess
+++ b/build-scripts/config.guess
@@ -898,6 +898,7 @@ EOF
 	else
         case `sed -n '/^Hardware/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
         BCM2708) MANUFACTURER=raspberry;;
+        BCM2709) MANUFACTURER=raspberry;;
         *) MANUFACTURER=unknown;;
         esac
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
diff --git a/configure b/configure
index e220948adaafc..42283e11f51b4 100755
--- a/configure
+++ b/configure
@@ -22941,7 +22941,9 @@ case "$host" in
 
                 if test x$enable_video = xyes; then
                     SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
+                    # FIXME: confdefs? Not AC_DEFINE?
                     $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
+                    SUMMARY_video="${SUMMARY_video} rpi"
                 fi
                 ;;
             *-*-androideabi*)
@@ -22955,6 +22957,7 @@ case "$host" in
 
                 if test x$enable_video = xyes; then
                     SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
+                    # FIXME: confdefs? Not AC_DEFINE?
                     $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
                     SUMMARY_video="${SUMMARY_video} android"
                 fi
diff --git a/configure.in b/configure.in
index 6e3878247651a..38c682bf0dece 100644
--- a/configure.in
+++ b/configure.in
@@ -2837,7 +2837,9 @@ case "$host" in
 
                 if test x$enable_video = xyes; then
                     SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
+                    # FIXME: confdefs? Not AC_DEFINE?
                     $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
+                    SUMMARY_video="${SUMMARY_video} rpi"
                 fi
                 ;;
             *-*-androideabi*)
@@ -2851,6 +2853,7 @@ case "$host" in
 
                 if test x$enable_video = xyes; then
                     SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
+                    # FIXME: confdefs? Not AC_DEFINE?
                     $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
                     SUMMARY_video="${SUMMARY_video} android"
                 fi