(#25135) Alpine support for xorg

* alpine support * Update recipes/xorg/all/conanfile.py Co-authored-by: Martin Valgur <[email protected]> * Apk is only available in Conan 2 * Typoe * !! * Update recipes/xorg/all/conanfile.py Co-authored-by: Uilian Ries <[email protected]> * Fix missing Version Signed-off-by: Uilian Ries <[email protected]> * Simplify version validation Signed-off-by: Uilian Ries <[email protected]> --------- Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Martin Valgur <[email protected]> Co-authored-by: Abril Rincón Blanco <[email protected]> Co-authored-by: Uilian Ries <[email protected]>
conan-io · Sep 4, 2024 · 18c96ad · 18c96ad
1 parent db6b6f8
commit 18c96ad
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/recipes/xorg/all/conanfile.py b/recipes/xorg/all/conanfile.py
@@ -2,6 +2,7 @@
 from conan.tools.gnu import PkgConfig
 from conan.tools.system import package_manager
 from conan.errors import ConanInvalidConfiguration
+from conan.tools.scm import Version
 
 required_conan_version = ">=1.50.0"
 
@@ -73,8 +74,17 @@ def system_requirements(self):
                            "libXScrnSaver", "xcb-util-wm", "xcb-util-image", "xcb-util-keysyms", "xcb-util-renderutil",
                            "libxxf86vm", "libxv", "xkeyboard-config", "xcb-util", "xcb-util-cursor"], update=True, check=True)
 
+        if Version(conan_version) >= "2.0.10":
+            alpine = package_manager.Apk(self)
+            alpine.install(["libx11-dev", "	libxcb-dev", "libfontenc-dev", "libice-dev", "libsm-dev", "	libxau-dev", "libxaw-dev",
+                            "libxcomposite-dev", "libxcursor-dev", "libxdamage-dev", "libxdmcp-dev", "	libxext-dev", "libxfixes-dev", "libxi-dev",
+                            "libxinerama-dev", "libxkbfile-dev", "	libxmu-dev", "libxpm-dev", "libxrandr-dev", "libxrender-dev", "libxres-dev",
+                            "libxscrnsaver-dev", "libxt-dev", "libxtst-dev", "libxv-dev", "libxxf86vm-dev",
+                            "xcb-util-wm-dev", "xcb-util-image-dev", "xcb-util-keysyms-dev", "xcb-util-renderutil-dev",
+                            "libxinerama-dev", "libxcb-dev", "xcb-util-dev", "xcb-util-cursor-dev"], update=True, check=True)
+
     def package_info(self):
-        if conan_version.major >= 2:
+        if Version(conan_version) >= 2:
             self.cpp_info.bindirs = []
             self.cpp_info.includedirs = []
             self.cpp_info.libdirs = []