[Scummvm-git-logs] scummvm branch-2-5 -> d7fc4b472bacc48eb847e4f24e92b74908fd1019

[lephilousophe]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d7fc4b472b RASPBERRYPI: Don't make use of obsolete Broadcom libraries


Commit: d7fc4b472bacc48eb847e4f24e92b74908fd1019
    https://github.com/scummvm/scummvm/commit/d7fc4b472bacc48eb847e4f24e92b74908fd1019
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-11-21T19:01:07+01:00

Commit Message:
RASPBERRYPI: Don't make use of obsolete Broadcom libraries

Changed paths:
    configure


diff --git a/configure b/configure
index 45d1bb6711..6fc50ec87d 100755
--- a/configure
+++ b/configure
@@ -3298,22 +3298,12 @@ if test -n "$_host"; then
 			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/usr/lib/arm-linux-gnueabihf/pulseaudio"
 			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/usr/lib/arm-linux-gnueabihf"
 			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/lib/arm-linux-gnueabihf"
-			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/opt/vc/lib"
-			append_var LDFLAGS "-L$RPI_ROOT/opt/vc/lib"
 			append_var CXXFLAGS "-isystem $RPI_ROOT/usr/include/arm-linux-gnueabihf"
 			append_var CXXFLAGS "-I$RPI_ROOT/usr/include"
-			# This is so optional OpenGL ES includes are found.
-			append_var CXXFLAGS "-I$RPI_ROOT/opt/vc/include"
 			# We prefer SDL2 on the Raspberry Pi: acceleration now depends on it
 			# since SDL2 manages dispmanx/GLES2 very well internally.
 			# SDL1 is bit-rotten on this platform.
 			_sdlconfig=sdl2-config
-			# OpenGL ES support is mature enough as to be the best option on
-			# the Raspberry Pi, so it's enabled by default.
-			# The Raspberry Pi always supports OpenGL ES 2.0 contexts, thus we
-			# take advantage of those.
-			_opengl_mode=gles2
-			_opengl_game_es2=yes
 			;;
 		dreamcast)
 			append_var DEFINES "-DDISABLE_DEFAULT_SAVEFILEMANAGER"
@@ -5495,7 +5485,7 @@ echocheck "OpenGL for game"
 
 if test "$_opengl_game" = auto ; then
 	_opengl_game=no
-	if (test "$_backend" = "sdl" && test "$_opengl" = yes) || test "$_backend" = "android3d" || test "$_backend" = "switch" || test "$_backend" = "raspberrypi"; then
+	if (test "$_backend" = "sdl" && test "$_opengl" = yes) || test "$_backend" = "android3d" || test "$_backend" = "switch"; then
 		# Try different header filenames
 		# 1) GL/gl.h         This is usually used on POSIX and Windows systems
 		# 2) OpenGL/gl.h     This is used on Mac OS X