|
| 1 | +From cdb33c3d5621ce035ad6950c8e2268fe94b73de5 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Tor Arne Vestbø < [email protected]> |
| 3 | +Date: Tue, 10 Jun 2025 06:46:30 -0700 |
| 4 | +Subject: [PATCH] macOS: Remove linkage to AGL framework |
| 5 | + |
| 6 | +It's no longer available on macOS 26, and we don't use it anymore |
| 7 | +anyways. |
| 8 | + |
| 9 | +Pick-to: 6.10 6.9 6.8 6.5 |
| 10 | +Change-Id: Ia1d0e37dda177f333646e598e517f4af20215dad |
| 11 | +Reviewed-by: Alexandru Croitor < [email protected]> |
| 12 | +--- |
| 13 | + |
| 14 | +diff --git a/cmake/FindWrapOpenGL.cmake b/cmake/FindWrapOpenGL.cmake |
| 15 | +index 7295a15..fe73ab7 100644 |
| 16 | +--- a/cmake/FindWrapOpenGL.cmake |
| 17 | ++++ b/cmake/FindWrapOpenGL.cmake |
| 18 | +@@ -37,16 +37,7 @@ |
| 19 | + set(__opengl_fw_path "-framework OpenGL") |
| 20 | + endif() |
| 21 | + |
| 22 | +- find_library(WrapOpenGL_AGL NAMES AGL) |
| 23 | +- if(WrapOpenGL_AGL) |
| 24 | +- set(__opengl_agl_fw_path "${WrapOpenGL_AGL}") |
| 25 | +- endif() |
| 26 | +- if(NOT __opengl_agl_fw_path) |
| 27 | +- set(__opengl_agl_fw_path "-framework AGL") |
| 28 | +- endif() |
| 29 | +- |
| 30 | + target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path}) |
| 31 | +- target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path}) |
| 32 | + else() |
| 33 | + target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL) |
| 34 | + endif() |
| 35 | +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf |
| 36 | +index 61bea95..9ba38d99 100644 |
| 37 | +--- a/mkspecs/common/mac.conf |
| 38 | ++++ b/mkspecs/common/mac.conf |
| 39 | +@@ -18,8 +18,7 @@ |
| 40 | + |
| 41 | + # sdk.prf will prefix the proper SDK sysroot |
| 42 | + QMAKE_INCDIR_OPENGL = \ |
| 43 | +- /System/Library/Frameworks/OpenGL.framework/Headers \ |
| 44 | +- /System/Library/Frameworks/AGL.framework/Headers/ |
| 45 | ++ /System/Library/Frameworks/OpenGL.framework/Headers |
| 46 | + |
| 47 | + QMAKE_FIX_RPATH = install_name_tool -id |
| 48 | + |
| 49 | +@@ -30,7 +29,7 @@ |
| 50 | + QMAKE_REL_RPATH_BASE = @loader_path |
| 51 | + |
| 52 | + QMAKE_LIBS_DYNLOAD = |
| 53 | +-QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL |
| 54 | ++QMAKE_LIBS_OPENGL = -framework OpenGL |
| 55 | + QMAKE_LIBS_THREAD = |
| 56 | + |
| 57 | + QMAKE_INCDIR_WAYLAND = |
0 commit comments