From 1fc624c5ee1e0208e14cc4be11738c926ce8b4a1 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 26 Sep 2024 15:36:15 +0200
Subject: [PATCH] Fix OpenGL on macosx

With new versions of the OS and/or the command line tools a OpenGL version
installed with brew was used which somehow doesn't work. With the change the
system version from the OpenGL framework is used.

(cherry picked from commit 87daf3177ee83b3ae4c684866c154f60ee21f7c6)
(see https://github.com/FairRootGroup/FairSoft/pull/556)
---
 cmake/legacy.cmake                      |  1 +
 legacy/root/fix_macosx_findOpenGL.patch | 32 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 legacy/root/fix_macosx_findOpenGL.patch

diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake
index d4da59e0..6315f669 100644
--- a/cmake/legacy.cmake
+++ b/cmake/legacy.cmake
@@ -420,6 +420,7 @@ ExternalProject_Add(root
     ${root_cocoa}
   UPDATE_DISCONNECTED ON
   PATCH_COMMAND ${patch} -p1 -i "${CMAKE_SOURCE_DIR}/legacy/root/fix_macos_sdk_mismatch.patch"
+  COMMAND ${patch} -p1 -i "${CMAKE_SOURCE_DIR}/legacy/root/fix_macosx_findOpenGL.patch"
   DEPENDS pythia6 pythia8 vc ${extract_source_cache_target}
   ${LOG_TO_FILE}
 )
diff --git a/legacy/root/fix_macosx_findOpenGL.patch b/legacy/root/fix_macosx_findOpenGL.patch
new file mode 100644
index 00000000..e0a0b7ca
--- /dev/null
+++ b/legacy/root/fix_macosx_findOpenGL.patch
@@ -0,0 +1,32 @@
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index 682de46f27..57addbc948 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -565,6 +565,17 @@ find_package(Python3 3.8 COMPONENTS ${python_components})
+ #---Check for OpenGL installation-------------------------------------------------------
+ if(opengl)
+   message(STATUS "Looking for OpenGL")
++  # Search for the OpenGL installation first in the system.
++  # OpenGL installed via brew (mesa, mesa-glu) and X11 seems not to work
++  # properly so it is needed to use the system version.
++  # CMAKE_FIND_FRAMEWORK defines the search order on macosx which as
++  # default is search first for frameworks.
++  # ROOT changes the order to search last for the framework.
++  # Temporarely change the search order for OpenGL.
++  if(APPLE)
++    set(frame_temp ${CMAKE_FIND_FRAMEWORK})
++    set(CMAKE_FIND_FRAMEWORK FIRST)
++  endif()
+   find_package(OpenGL)
+   if(NOT OPENGL_FOUND OR NOT OPENGL_GLU_FOUND)
+     if(fail-on-missing)
+@@ -574,6 +585,9 @@ if(opengl)
+       set(opengl OFF CACHE BOOL "Disabled because OpenGL (with GLU) not found (${opengl_description})" FORCE)
+     endif()
+   endif()
++  if (APPLE)
++    set(CMAKE_FIND_FRAMEWORK ${frame_temp})
++  endif()
+ endif()
+ # OpenGL should be working only with x11 (Linux),
+ # in case when -Dall=ON -Dx11=OFF, we will just disable opengl.