Signed-off-by: Francois Gouget fgouget@codeweavers.com --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a8e5a0e0e4..13f969920a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeOpenGL}) + { + InfoMsg "\nRunning make_opengl\n"; + system("cd '$DataDir/$Dir/dlls/opengl32' && set -x && ./make_opengl"); + if ($? != 0) + { + LogMsg "make_opengl failed\n"; + return undef; + } + } if ($Impacts->{MakeVulkan}) { InfoMsg "\nRunning make_vulkan\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 3c2f670119..07e61225e0 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl.xml|include/wine/wgl_driver.h)$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;