From edbcec5f3f290f290e20c60525a643e4e0504879 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 31 Oct 2018 23:58:32 +0800 Subject: [PATCH 01/15] add x265 --- packages/f/ffmpeg/xmake.lua | 6 ++++++ packages/x/x265/xmake.lua | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 packages/x/x265/xmake.lua diff --git a/packages/f/ffmpeg/xmake.lua b/packages/f/ffmpeg/xmake.lua index 20e6c4313..87af85807 100644 --- a/packages/f/ffmpeg/xmake.lua +++ b/packages/f/ffmpeg/xmake.lua @@ -9,6 +9,8 @@ package("ffmpeg") add_versions("home:4.0.2", "346c51735f42c37e0712e0b3d2f6476c86ac15863e4445d9e823fe396420d056") add_versions("github:4.0.2", "4df1ef0bf73b7148caea1270539ef7bd06607e0ea8aa2fbf1bb34062a097f026") + add_deps("x264", {optional = true}) + on_load(function (package) package:addvar("links", "avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") end) @@ -17,6 +19,7 @@ package("ffmpeg") local configs = {"--disable-ffmpeg", "--disable-ffplay", "--disable-debug", + "--enable-gpl", "--enable-version3", "--enable-hardcoded-tables", "--enable-avresample"} @@ -31,5 +34,8 @@ package("ffmpeg") if is_plat("macosx") and macos.version():ge("10.8") then table.insert(configs, "--enable-videotoolbox") end + if package:config("x264") ~= false and package:dep("x264"):exists() then + table.insert(configs, "--enable-libx264") + end import("package.tools.autoconf").install(package, configs) end) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua new file mode 100644 index 000000000..56053f879 --- /dev/null +++ b/packages/x/x265/xmake.lua @@ -0,0 +1,18 @@ +package("x265") + + set_homepage("http://x265.org") + set_description("A free software library and application for encoding video streams into the H.265/MPEG-H HEVC compression format.") + + add_urls("https://bitbucket.org/multicoreware/x265/downloads/x265_$(version).tar.gz") + + add_versions("2.9", "ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024") + + add_deps("cmake", "nasm") + + on_install("linux", "macosx", function (package) + os.cd("build/linux") + os.vrun("./multilib.sh") + os.cp("8bit/libx265.a", package:installdir("lib")) + os.cp("8bit/x265_config.h", package:installdir("include")) + os.cp("../../source/x265.h", package:installdir("include")) + end) From ecb8902cfcd3b5d61bf6700ac157346c1695bbe5 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Nov 2018 22:41:50 +0800 Subject: [PATCH 02/15] add nlohmann_json --- packages/n/nlohmann_json/xmake.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/n/nlohmann_json/xmake.lua diff --git a/packages/n/nlohmann_json/xmake.lua b/packages/n/nlohmann_json/xmake.lua new file mode 100644 index 000000000..9c5e634e6 --- /dev/null +++ b/packages/n/nlohmann_json/xmake.lua @@ -0,0 +1,12 @@ +package("nlohmann_json") + + set_homepage("https://nlohmann.github.io/json/") + set_description("JSON for Modern C++") + + add_urls("https://github.com/nlohmann/json/releases/download/$(version)/include.zip", + "https://github.com/nlohmann/json.git") + add_versions("v3.4.0", "bfec46fc0cee01c509cf064d2254517e7fa80d1e7647fea37cf81d97c5682bdc") + + on_install(function (package) + os.cp("include", package:installdir()) + end) From aef2bbcc80a5cf042a7df82e3c7391050ac34554 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Nov 2018 22:49:11 +0800 Subject: [PATCH 03/15] add x265 deps to ffmpeg --- packages/f/ffmpeg/xmake.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/f/ffmpeg/xmake.lua b/packages/f/ffmpeg/xmake.lua index 87af85807..db9ac9bde 100644 --- a/packages/f/ffmpeg/xmake.lua +++ b/packages/f/ffmpeg/xmake.lua @@ -10,6 +10,7 @@ package("ffmpeg") add_versions("github:4.0.2", "4df1ef0bf73b7148caea1270539ef7bd06607e0ea8aa2fbf1bb34062a097f026") add_deps("x264", {optional = true}) + add_deps("x265", {optional = true}) on_load(function (package) package:addvar("links", "avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") @@ -37,5 +38,8 @@ package("ffmpeg") if package:config("x264") ~= false and package:dep("x264"):exists() then table.insert(configs, "--enable-libx264") end + if package:config("x265") ~= false and package:dep("x265"):exists() then + table.insert(configs, "--enable-libx265") + end import("package.tools.autoconf").install(package, configs) end) From 4a59ba2674bbeee2238b8657753164e6a8a28806 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Nov 2018 23:58:28 +0800 Subject: [PATCH 04/15] fix json package script --- packages/n/nlohmann_json/xmake.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/n/nlohmann_json/xmake.lua b/packages/n/nlohmann_json/xmake.lua index 9c5e634e6..4c1c795fa 100644 --- a/packages/n/nlohmann_json/xmake.lua +++ b/packages/n/nlohmann_json/xmake.lua @@ -8,5 +8,9 @@ package("nlohmann_json") add_versions("v3.4.0", "bfec46fc0cee01c509cf064d2254517e7fa80d1e7647fea37cf81d97c5682bdc") on_install(function (package) - os.cp("include", package:installdir()) + if os.isdir("include") then + os.cp("include", package:installdir()) + else + os.cp("*", package:installdir("include")) + end end) From 8de2e0aa37bccf6af9e20846b793a880c7582e7a Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 8 Nov 2018 23:03:16 +0800 Subject: [PATCH 05/15] add __tb_debug__ to tbox --- packages/t/tbox/xmake.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/t/tbox/xmake.lua b/packages/t/tbox/xmake.lua index f59808060..d96efee66 100644 --- a/packages/t/tbox/xmake.lua +++ b/packages/t/tbox/xmake.lua @@ -11,6 +11,12 @@ package("tbox") add_versions("v1.6.2", "5236090b80374b812c136c7fe6b8c694418cbfc9c0a820ec2ba35ff553078c7b") add_versions("v1.6.3", "bc5a957cdb1610c19f0cf94497ad114a0e01fd7d569777e9cb2133c513ef6baa") + on_load(function (package) + if package:debug() then + package:addvar("defines", "__tb_debug__") + end + end) + on_install(function (package) import("package.tools.xmake").install(package, {demo = false}) end) From 4cac56126ecf4e3ea9dd0037cfb1b77ae654afaf Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 9 Nov 2018 22:41:09 +0800 Subject: [PATCH 06/15] add system links for x265 --- packages/x/x265/xmake.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index 56053f879..500c502da 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -9,6 +9,10 @@ package("x265") add_deps("cmake", "nasm") + on_load("linux", "macosx", function (package) + package:addvar("syslinks", "c++") + end) + on_install("linux", "macosx", function (package) os.cd("build/linux") os.vrun("./multilib.sh") From c6b60171d147a76eb6d4787172bf44c11df6dd16 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 20 Nov 2018 22:51:42 +0800 Subject: [PATCH 07/15] add lua --- packages/l/lua/xmake.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/l/lua/xmake.lua diff --git a/packages/l/lua/xmake.lua b/packages/l/lua/xmake.lua new file mode 100644 index 000000000..74e587003 --- /dev/null +++ b/packages/l/lua/xmake.lua @@ -0,0 +1,20 @@ +package("lua") + + set_homepage("http://lua.org") + set_description("A powerful, efficient, lightweight, embeddable scripting language.") + + set_urls("https://www.lua.org/ftp/lua-$(version).tar.gz", + "https://github.com/lua/lua.git") + + add_versions("5.3.5", "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac") + + on_install("macosx", "linux", function (package) + io.gsub("./Makefile", "INSTALL_TOP= /usr/local", "INSTALL_TOP=" .. package:installdir()) + if is_plat("macosx") then + os.vrun("make macosx") + else + os.vrun("make linux") + end + os.vrun("make install") + end) + From a12083431ca8455e518c3d543e79f42b92341c35 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 20 Nov 2018 22:55:29 +0800 Subject: [PATCH 08/15] update lua package --- packages/l/lua/xmake.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/l/lua/xmake.lua b/packages/l/lua/xmake.lua index 74e587003..9b4840f9b 100644 --- a/packages/l/lua/xmake.lua +++ b/packages/l/lua/xmake.lua @@ -7,14 +7,11 @@ package("lua") "https://github.com/lua/lua.git") add_versions("5.3.5", "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac") + add_versions("5.2.4", "b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b") + add_versions("5.1.5", "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333") - on_install("macosx", "linux", function (package) - io.gsub("./Makefile", "INSTALL_TOP= /usr/local", "INSTALL_TOP=" .. package:installdir()) - if is_plat("macosx") then - os.vrun("make macosx") - else - os.vrun("make linux") - end - os.vrun("make install") + on_install(function (package) + os.cd("src") + import("package.tools.xmake").install(package) end) From ec333a15d1307904e16c361e49f3846874cf1ccd Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 22 Nov 2018 00:50:22 +0800 Subject: [PATCH 09/15] improve lua and luajit --- packages/l/lua/xmake.lua | 15 ++++++++++++++- packages/l/luajit/xmake.lua | 9 +++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/l/lua/xmake.lua b/packages/l/lua/xmake.lua index 9b4840f9b..b9c3edd99 100644 --- a/packages/l/lua/xmake.lua +++ b/packages/l/lua/xmake.lua @@ -10,8 +10,21 @@ package("lua") add_versions("5.2.4", "b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b") add_versions("5.1.5", "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333") + on_load(function (package) + package:addvar("includedirs", "include/lua") + end) + on_install(function (package) - os.cd("src") + io.writefile("xmake.lua", [[ + target("lua") + set_kind("static") + add_files("src/*.c|lua.c|luac.c") + add_defines("LUA_COMPAT_5_2", "LUA_COMPAT_5_1") + if is_plat("linux") then + add_defines("LUA_USE_LINUX") + end + ]]) import("package.tools.xmake").install(package) + os.cp("src/*h", package:installdir("include/lua")) end) diff --git a/packages/l/luajit/xmake.lua b/packages/l/luajit/xmake.lua index fe6012cc3..b558c06c3 100644 --- a/packages/l/luajit/xmake.lua +++ b/packages/l/luajit/xmake.lua @@ -14,17 +14,22 @@ package("luajit") add_versions("2.0.4", "620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d") add_versions("2.0.5", "874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979") + on_load(function (package) + package:addvar("includedirs", "include/luajit") + end) + on_install("windows", function (package) os.cd("src") os.vrun("msvcbuild.bat") os.cp("lua51.lib", package:installdir("lib")) os.cp("lua51.dll", package:installdir("lib")) - os.cp("*.h", package:installdir("include")) + os.cp("*.h", package:installdir("include/luajit")) end) on_install("macosx", "linux", function (package) io.gsub("./Makefile", "export PREFIX= /usr/local", "export PREFIX=" .. package:installdir()) os.vrun("make") - os.vrun("make install") + os.cp("src/*.a", package:installdir("lib")) + os.cp("src/*.h", package:installdir("include/luajit")) end) From 4bcc6d3572c6bc79501b8f8d14a60dece8c8515f Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 26 Nov 2018 23:49:40 +0800 Subject: [PATCH 10/15] add ncurses --- packages/n/ncurses/xmake.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/n/ncurses/xmake.lua diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua new file mode 100644 index 000000000..675497e90 --- /dev/null +++ b/packages/n/ncurses/xmake.lua @@ -0,0 +1,13 @@ +package("ncurses") + + set_homepage("https://www.gnu.org/software/ncurses/") + set_description("A free software emulation of curses.") + + add_urls("ftp://ftp.invisible-island.net/ncurses/ncurses-$(version).tar.gz", + "https://invisible-mirror.net/archives/ncurses/ncurses-$(version).tar.gz", + "ftp://ftp.gnu.org/gnu/ncurses/ncurses-$(version).tar.gz") + add_versions("6.1", "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17") + + on_install("linux", "macosx", function (package) + import("package.tools.autoconf").install(package, {"--without-manpages"}) + end) From f5ee5c075965f772ee8a6a82dc6f8693489b2d73 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 26 Nov 2018 23:53:01 +0800 Subject: [PATCH 11/15] update ncurses --- packages/n/ncurses/xmake.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua index 675497e90..9ebe2b722 100644 --- a/packages/n/ncurses/xmake.lua +++ b/packages/n/ncurses/xmake.lua @@ -8,6 +8,10 @@ package("ncurses") "ftp://ftp.gnu.org/gnu/ncurses/ncurses-$(version).tar.gz") add_versions("6.1", "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17") + on_load(function (package) + package:addvar("includedirs", "include/ncurses") + end) + on_install("linux", "macosx", function (package) import("package.tools.autoconf").install(package, {"--without-manpages"}) end) From f6ee70f49dea06218b8ba02049b0e647d392b3e2 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 26 Nov 2018 23:56:12 +0800 Subject: [PATCH 12/15] add cflags to ncurses --- packages/n/ncurses/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua index 9ebe2b722..525c413b0 100644 --- a/packages/n/ncurses/xmake.lua +++ b/packages/n/ncurses/xmake.lua @@ -13,5 +13,5 @@ package("ncurses") end) on_install("linux", "macosx", function (package) - import("package.tools.autoconf").install(package, {"--without-manpages"}) + import("package.tools.autoconf").install(package, {"--without-manpages", ["with-build-cflags"] = package:config("cflags")}) end) From 55dff9ab2b622025aa6255154280c07badcb718b Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 26 Nov 2018 23:59:19 +0800 Subject: [PATCH 13/15] remove cflags for ncurses --- packages/n/ncurses/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua index 525c413b0..9ebe2b722 100644 --- a/packages/n/ncurses/xmake.lua +++ b/packages/n/ncurses/xmake.lua @@ -13,5 +13,5 @@ package("ncurses") end) on_install("linux", "macosx", function (package) - import("package.tools.autoconf").install(package, {"--without-manpages", ["with-build-cflags"] = package:config("cflags")}) + import("package.tools.autoconf").install(package, {"--without-manpages"}) end) From aa88f50d045e318fc7eff873b79508f778a1cb00 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 27 Nov 2018 00:04:16 +0800 Subject: [PATCH 14/15] improve ncurses --- packages/n/ncurses/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua index 9ebe2b722..1aed216d0 100644 --- a/packages/n/ncurses/xmake.lua +++ b/packages/n/ncurses/xmake.lua @@ -9,7 +9,8 @@ package("ncurses") add_versions("6.1", "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17") on_load(function (package) - package:addvar("includedirs", "include/ncurses") + package:addvar("includedirs", "include/ncurses", "include") + package:addvar("links", "ncurses", "form", "panel", "menu") end) on_install("linux", "macosx", function (package) From 54e6f1abcd4904278bbf1a8e398d63b5bea9f1f4 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 29 Nov 2018 00:47:31 +0800 Subject: [PATCH 15/15] update xmakever --- xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake.lua b/xmake.lua index 9576b6fd5..e50ef6e13 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,6 +1,6 @@ -- set xmake minimal version -set_xmakever("2.2.2") +set_xmakever("2.2.3") -- set repository description set_description("The official package repository of xmake")