From 402b1c2ea3ebced244c6232b4db209c6abca4689 Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Sun, 15 Dec 2024 23:32:02 +0400 Subject: [PATCH] widelands: fix mesa conflict --- games/widelands/Portfile | 3 +++ games/widelands/files/patch-fix-opengl.diff | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 games/widelands/files/patch-fix-opengl.diff diff --git a/games/widelands/Portfile b/games/widelands/Portfile index 49b32d4c144..a223aa33a6b 100644 --- a/games/widelands/Portfile +++ b/games/widelands/Portfile @@ -62,6 +62,9 @@ if {${subport} eq ${name}} { This port follows the master version of ${name}, which is typically updated every few weeks. } +# ensure mesa isn't picked up by the build +patchfiles patch-fix-opengl.diff + compiler.cxx_standard 2017 configure.args-append -DCMAKE_INSTALL_PREFIX:PATH="${applications_dir}/Widelands.app/Contents/MacOS" \ diff --git a/games/widelands/files/patch-fix-opengl.diff b/games/widelands/files/patch-fix-opengl.diff new file mode 100644 index 00000000000..892b649f252 --- /dev/null +++ b/games/widelands/files/patch-fix-opengl.diff @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2024-11-13 00:03:25 ++++ CMakeLists.txt 2024-12-15 23:30:20 +@@ -17,8 +17,6 @@ + option(OPTION_TSAN "Build with ThreadSanitizer" OFF) + option(OPTION_FORCE_EMBEDDED_MINIZIP "Use embedded minizip sources" OFF) + option(USE_XDG "Follow XDG-Basedir specification" ON) # Enabled by default +- +-set(CMAKE_FIND_FRAMEWORK LAST) + + # Absolute path reference for submodules + set(WL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")