From c37a9c83288102b0bc4bfd99ae6c55abf3053a68 Mon Sep 17 00:00:00 2001 From: WickedShell Date: Thu, 6 May 2021 04:20:08 -0700 Subject: [PATCH] Openglada: Correct libx11 version (#276) * Openglada: Correct libx11 version * Index x11 on Arch * Fix openglada 0.6 dependencies * Set windowing system on Windows/macOS * Fix gnat dependency to all platforms Co-authored-by: Alejandro R. Mosteo --- index/li/libx11/libx11-external.toml | 1 + index/op/openglada/openglada-0.6.0.toml | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/index/li/libx11/libx11-external.toml b/index/li/libx11/libx11-external.toml index 0933be5e..56abfac1 100644 --- a/index/li/libx11/libx11-external.toml +++ b/index/li/libx11/libx11-external.toml @@ -7,4 +7,5 @@ maintainers-logins = ["mosteo"] [[external]] kind = "system" [external.origin."case(distribution)"] +"arch" = ["libx11"] "debian|ubuntu" = ["libx11-dev"] diff --git a/index/op/openglada/openglada-0.6.0.toml b/index/op/openglada/openglada-0.6.0.toml index 184aae46..dd8ac353 100644 --- a/index/op/openglada/openglada-0.6.0.toml +++ b/index/op/openglada/openglada-0.6.0.toml @@ -10,16 +10,20 @@ maintainers-logins = ["flyx"] project-files = ["opengl.gpr", "opengl-glfw.gpr", "opengl-soil.gpr", "opengl-test.gpr"] [[depends-on]] +gnat = "<8" [depends-on."case(os)".linux] libglfw3 = "^3" -libx11 = "^2" +libx11 = "^1" [gpr-externals] Auto_Exceptions = ["enabled", "disabled"] GLFW_Version = ["2", "3"] Mode = ["debug", "release"] -[gpr-set-externals."case(os)".linux] -Windowing_System = "x11" + +[gpr-set-externals."case(os)"] +linux = { Windowing_System = "x11" } +macos = { Windowing_System = "quartz" } +windows = { Windowing_System = "windows" } [origin] url = "https://github.com/flyx/OpenGLAda/archive/v0.6.tar.gz"