From 3ce1118af1203c45f5e19563f55ca280a50c2892 Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Sun, 9 Jan 2022 23:01:32 +0100
Subject: [PATCH] Ports: Compile ScummVM with OpenGL support

By default, ScummVM will still run in software rendering mode, but the
options to enable OpenGL will become available.
---
 Ports/scummvm/package.sh              |  3 ++-
 Ports/scummvm/patches/configure.patch | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Ports/scummvm/package.sh b/Ports/scummvm/package.sh
index 2a6b2f242e..77c1824073 100755
--- a/Ports/scummvm/package.sh
+++ b/Ports/scummvm/package.sh
@@ -9,7 +9,6 @@ configopts=(
     "--enable-c++11"
     "--enable-release-mode"
     "--enable-optimizations"
-    "--opengl-mode=none"
     "--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
 )
 launcher_name=ScummVM
@@ -20,11 +19,13 @@ icon_file=icons/scummvm.ico
 function pre_configure() {
     export CPPFLAGS="-fvisibility=hidden"
     export FREETYPE2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2"
+    export OPENGL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL"
     export SDL_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
 }
 
 function post_configure() {
     unset CPPFLAGS
     unset FREETYPE2_CFLAGS
+    unset OPENGL_CFLAGS
     unset SDL_CFLAGS
 }
diff --git a/Ports/scummvm/patches/configure.patch b/Ports/scummvm/patches/configure.patch
index f7613697f5..64a3e50221 100644
--- a/Ports/scummvm/patches/configure.patch
+++ b/Ports/scummvm/patches/configure.patch
@@ -1,6 +1,6 @@
---- scummvm-2.5.1/configure	2021-10-01 13:52:42.000000000 +0200
-+++ scummvm-2.5.1-patched/configure	2021-10-17 16:31:01.554772573 +0200
-@@ -3979,7 +3980,7 @@
+--- scummvm-2.5.1/configure	2021-12-24 22:19:28.000000000 +0000
++++ scummvm-2.5.1-patched/configure	2022-01-09 21:55:40.753734211 +0000
+@@ -3998,7 +3998,7 @@
  	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | morphos | n64 | ps3 | psp2 | psp | riscos | wii)
  		_posix=no
  		;;
@@ -9,3 +9,13 @@
  		_posix=yes
  		;;
  	os2-emx*)
+@@ -5538,6 +5538,9 @@
+ 		mingw*)
+ 			OPENGL_LIBS="-lopengl32"
+ 			;;
++		serenity*)
++			OPENGL_LIBS="-lgl"
++			;;
+ 		*)
+ 			OPENGL_LIBS="-lGL"
+ 			;;