From 81955e8c6eeb17e743d14f96fb1a66f3792e082c Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Sat, 2 Mar 2024 06:23:20 -0600 Subject: [PATCH] fltk: Use the mesa-glu Conan package This is done the same way as for the FreeGLUT package in #22428. Fixes #22944. --- recipes/fltk/all/conanfile.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/fltk/all/conanfile.py b/recipes/fltk/all/conanfile.py index bd7f4d5b1b6f2..446e8e9b74797 100644 --- a/recipes/fltk/all/conanfile.py +++ b/recipes/fltk/all/conanfile.py @@ -72,7 +72,10 @@ def requirements(self): if self.settings.os in ["Linux", "FreeBSD"]: if self.options.with_gl: self.requires("opengl/system") - self.requires("glu/system") + if is_apple_os(self) or self.settings.os == "Windows": + self.requires("glu/system") + else: + self.requires("mesa-glu/9.0.3") self.requires("fontconfig/2.15.0") self.requires("xorg/system") if self.options.with_xft: @@ -125,7 +128,7 @@ def package_info(self): if self.options.with_threads: self.cpp_info.system_libs.extend(["pthread", "dl"]) if self.options.with_gl: - self.cpp_info.system_libs.extend(["GL", "GLU"]) + self.cpp_info.system_libs.extend(["GL"]) elif is_apple_os(self): self.cpp_info.frameworks = [ "AppKit", "ApplicationServices", "Carbon", "Cocoa", "CoreFoundation", "CoreGraphics",