Skip to content

Commit

Permalink
Only require egl/system once
Browse files Browse the repository at this point in the history
  • Loading branch information
jwillikers committed May 3, 2024
1 parent 7bbc685 commit 61e3227
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def requirements(self):
self.requires("xorg/system")
if self.options.get_safe("opengl", "no") != "no":
self.requires("opengl/system")
if self.settings.os in ["FreeBSD", "Linux"] and not self.options.get_safe("with_x11") and self.options.get_safe("opengl", "no") != "no":
if self.settings.os in ["FreeBSD", "Linux"] and ((not self.options.get_safe("with_x11") and self.options.get_safe("opengl", "no") != "no") or self.options.qtwebengine):
self.requires("egl/system")
if self.options.get_safe("with_x11") or self.options.qtwayland:
self.requires("xkbcommon/1.5.0")
Expand All @@ -415,7 +415,6 @@ def requirements(self):
self.requires("libxshmfence/1.3")
self.requires("nss/3.93")
self.requires("libdrm/2.4.119")
self.requires("egl/system")
if self.options.get_safe("with_gstreamer", False):
self.requires("gst-plugins-base/1.19.2")
if self.options.get_safe("with_pulseaudio", False):
Expand Down

0 comments on commit 61e3227

Please sign in to comment.