From 05090c8ca39b3aaeb9ce5534b954ca51d3a38d00 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 9 Oct 2024 22:02:03 +0800 Subject: [PATCH 1/5] x265: add 4.0 version --- packages/x/x265/xmake.lua | 74 ++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index 93c4f6f1498..1cf6bcda93a 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -3,27 +3,27 @@ package("x265") set_description("A free software library and application for encoding video streams into the H.265/MPEG-H HEVC compression format.") set_license("GPL-2.0") - add_urls("https://github.com/videolan/x265/archive/$(version).tar.gz", - "https://github.com/videolan/x265.git", + add_urls("https://github.com/videolan/x265.git", "https://bitbucket.org/multicoreware/x265_git") - add_versions("3.2", "4dd707648ea90b96bf1f8ea6a36ed21c11fe3a9048923909c5b629755ca8d8f3") - add_versions("3.2.1", "b5ee7ea796a664d6e2763f9c0ae281fac5d25892fc2cb134698547103466a06a") - add_versions("3.3", "ca25a38772fc6b49e5f1aa88733bc1dc92da7dc18f02a85cc3e99d76ba85b0a9") - add_versions("3.4", "544d147bf146f8994a7bf8521ed878c93067ea1c7c6e93ab602389be3117eaaf") + add_urls("https://github.com/videolan/x265/archive/refs/tags/$(version).tar.gz", {alias = "github"}) + add_urls("https://bitbucket.org/multicoreware/x265_git/downloads/x265_$(version).tar.gz", {alias = "bitbucket"}) + + add_versions("bitbucket:4.0", "75b4d05629e365913de3100b38a459b04e2a217a8f30efaa91b572d8e6d71282") + + add_versions("github:3.4", "544d147bf146f8994a7bf8521ed878c93067ea1c7c6e93ab602389be3117eaaf") + add_versions("github:3.3", "ca25a38772fc6b49e5f1aa88733bc1dc92da7dc18f02a85cc3e99d76ba85b0a9") + add_versions("github:3.2.1", "b5ee7ea796a664d6e2763f9c0ae281fac5d25892fc2cb134698547103466a06a") + add_versions("github:3.2", "4dd707648ea90b96bf1f8ea6a36ed21c11fe3a9048923909c5b629755ca8d8f3") add_configs("hdr10_plus", {description = "Enable dynamic HDR10 compilation", default = false, type = "boolean"}) add_configs("svt_hevc", {description = "Enable SVT HEVC Encoder", default = false, type = "boolean"}) if is_plat("linux") then add_configs("numa", {description = "Enable libnuma", default = false, type = "boolean"}) - end - - add_deps("cmake") - if is_plat("wasm") then + elseif is_plat("wasm") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) - else - add_deps("nasm >=2.13") end + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) if is_plat("macosx") then add_syslinks("c++") @@ -31,20 +31,29 @@ package("x265") add_syslinks("pthread", "dl") end - on_install("windows|x86", "windows|x64", "mingw", "linux", "bsd", "macosx", "wasm", "cross", function (package) + add_deps("cmake", "nasm >=2.13") + + on_install(function (package) os.cd("source") + -- Let xmake cp pdb + io.replace("CMakeLists.txt", "if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))", "if(0)", {plain = true}) + if package:is_plat("android") then - io.replace("CMakeLists.txt", "list(APPEND PLATFORM_LIBS pthread)", "", { plain = true }) - end - if package:is_plat("wasm") then - io.replace("CMakeLists.txt", "X86 AND NOT X64", "FALSE") + io.replace("CMakeLists.txt", "list(APPEND PLATFORM_LIBS pthread)", "", {plain = true}) + elseif package:is_plat("wasm") then + io.replace("CMakeLists.txt", "X86 AND NOT X64", "FALSE", {plain = true}) end local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DCHECKED_BUILD=" .. (package:is_debug() and "ON" or "OFF")) + table.insert(configs, "-DENABLE_SHARED=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_PIC=" .. (package:config("pic") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_HDR10_PLUS=" .. (package:config("hdr10_plus") and "ON" or "OFF")) table.insert(configs, "-DENABLE_SVT_HEVC=" .. (package:config("svt_hevc") and "ON" or "OFF")) - table.insert(configs, "-DENABLE_SHARED=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_CLI=" .. (package:config("tools") and "ON" or "OFF")) + table.insert(configs, "-DNATIVE_BUILD=" .. (package:is_cross() and "OFF" or "ON")) if package:config("numa") then table.insert(configs, "-DENABLE_LIBNUMA=ON") @@ -54,19 +63,36 @@ package("x265") end if package:is_cross() and package:is_targetarch("arm.*") then - table.insert(configs, "-DCROSS_COMPILE_ARM=ON") - if not package:is_plat("android") then - table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=" .. (package:is_targetarch("aarch64", "arm64") and "aarch64" or "armv6l")) - table.insert(configs, "-DCMAKE_SIZEOF_VOID_P=" .. (package:is_targetarch("aarch64", "arm64") and "8" or "4")) + if package:is_arch64() then + table.insert(configs, "-DCROSS_COMPILE_ARM64=ON") + else + table.insert(configs, "-DCROSS_COMPILE_ARM=ON") end end if package:version() then table.insert(configs, "-DX265_LATEST_TAG=" .. package:version():rawstr()) end + if package:is_plat("windows") then + table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") + end import("package.tools.cmake").install(package, configs) - if package:is_plat("windows") then -- fix x265.pc - io.replace(path.join(package:installdir("lib", "pkgconfig"), "x265.pc"), "-lx265", "-lx265-static", {plain = true}) + + if package:config("shared") then + os.tryrm(package:installdir("lib/x265-static.lib")) + end + + if package:is_plat("windows") and package:is_debug() then + local dir = package:installdir(package:config("shared") and "bin" or "lib") + os.trycp(path.join(package:buildir(), "libx265.pdb"), dir) + if package:config("tools") then + os.trycp(path.join(package:buildir(), "x265.pdb"), package:installdir("bin")) + end + end + + if package:is_plat("windows") then + -- Error links, switch to xmake pc file + os.rm(package:installdir("lib/pkgconfig/x265.pc")) end end) From ea84c434a6db5754ed21afec6fc3458d10d598b5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 9 Oct 2024 23:06:12 +0800 Subject: [PATCH 2/5] add configs --- packages/x/x265/xmake.lua | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index 1cf6bcda93a..e59d35254d6 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -18,6 +18,8 @@ package("x265") add_configs("hdr10_plus", {description = "Enable dynamic HDR10 compilation", default = false, type = "boolean"}) add_configs("svt_hevc", {description = "Enable SVT HEVC Encoder", default = false, type = "boolean"}) + add_configs("high_bit_depth", {description = "Store pixel samples as 16bit values (Main10/Main12)", default = false, type = "boolean"}) + add_configs("main12", {description = "Support Main12 instead of Main10", default = false, type = "boolean"}) if is_plat("linux") then add_configs("numa", {description = "Enable libnuma", default = false, type = "boolean"}) elseif is_plat("wasm") then @@ -52,6 +54,8 @@ package("x265") table.insert(configs, "-DENABLE_HDR10_PLUS=" .. (package:config("hdr10_plus") and "ON" or "OFF")) table.insert(configs, "-DENABLE_SVT_HEVC=" .. (package:config("svt_hevc") and "ON" or "OFF")) + table.insert(configs, "-DHIGH_BIT_DEPTH=" .. (package:config("high_bit_depth") and "ON" or "OFF")) + table.insert(configs, "-DMAIN12=" .. (package:config("main12") and "ON" or "OFF")) table.insert(configs, "-DENABLE_CLI=" .. (package:config("tools") and "ON" or "OFF")) table.insert(configs, "-DNATIVE_BUILD=" .. (package:is_cross() and "OFF" or "ON")) @@ -78,21 +82,20 @@ package("x265") end import("package.tools.cmake").install(package, configs) - if package:config("shared") then - os.tryrm(package:installdir("lib/x265-static.lib")) - end - - if package:is_plat("windows") and package:is_debug() then - local dir = package:installdir(package:config("shared") and "bin" or "lib") - os.trycp(path.join(package:buildir(), "libx265.pdb"), dir) - if package:config("tools") then - os.trycp(path.join(package:buildir(), "x265.pdb"), package:installdir("bin")) - end - end - if package:is_plat("windows") then + if package:config("shared") then + os.tryrm(package:installdir("lib/x265-static.lib")) + end -- Error links, switch to xmake pc file os.rm(package:installdir("lib/pkgconfig/x265.pc")) + + if package:is_debug() then + local dir = package:installdir(package:config("shared") and "bin" or "lib") + os.trycp(path.join(package:buildir(), "libx265.pdb"), dir) + if package:config("tools") then + os.trycp(path.join(package:buildir(), "x265.pdb"), package:installdir("bin")) + end + end end end) From 8f4008d25c6f96a268aac75f13a921b0545c0c7b Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 9 Oct 2024 23:35:29 +0800 Subject: [PATCH 3/5] disable asm for some platform --- packages/x/x265/xmake.lua | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index e59d35254d6..0dc1ddbe5d3 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -65,6 +65,14 @@ package("x265") else table.insert(configs, "-DENABLE_LIBNUMA=OFF") end + if package:version() then + table.insert(configs, "-DX265_LATEST_TAG=" .. package:version():rawstr()) + end + + if (package:is_plat("windows") and package:is_arch("arm.*")) + or package:is_plat("android", "iphoneos", "wasm") then + table.insert(configs, "-DENABLE_ASSEMBLY=OFF") + end if package:is_cross() and package:is_targetarch("arm.*") then if package:is_arch64() then @@ -73,14 +81,19 @@ package("x265") table.insert(configs, "-DCROSS_COMPILE_ARM=ON") end end - if package:version() then - table.insert(configs, "-DX265_LATEST_TAG=" .. package:version():rawstr()) - end if package:is_plat("windows") then table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") end - import("package.tools.cmake").install(package, configs) + + local opt = {} + if package:gitref() or package:version():ge("4.0") then + if package:is_plat("wasm") then + opt.cxflags = "-pthread" + package:add("ldflags", "-s USE_PTHREADS=1") + end + end + import("package.tools.cmake").install(package, configs, opt) if package:is_plat("windows") then if package:config("shared") then @@ -96,6 +109,10 @@ package("x265") os.trycp(path.join(package:buildir(), "x265.pdb"), package:installdir("bin")) end end + else + if package:config("shared") then + os.rm(package:installdir("lib/*.a")) + end end end) From 9da76e6b0de0f42c7f186f0199a6a89f977cea4d Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 9 Oct 2024 23:57:00 +0800 Subject: [PATCH 4/5] fix mingw --- packages/x/x265/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index 0dc1ddbe5d3..6efe83eb9c4 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -111,7 +111,7 @@ package("x265") end else if package:config("shared") then - os.rm(package:installdir("lib/*.a")) + os.rm(package:installdir("lib/libx265.a")) end end end) From 4e3bfc35e0e773dd273b62506470e66874be1be7 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 10 Oct 2024 00:01:03 +0800 Subject: [PATCH 5/5] add check --- packages/x/x265/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index 6efe83eb9c4..7c286c241cf 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -35,6 +35,14 @@ package("x265") add_deps("cmake", "nasm >=2.13") + if on_check then + on_check("cross", function (package) + if package:version():ge("4.0") then + raise("package(x265 >=4.0) unsupported cross pltform") + end + end) + end + on_install(function (package) os.cd("source") -- Let xmake cp pdb