From 9be5d90a6990dbba6524b4f39d8ad93c936e5855 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Wed, 1 Nov 2023 21:42:35 -0700 Subject: [PATCH] Fix ffmpeg link error on Linux platform --- README.md | 4 +- .../remote_desk/thirdparty/ffmpeg/xmake.lua | 206 ++++++++++++++++++ application/remote_desk/thirdparty/xmake.lua | 6 +- application/remote_desk/xmake.lua | 10 +- thirdparty/ffmpeg/xmake.lua | 206 ++++++++++++++++++ thirdparty/xmake.lua | 4 + xmake.lua | 14 +- 7 files changed, 437 insertions(+), 13 deletions(-) create mode 100644 application/remote_desk/thirdparty/ffmpeg/xmake.lua create mode 100644 thirdparty/ffmpeg/xmake.lua diff --git a/README.md b/README.md index ca7e1ae..679a7d3 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,6 @@ vcpkg/buildtrees/versioning_/versions/pcre/69e232f12c4e3eab4115f0672466a6661978b linux apt-get install nvidia-cuda-toolkit -solve \ No newline at end of file +solve + +sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev \ No newline at end of file diff --git a/application/remote_desk/thirdparty/ffmpeg/xmake.lua b/application/remote_desk/thirdparty/ffmpeg/xmake.lua new file mode 100644 index 0000000..b0edb9e --- /dev/null +++ b/application/remote_desk/thirdparty/ffmpeg/xmake.lua @@ -0,0 +1,206 @@ +package("ffmpeg") + + set_homepage("https://www.ffmpeg.org") + set_description("A collection of libraries to process multimedia content such as audio, video, subtitles and related metadata.") + set_license("GPL-3.0") + + if is_plat("windows", "mingw") then + add_urls("https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-$(version)-full_build-shared.7z") + add_versions("5.1.2", "d9eb97b72d7cfdae4d0f7eaea59ccffb8c364d67d88018ea715d5e2e193f00e9") + add_versions("5.0.1", "ded28435b6f04b74f5ef5a6a13761233bce9e8e9f8ecb0eabe936fd36a778b0c") + + add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) + add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true}) + else + add_urls("https://ffmpeg.org/releases/ffmpeg-$(version).tar.bz2", {alias = "home"}) + add_urls("https://github.com/FFmpeg/FFmpeg/archive/n$(version).zip", {alias = "github"}) + add_urls("https://git.ffmpeg.org/ffmpeg.git", "https://github.com/FFmpeg/FFmpeg.git", {alias = "git"}) + add_versions("home:5.1.2", "39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b") + add_versions("home:5.1.1", "cd0e16f903421266d5ccddedf7b83b9e5754aef4b9f7a7f06ce9e4c802f0545b") + add_versions("home:5.0.1", "28df33d400a1c1c1b20d07a99197809a3b88ef765f5f07dc1ff067fac64c59d6") + add_versions("home:4.0.2", "346c51735f42c37e0712e0b3d2f6476c86ac15863e4445d9e823fe396420d056") + add_versions("github:5.1.2", "0c99f3609160f40946e2531804175eea16416320c4b6365ad075e390600539db") + add_versions("github:5.1.1", "a886fcc94792764c27c88ebe71dffbe5f0d37df8f06f01efac4833ac080c11bf") + add_versions("github:5.0.1", "f9c2e06cafa4381df8d5c9c9e14d85d9afcbc10c516c6a206f821997cc7f6440") + add_versions("github:4.0.2", "4df1ef0bf73b7148caea1270539ef7bd06607e0ea8aa2fbf1bb34062a097f026") + add_versions("git:5.1.2", "n5.1.2") + add_versions("git:5.1.1", "n5.1.1") + add_versions("git:5.0.1", "n5.0.1") + add_versions("git:4.0.2", "n4.0.2") + + add_configs("gpl", {description = "Enable GPL code", default = true, type = "boolean"}) + add_configs("ffprobe", {description = "Enable ffprobe program.", default = false, type = "boolean"}) + add_configs("ffmpeg", {description = "Enable ffmpeg program.", default = true, type = "boolean"}) + add_configs("ffplay", {description = "Enable ffplay program.", default = false, type = "boolean"}) + add_configs("zlib", {description = "Enable zlib compression library.", default = false, type = "boolean"}) + add_configs("lzma", {description = "Enable liblzma compression library.", default = false, type = "boolean"}) + add_configs("bzlib", {description = "Enable bzlib compression library.", default = false, type = "boolean"}) + add_configs("libx264", {description = "Enable libx264 decoder.", default = false, type = "boolean"}) + add_configs("libx265", {description = "Enable libx265 decoder.", default = false, type = "boolean"}) + add_configs("iconv", {description = "Enable libiconv library.", default = false, type = "boolean"}) + add_configs("vaapi", {description = "Enable vaapi library.", default = false, type = "boolean"}) + add_configs("vdpau", {description = "Enable vdpau library.", default = false, type = "boolean"}) + add_configs("hardcoded-tables", {description = "Enable hardcoded tables.", default = true, type = "boolean"}) + add_configs("asm", {description = "Enable asm", default = false, type = "boolean"}) + add_configs("libx264", {description = "Enable libx264", default = true, type = "boolean"}) + end + + add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") + if is_plat("macosx") then + add_frameworks("CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox", "VideoToolbox", "Security") + elseif is_plat("linux") then + add_syslinks("pthread") + end + + if is_plat("linux", "macosx") then + add_deps("yasm") + end + + if on_fetch then + on_fetch("mingw", "linux", "macosx", function (package, opt) + import("lib.detect.find_tool") + if opt.system then + local result + for _, name in ipairs({"libavcodec", "libavdevice", "libavfilter", "libavformat", "libavutil", "libpostproc", "libswresample", "libswscale"}) do + local pkginfo = package:find_package("pkgconfig::" .. name, opt) + if pkginfo then + pkginfo.version = nil + if not result then + result = pkginfo + else + result = result .. pkginfo + end + else + return + end + end + local ffmpeg = find_tool("ffmpeg", {check = "-help", version = true, command = "-version", parse = "%d+%.?%d+%.?%d+", force = true}) + if ffmpeg then + result.version = ffmpeg.version + end + return result + end + end) + end + + on_load("linux", "macosx", "android", function (package) + local configdeps = {zlib = "zlib", + bzlib = "bzip2", + lzma = "xz", + libx264 = "x264", + libx265 = "x265", + iconv = "libiconv"} + for name, dep in pairs(configdeps) do + if package:config(name) then + package:add("deps", dep) + end + end + -- https://www.ffmpeg.org/platform.html#toc-Advanced-linking-configuration + if package:config("pic") ~= false and not package:is_plat("macosx") then + package:add("shflags", "-Wl,-Bsymbolic") + package:add("ldflags", "-Wl,-Bsymbolic") + end + if not package:config("gpl") then + package:set("license", "LGPL-3.0") + end + end) + + on_install("windows|x64", "mingw|x86_64", function (package) + os.cp("bin", package:installdir()) + os.cp("include", package:installdir()) + os.cp("lib", package:installdir()) + package:addenv("PATH", "bin") + end) + + on_install("linux", "macosx", "android@linux,macosx", function (package) + local configs = {"--enable-version3", + "--disable-doc"} + if package:config("gpl") then + table.insert(configs, "--enable-gpl") + end + if package:is_plat("macosx") and macos.version():ge("10.8") then + table.insert(configs, "--enable-videotoolbox") + end + for name, enabled in pairs(package:configs()) do + if not package:extraconf("configs", name, "builtin") then + if enabled then + table.insert(configs, "--enable-" .. name) + else + table.insert(configs, "--disable-" .. name) + end + end + end + if package:config("shared") then + table.insert(configs, "--enable-shared") + table.insert(configs, "--disable-static") + else + table.insert(configs, "--enable-static") + table.insert(configs, "--disable-shared") + end + if package:debug() then + table.insert(configs, "--enable-debug") + else + table.insert(configs, "--disable-debug") + end + if package:is_plat("android") then + import("core.base.option") + import("core.tool.toolchain") + local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) + local bin = ndk:bindir() + local ndk_sdkver = ndk:config("ndk_sdkver") + local arch, cpu, triple, cross_prefix + if package:is_arch("arm64-v8a") then + arch = "arm64" + cpu = "armv8-a" + triple = "aarch64-linux-android" + cross_prefix = path.join(bin, "aarch64-linux-android-") + elseif package:arch():startswith("arm") then + arch = "arm" + cpu = "armv7-a" + triple = "armv7a-linux-androideabi" + cross_prefix = path.join(bin, "arm-linux-androideabi-") + else + raise("unknown arch(%s) for android!", package:arch()) + end + local sysroot = path.join(path.directory(bin), "sysroot") + local cflags = table.join(table.wrap(package:config("cxflags")), table.wrap(package:config("cflags")), table.wrap(get_config("cxflags")), get_config("cflags")) + local cxxflags = table.join(table.wrap(package:config("cxflags")), table.wrap(package:config("cxxflags")), table.wrap(get_config("cxflags")), get_config("cxxflags")) + assert(os.isdir(sysroot), "we do not support old version ndk!") + if package:is_arch("arm64-v8a") then + table.insert(cflags, "-mfpu=neon") + table.insert(cflags, "-mfloat-abi=soft") + else + table.insert(cflags, "-mfpu=neon") + table.insert(cflags, "-mfloat-abi=soft") + end + table.insert(configs, "--enable-neon") + table.insert(configs, "--enable-asm") + table.insert(configs, "--enable-jni") + table.insert(configs, "--target-os=android") + table.insert(configs, "--enable-cross-compile") + table.insert(configs, "--disable-avdevice") + table.insert(configs, "--arch=" .. arch) + table.insert(configs, "--cpu=" .. cpu) + table.insert(configs, "--cc=" .. path.join(bin, triple .. ndk_sdkver .. "-clang")) + table.insert(configs, "--cxx=" .. path.join(bin, triple .. ndk_sdkver .. "-clang++")) + table.insert(configs, "--extra-cflags=" .. table.concat(cflags, ' ')) + table.insert(configs, "--extra-cxxflags=" .. table.concat(cxxflags, ' ')) + table.insert(configs, "--sysroot=" .. sysroot) + table.insert(configs, "--cross-prefix=" .. cross_prefix) + table.insert(configs, "--prefix=" .. package:installdir()) + os.vrunv("./configure", configs) + local argv = {"-j4"} + if option.get("verbose") then + table.insert(argv, "V=1") + end + os.vrunv("make", argv) + os.vrun("make install") + else + import("package.tools.autoconf").install(package, configs) + end + package:addenv("PATH", "bin") + end) + + on_test(function (package) + assert(package:has_cfuncs("avformat_open_input", {includes = "libavformat/avformat.h"})) + end) \ No newline at end of file diff --git a/application/remote_desk/thirdparty/xmake.lua b/application/remote_desk/thirdparty/xmake.lua index 6362081..107552a 100644 --- a/application/remote_desk/thirdparty/xmake.lua +++ b/application/remote_desk/thirdparty/xmake.lua @@ -1 +1,5 @@ -includes("sdl2") \ No newline at end of file +includes("sdl2") +if is_plat("windows") then +elseif is_plat("linux") then + includes("ffmpeg") +end \ No newline at end of file diff --git a/application/remote_desk/xmake.lua b/application/remote_desk/xmake.lua index 77d12e0..c3f5f96 100644 --- a/application/remote_desk/xmake.lua +++ b/application/remote_desk/xmake.lua @@ -16,7 +16,6 @@ if is_os("windows") then add_requires("vcpkg::ffmpeg 5.1.2", {configs = {shared = false}}) elseif is_os("linux") then add_requires("ffmpeg 5.1.2", {system = false}) - set_config("cxxflags", "-fPIC") add_syslinks("pthread", "dl") elseif is_os("macosx") then add_requires("ffmpeg 5.1.2", {system = false}) @@ -63,9 +62,8 @@ target("remote_desk") add_links("SDL2") elseif is_os("linux") then add_links("SDL2") - -- add_ldflags("-lsndio", "-lasound", "-lxcb", "-lX11", "-lXext", "-lXv", - -- "-lxcb-shape", "-lxcb-xfixes", "-lxcb-shm", "-lavfilter", "-ldl", - -- "-lavdevice", "-lavformat", "-lavcodec", "-lswscale", "-lswresample", - -- "-lavutil", {force = true}) - -- -- add_ldflags("-lasound", "-lX11", "-lXext", "-lxcb", "-lsndio", "-lpostproc", "-ldl", {force = true}) + add_ldflags("-lavformat", "-lavdevice", "-lavfilter", "-lavcodec", + "-lswscale", "-lavutil", "-lswresample", "-lpostproc", + "-lasound", "-lxcb-shape", "-lxcb-xfixes", "-lsndio", "-lxcb", + "-lxcb-shm", "-lXext", "-lX11", "-lXv", "-ldl", "-lpthread", {force = true}) end \ No newline at end of file diff --git a/thirdparty/ffmpeg/xmake.lua b/thirdparty/ffmpeg/xmake.lua new file mode 100644 index 0000000..b0edb9e --- /dev/null +++ b/thirdparty/ffmpeg/xmake.lua @@ -0,0 +1,206 @@ +package("ffmpeg") + + set_homepage("https://www.ffmpeg.org") + set_description("A collection of libraries to process multimedia content such as audio, video, subtitles and related metadata.") + set_license("GPL-3.0") + + if is_plat("windows", "mingw") then + add_urls("https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-$(version)-full_build-shared.7z") + add_versions("5.1.2", "d9eb97b72d7cfdae4d0f7eaea59ccffb8c364d67d88018ea715d5e2e193f00e9") + add_versions("5.0.1", "ded28435b6f04b74f5ef5a6a13761233bce9e8e9f8ecb0eabe936fd36a778b0c") + + add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) + add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true}) + else + add_urls("https://ffmpeg.org/releases/ffmpeg-$(version).tar.bz2", {alias = "home"}) + add_urls("https://github.com/FFmpeg/FFmpeg/archive/n$(version).zip", {alias = "github"}) + add_urls("https://git.ffmpeg.org/ffmpeg.git", "https://github.com/FFmpeg/FFmpeg.git", {alias = "git"}) + add_versions("home:5.1.2", "39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b") + add_versions("home:5.1.1", "cd0e16f903421266d5ccddedf7b83b9e5754aef4b9f7a7f06ce9e4c802f0545b") + add_versions("home:5.0.1", "28df33d400a1c1c1b20d07a99197809a3b88ef765f5f07dc1ff067fac64c59d6") + add_versions("home:4.0.2", "346c51735f42c37e0712e0b3d2f6476c86ac15863e4445d9e823fe396420d056") + add_versions("github:5.1.2", "0c99f3609160f40946e2531804175eea16416320c4b6365ad075e390600539db") + add_versions("github:5.1.1", "a886fcc94792764c27c88ebe71dffbe5f0d37df8f06f01efac4833ac080c11bf") + add_versions("github:5.0.1", "f9c2e06cafa4381df8d5c9c9e14d85d9afcbc10c516c6a206f821997cc7f6440") + add_versions("github:4.0.2", "4df1ef0bf73b7148caea1270539ef7bd06607e0ea8aa2fbf1bb34062a097f026") + add_versions("git:5.1.2", "n5.1.2") + add_versions("git:5.1.1", "n5.1.1") + add_versions("git:5.0.1", "n5.0.1") + add_versions("git:4.0.2", "n4.0.2") + + add_configs("gpl", {description = "Enable GPL code", default = true, type = "boolean"}) + add_configs("ffprobe", {description = "Enable ffprobe program.", default = false, type = "boolean"}) + add_configs("ffmpeg", {description = "Enable ffmpeg program.", default = true, type = "boolean"}) + add_configs("ffplay", {description = "Enable ffplay program.", default = false, type = "boolean"}) + add_configs("zlib", {description = "Enable zlib compression library.", default = false, type = "boolean"}) + add_configs("lzma", {description = "Enable liblzma compression library.", default = false, type = "boolean"}) + add_configs("bzlib", {description = "Enable bzlib compression library.", default = false, type = "boolean"}) + add_configs("libx264", {description = "Enable libx264 decoder.", default = false, type = "boolean"}) + add_configs("libx265", {description = "Enable libx265 decoder.", default = false, type = "boolean"}) + add_configs("iconv", {description = "Enable libiconv library.", default = false, type = "boolean"}) + add_configs("vaapi", {description = "Enable vaapi library.", default = false, type = "boolean"}) + add_configs("vdpau", {description = "Enable vdpau library.", default = false, type = "boolean"}) + add_configs("hardcoded-tables", {description = "Enable hardcoded tables.", default = true, type = "boolean"}) + add_configs("asm", {description = "Enable asm", default = false, type = "boolean"}) + add_configs("libx264", {description = "Enable libx264", default = true, type = "boolean"}) + end + + add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") + if is_plat("macosx") then + add_frameworks("CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox", "VideoToolbox", "Security") + elseif is_plat("linux") then + add_syslinks("pthread") + end + + if is_plat("linux", "macosx") then + add_deps("yasm") + end + + if on_fetch then + on_fetch("mingw", "linux", "macosx", function (package, opt) + import("lib.detect.find_tool") + if opt.system then + local result + for _, name in ipairs({"libavcodec", "libavdevice", "libavfilter", "libavformat", "libavutil", "libpostproc", "libswresample", "libswscale"}) do + local pkginfo = package:find_package("pkgconfig::" .. name, opt) + if pkginfo then + pkginfo.version = nil + if not result then + result = pkginfo + else + result = result .. pkginfo + end + else + return + end + end + local ffmpeg = find_tool("ffmpeg", {check = "-help", version = true, command = "-version", parse = "%d+%.?%d+%.?%d+", force = true}) + if ffmpeg then + result.version = ffmpeg.version + end + return result + end + end) + end + + on_load("linux", "macosx", "android", function (package) + local configdeps = {zlib = "zlib", + bzlib = "bzip2", + lzma = "xz", + libx264 = "x264", + libx265 = "x265", + iconv = "libiconv"} + for name, dep in pairs(configdeps) do + if package:config(name) then + package:add("deps", dep) + end + end + -- https://www.ffmpeg.org/platform.html#toc-Advanced-linking-configuration + if package:config("pic") ~= false and not package:is_plat("macosx") then + package:add("shflags", "-Wl,-Bsymbolic") + package:add("ldflags", "-Wl,-Bsymbolic") + end + if not package:config("gpl") then + package:set("license", "LGPL-3.0") + end + end) + + on_install("windows|x64", "mingw|x86_64", function (package) + os.cp("bin", package:installdir()) + os.cp("include", package:installdir()) + os.cp("lib", package:installdir()) + package:addenv("PATH", "bin") + end) + + on_install("linux", "macosx", "android@linux,macosx", function (package) + local configs = {"--enable-version3", + "--disable-doc"} + if package:config("gpl") then + table.insert(configs, "--enable-gpl") + end + if package:is_plat("macosx") and macos.version():ge("10.8") then + table.insert(configs, "--enable-videotoolbox") + end + for name, enabled in pairs(package:configs()) do + if not package:extraconf("configs", name, "builtin") then + if enabled then + table.insert(configs, "--enable-" .. name) + else + table.insert(configs, "--disable-" .. name) + end + end + end + if package:config("shared") then + table.insert(configs, "--enable-shared") + table.insert(configs, "--disable-static") + else + table.insert(configs, "--enable-static") + table.insert(configs, "--disable-shared") + end + if package:debug() then + table.insert(configs, "--enable-debug") + else + table.insert(configs, "--disable-debug") + end + if package:is_plat("android") then + import("core.base.option") + import("core.tool.toolchain") + local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) + local bin = ndk:bindir() + local ndk_sdkver = ndk:config("ndk_sdkver") + local arch, cpu, triple, cross_prefix + if package:is_arch("arm64-v8a") then + arch = "arm64" + cpu = "armv8-a" + triple = "aarch64-linux-android" + cross_prefix = path.join(bin, "aarch64-linux-android-") + elseif package:arch():startswith("arm") then + arch = "arm" + cpu = "armv7-a" + triple = "armv7a-linux-androideabi" + cross_prefix = path.join(bin, "arm-linux-androideabi-") + else + raise("unknown arch(%s) for android!", package:arch()) + end + local sysroot = path.join(path.directory(bin), "sysroot") + local cflags = table.join(table.wrap(package:config("cxflags")), table.wrap(package:config("cflags")), table.wrap(get_config("cxflags")), get_config("cflags")) + local cxxflags = table.join(table.wrap(package:config("cxflags")), table.wrap(package:config("cxxflags")), table.wrap(get_config("cxflags")), get_config("cxxflags")) + assert(os.isdir(sysroot), "we do not support old version ndk!") + if package:is_arch("arm64-v8a") then + table.insert(cflags, "-mfpu=neon") + table.insert(cflags, "-mfloat-abi=soft") + else + table.insert(cflags, "-mfpu=neon") + table.insert(cflags, "-mfloat-abi=soft") + end + table.insert(configs, "--enable-neon") + table.insert(configs, "--enable-asm") + table.insert(configs, "--enable-jni") + table.insert(configs, "--target-os=android") + table.insert(configs, "--enable-cross-compile") + table.insert(configs, "--disable-avdevice") + table.insert(configs, "--arch=" .. arch) + table.insert(configs, "--cpu=" .. cpu) + table.insert(configs, "--cc=" .. path.join(bin, triple .. ndk_sdkver .. "-clang")) + table.insert(configs, "--cxx=" .. path.join(bin, triple .. ndk_sdkver .. "-clang++")) + table.insert(configs, "--extra-cflags=" .. table.concat(cflags, ' ')) + table.insert(configs, "--extra-cxxflags=" .. table.concat(cxxflags, ' ')) + table.insert(configs, "--sysroot=" .. sysroot) + table.insert(configs, "--cross-prefix=" .. cross_prefix) + table.insert(configs, "--prefix=" .. package:installdir()) + os.vrunv("./configure", configs) + local argv = {"-j4"} + if option.get("verbose") then + table.insert(argv, "V=1") + end + os.vrunv("make", argv) + os.vrun("make install") + else + import("package.tools.autoconf").install(package, configs) + end + package:addenv("PATH", "bin") + end) + + on_test(function (package) + assert(package:has_cfuncs("avformat_open_input", {includes = "libavformat/avformat.h"})) + end) \ No newline at end of file diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua index e69de29..6e84f24 100644 --- a/thirdparty/xmake.lua +++ b/thirdparty/xmake.lua @@ -0,0 +1,4 @@ +if is_plat("windows") then +elseif is_plat("linux") then + includes("ffmpeg") +end \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index b7f32c3..843c03c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -8,8 +8,8 @@ set_languages("c++17") add_rules("mode.release", "mode.debug") add_defines("ASIO_STANDALONE", "ASIO_HAS_STD_TYPE_TRAITS", "ASIO_HAS_STD_SHARED_PTR", - "ASIO_HAS_STD_ADDRESSOF", "ASIO_HAS_STD_ATOMIC", "ASIO_HAS_STD_CHRONO", "ASIO_HAS_CSTDINT", "ASIO_HAS_STD_ARRAY", - "ASIO_HAS_STD_SYSTEM_ERROR") + "ASIO_HAS_STD_ADDRESSOF", "ASIO_HAS_STD_ATOMIC", "ASIO_HAS_STD_CHRONO", + "ASIO_HAS_CSTDINT", "ASIO_HAS_STD_ARRAY", "ASIO_HAS_STD_SYSTEM_ERROR") if is_os("windows") then add_defines("_WEBSOCKETPP_CPP11_INTERNAL_") @@ -30,7 +30,8 @@ if is_os("windows") then add_requires("vcpkg::libnice 0.1.21") add_packages("vcpkg::libnice") elseif is_os("linux") then - add_requires("ffmpeg 5.1.2", {shared = true}) + add_requireconfs("ffmpeg.x264", {configs = {pic = true}}) + add_requires("ffmpeg 5.1.2") add_requires("glib", {system = true}) add_requires("vcpkg::libnice 0.1.21") add_packages("glib", "vcpkg::libnice") @@ -229,6 +230,9 @@ target("nicetest") target("linux_capture") set_kind("binary") - add_packages("ffmpeg", "sdl2", "asound") + add_packages("ffmpeg", "sdl2") add_files("tests/peerconnection/linux_capture.cpp") - add_ldflags("-lasound", "-lX11", "-lXext", "-lxcb", "-lsndio", "-lpostproc", "-ldl", {force = true}) + add_ldflags("-lavformat", "-lavdevice", "-lavfilter", "-lavcodec", + "-lswscale", "-lavutil", "-lswresample", "-lpostproc", + "-lasound", "-lxcb-shape", "-lxcb-xfixes", "-lsndio", "-lxcb", + "-lxcb-shm", "-lXext", "-lX11", "-lXv", "-lpthread", "-lx264", "-ldl", {force = true})