Merge branch 'dev' into libsdl2-rename

xmake-io · Feb 8, 2025 · c817175 · c817175
2 parents 8f85e0b + 0793962
commit c817175
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 4 deletions.
diff --git a/packages/a/aws-c-compression/xmake.lua b/packages/a/aws-c-compression/xmake.lua
@@ -6,6 +6,7 @@ package("aws-c-compression")
     add_urls("https://github.com/awslabs/aws-c-compression/archive/refs/tags/$(version).tar.gz",
              "https://github.com/awslabs/aws-c-compression.git")
 
+    add_versions("v0.3.1", "d89fca17a37de762dc34f332d2da402343078da8dbd2224c46a11a88adddf754")
     add_versions("v0.3.0", "7e5d7308d1dbb1801eae9356ef65558f707edf33660dd6443c985db9474725eb")
     add_versions("v0.2.19", "51796f98a29a0d6e257c02e1f842bbc41db324758939093e6d46ec28337a3272")
     add_versions("v0.2.18", "517c361f3b7fffca08efd5ad251a20489794f056eab0dfffacc6d5b341df8e86")

diff --git a/packages/a/aws-c-event-stream/xmake.lua b/packages/a/aws-c-event-stream/xmake.lua
@@ -6,6 +6,7 @@ package("aws-c-event-stream")
     add_urls("https://github.com/awslabs/aws-c-event-stream/archive/refs/tags/$(version).tar.gz",
              "https://github.com/awslabs/aws-c-event-stream.git")
 
+    add_versions("v0.5.1", "22ce7a695b82debe118c9ecc641ea8bc7e59c9843f92d5acf8401fc86cac847a")
     add_versions("v0.5.0", "3a53a9d05f9e2fd06036a12854a8b4f05a0c4858bb5b8df8a30edba9de8532b5")
     add_versions("v0.4.3", "d7d82c38bae68d2287ac59972a76b2b6159e7a3d7c9b7edb1357495aa4d0c0de")
     add_versions("v0.4.2", "c98b8fa05c2ca10aacfce7327b92a84669c2da95ccb8e7d7b3e3285fcec8beee")

diff --git a/packages/c/cpp-httplib/xmake.lua b/packages/c/cpp-httplib/xmake.lua
@@ -7,6 +7,7 @@ package("cpp-httplib")
     set_urls("https://github.com/yhirose/cpp-httplib/archive/refs/tags/$(version).tar.gz",
              "https://github.com/yhirose/cpp-httplib.git")
 
+    add_versions("v0.18.6", "8900747bba3dda8007f1876175be699036e09e4a25ceeab51196d9365bf1993a")
     add_versions("v0.18.5", "731190e97acd63edce57cc3dacd496f57e7743bfc7933da7137cb3e93ec6c9a0")
     add_versions("v0.18.3", "a0567bcd6c3fe5cef1b329b96245119047f876b49e06cc129a36a7a8dffe173e")
     add_versions("v0.18.1", "405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00")

diff --git a/packages/l/libbigwig/xmake.lua b/packages/l/libbigwig/xmake.lua
@@ -6,6 +6,7 @@ package("libbigwig")
     add_urls("https://github.com/dpryan79/libBigWig/archive/refs/tags/$(version).tar.gz",
              "https://github.com/dpryan79/libBigWig.git")
 
+    add_versions("0.4.8", "10e904ea6eab4c9926dd938050af888bebe6281e8d933237e4a254cb9d3063b1")
     add_versions("0.4.7", "8e057797011d93fa00e756600898af4fe6ca2d48959236efc9f296abe94916d9")
 
     add_configs("curl", {description = "Enable CURL support", default = false, type = "boolean"})

diff --git a/packages/l/libsdl2_gfx/xmake.lua b/packages/l/libsdl2_gfx/xmake.lua
@@ -63,8 +63,16 @@ package("libsdl2_gfx")
     end)
 
     on_test(function (package)
-        assert(package:has_cfuncs("aacircleRGBA", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_gfxPrimitives.h"}}))
-        assert(package:has_cfuncs("SDL_initFramerate", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_framerate.h"}}))
-        assert(package:has_cfuncs("rotozoomSurface", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_rotozoom.h"}}))
-        assert(package:has_cfuncs("SDL_imageFilterAdd", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_imageFilter.h"}}))
+        local ldflags
+        if package:is_plat("windows") then
+            if package:has_tool("cxx", "cl", "clang-cl") then
+                ldflags = "-subsystem:console"
+            elseif package:has_tool("cxx", "clang", "clangxx") then
+                ldflags = "-Wl,/subsystem:console"
+            end
+        end
+        assert(package:has_cfuncs("aacircleRGBA", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_gfxPrimitives.h"}, configs = {ldflags = ldflags}}))
+        assert(package:has_cfuncs("SDL_initFramerate", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_framerate.h"}, configs = {ldflags = ldflags}}))
+        assert(package:has_cfuncs("rotozoomSurface", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_rotozoom.h"}, configs = {ldflags = ldflags}}))
+        assert(package:has_cfuncs("SDL_imageFilterAdd", {includes = {"SDL2/SDL_main.h", "SDL2/SDL2_imageFilter.h"}, configs = {ldflags = ldflags}}))
     end)
diff --git a/packages/l/libsdl_gfx/xmake.lua b/packages/l/libsdl_gfx/xmake.lua
@@ -1,6 +1,8 @@
 package("libsdl_gfx")
     set_base("libsdl2_gfx")
 
+    add_deps("cmake")
+
     on_load(function (package)
         wprint("libsdl_gfx package has been renamed to libsdl2_gfx following the release of SDL3, please update the package name in your xmake.lua.${clear}")
         package:base():script("load")(package)

diff --git a/packages/l/libsdl_image/xmake.lua b/packages/l/libsdl_image/xmake.lua
@@ -1,6 +1,8 @@
 package("libsdl_image")
     set_base("libsdl2_image")
 
+    add_deps("cmake")
+
     on_load(function (package)
         wprint("libsdl_image package has been renamed to libsdl2_image following the release of SDL3, please update the package name in your xmake.lua.${clear}")
         package:base():script("load")(package)

diff --git a/packages/l/libsdl_mixer/xmake.lua b/packages/l/libsdl_mixer/xmake.lua
@@ -1,6 +1,8 @@
 package("libsdl_mixer")
     set_base("libsdl2_mixer")
 
+    add_deps("cmake")
+
     on_load(function (package)
         wprint("libsdl_mixer package has been renamed to libsdl2_mixer following the release of SDL3, please update the package name in your xmake.lua.${clear}")
         package:base():script("load")(package)

diff --git a/packages/l/libsdl_net/xmake.lua b/packages/l/libsdl_net/xmake.lua
@@ -1,6 +1,8 @@
 package("libsdl_net")
     set_base("libsdl2_net")
 
+    add_deps("cmake")
+
     on_load(function (package)
         wprint("libsdl_net package has been renamed to libsdl2_net following the release of SDL3, please update the package name in your xmake.lua.${clear}")
         package:base():script("load")(package)

diff --git a/packages/l/libsdl_ttf/xmake.lua b/packages/l/libsdl_ttf/xmake.lua
@@ -1,6 +1,8 @@
 package("libsdl_ttf")
     set_base("libsdl2_ttf")
 
+    add_deps("cmake", "freetype")
+
     on_load(function (package)
         wprint("libsdl_ttf package has been renamed to libsdl2_ttf following the release of SDL3, please update the package name in your xmake.lua.${clear}")
         package:base():script("load")(package)