From c4d9abaf25aefd7584199082c05a341c9f776fcd Mon Sep 17 00:00:00 2001 From: PucklaMotzer09 Date: Sun, 30 Aug 2020 12:33:18 +0200 Subject: [PATCH 1/3] Add libsdl_image --- packages/l/libsdl_image/xmake.lua | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/l/libsdl_image/xmake.lua diff --git a/packages/l/libsdl_image/xmake.lua b/packages/l/libsdl_image/xmake.lua new file mode 100644 index 000000000..9c397a02f --- /dev/null +++ b/packages/l/libsdl_image/xmake.lua @@ -0,0 +1,43 @@ +package("libsdl_image") + add_deps("libsdl") + + set_homepage("http://www.libsdl.org/projects/SDL_image/") + set_description("Simple DirectMedia Layer image loading library") + + if is_plat("windows", "mingw") then + set_urls("https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-$(version)-VC.zip") + add_versions("2.0.5", "a180f9b75c4d3fbafe02af42c42463cc7bc488e763cfd1ec2ffb75678b4387ac") + else + set_urls("https://www.libsdl.org/projects/SDL_image/release/SDL2_image-$(version).zip") + add_versions("2.0.5", "eee0927d1e7819d57c623fe3e2b3c6761c77c474fe9bc425e8674d30ac049b1c") + end + + add_links("SDL2_image") + + on_install("windows", "mingw", function (package) + local arch = package:arch() + if package:is_plat("mingw") then + arch = (arch == "x86_64") and "x64" or "x86" + end + + os.cp("include/*", package:installdir("include/SDL2")) + os.cp(path.join("lib", arch, "*.lib"), package:installdir("lib")) + os.cp(path.join("lib", arch, "*.dll"), package:installdir("lib")) + end) + + on_install("macosx", "linux", function (package) + local configs = {} + if package:config("shared") then + table.insert(configs, "--enable-shared=yes") + else + table.insert(configs, "--enable-shared=no") + end + + table.insert(configs, "--with-sdl-prefix=" .. package:dep("libsdl"):installdir()) + + import("package.tools.autoconf").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("IMG_Init", {includes = "SDL2/SDL_image.h", configs = {defines = "SDL_MAIN_HANDLED"}})) + end) \ No newline at end of file From 3fb3a308d044c1ab15c9e7baa38f2a865d62380d Mon Sep 17 00:00:00 2001 From: PucklaMotzer09 Date: Sun, 30 Aug 2020 13:35:40 +0200 Subject: [PATCH 2/3] Move set_homepage to top in libsdl_image --- packages/l/libsdl_image/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/l/libsdl_image/xmake.lua b/packages/l/libsdl_image/xmake.lua index 9c397a02f..91923d549 100644 --- a/packages/l/libsdl_image/xmake.lua +++ b/packages/l/libsdl_image/xmake.lua @@ -1,5 +1,4 @@ package("libsdl_image") - add_deps("libsdl") set_homepage("http://www.libsdl.org/projects/SDL_image/") set_description("Simple DirectMedia Layer image loading library") @@ -12,6 +11,8 @@ package("libsdl_image") add_versions("2.0.5", "eee0927d1e7819d57c623fe3e2b3c6761c77c474fe9bc425e8674d30ac049b1c") end + add_deps("libsdl") + add_links("SDL2_image") on_install("windows", "mingw", function (package) From ee65aee1896c988f6eccc29bd3bc5d183e8e2c92 Mon Sep 17 00:00:00 2001 From: PucklaMotzer09 Date: Sun, 30 Aug 2020 14:09:09 +0200 Subject: [PATCH 3/3] Remove redundant blank lines in libsdl_image --- packages/l/libsdl_image/xmake.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/l/libsdl_image/xmake.lua b/packages/l/libsdl_image/xmake.lua index 91923d549..325fbeb03 100644 --- a/packages/l/libsdl_image/xmake.lua +++ b/packages/l/libsdl_image/xmake.lua @@ -20,7 +20,6 @@ package("libsdl_image") if package:is_plat("mingw") then arch = (arch == "x86_64") and "x64" or "x86" end - os.cp("include/*", package:installdir("include/SDL2")) os.cp(path.join("lib", arch, "*.lib"), package:installdir("lib")) os.cp(path.join("lib", arch, "*.dll"), package:installdir("lib")) @@ -33,9 +32,7 @@ package("libsdl_image") else table.insert(configs, "--enable-shared=no") end - table.insert(configs, "--with-sdl-prefix=" .. package:dep("libsdl"):installdir()) - import("package.tools.autoconf").install(package, configs) end)