diff --git a/pkgs/f/ffmpeg.lua b/pkgs/f/ffmpeg.lua index 69442bd..32ac725 100644 --- a/pkgs/f/ffmpeg.lua +++ b/pkgs/f/ffmpeg.lua @@ -20,12 +20,30 @@ package = { xpm = { linux = { - ["0.0.1"] = { + ["0.0.3"] = { url = { - GLOBAL = "https://github.com/mcpplibs/ffmpeg-m/archive/refs/tags/v0.0.1.tar.gz", - CN = "https://gitcode.com/mcpp-res/ffmpeg/releases/download/v0.0.1/ffmpeg-m-0.0.1.tar.gz", + GLOBAL = "https://github.com/mcpplibs/ffmpeg-m/archive/refs/tags/v0.0.3.tar.gz", + CN = "https://gitcode.com/mcpp-res/ffmpeg/releases/download/v0.0.3/ffmpeg-m-0.0.3.tar.gz", }, - sha256 = "e47dc9683f62466e9bd1c962a5f6ee83fbe3670fdb20c834bd9e8ee3f30e49fb", + sha256 = "822e59d1674b2ead88d1c8e2806c8f661dc0c628980e1dc23fd22dd51bf55fcc", + }, + }, + macosx = { + ["0.0.3"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/ffmpeg-m/archive/refs/tags/v0.0.3.tar.gz", + CN = "https://gitcode.com/mcpp-res/ffmpeg/releases/download/v0.0.3/ffmpeg-m-0.0.3.tar.gz", + }, + sha256 = "822e59d1674b2ead88d1c8e2806c8f661dc0c628980e1dc23fd22dd51bf55fcc", + }, + }, + windows = { + ["0.0.3"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/ffmpeg-m/archive/refs/tags/v0.0.3.tar.gz", + CN = "https://gitcode.com/mcpp-res/ffmpeg/releases/download/v0.0.3/ffmpeg-m-0.0.3.tar.gz", + }, + sha256 = "822e59d1674b2ead88d1c8e2806c8f661dc0c628980e1dc23fd22dd51bf55fcc", }, }, }, diff --git a/tests/examples/ffmpeg-module/mcpp.toml b/tests/examples/ffmpeg-module/mcpp.toml index e6d26ea..392239d 100644 --- a/tests/examples/ffmpeg-module/mcpp.toml +++ b/tests/examples/ffmpeg-module/mcpp.toml @@ -3,9 +3,7 @@ # member-level `[indices] default` redirect, mcpp >= 0.0.97; kept per-member # and single-entry because xlings breaks with >1 project index repo, mcpp#238). Replaces the # former tests/smoke_ffmpeg_module.sh reseeding driver. The package is -# linux-only (source build with 157 NASM .asm units); off-Linux the test -# compiles to a no-op main(). macOS widening tracked as a module re-release -# (v0.0.2) once compat.ffmpeg is multi-platform in the index. +# The package builds on linux + macOS + windows (compat.ffmpeg 3-platform). [package] name = "ffmpeg-module-tests" version = "0.1.0" @@ -18,4 +16,10 @@ version = "0.1.0" default = { path = "../../.." } [target.'cfg(linux)'.dependencies] -ffmpeg = "0.0.1" +ffmpeg = "0.0.3" + +[target.'cfg(macos)'.dependencies] +ffmpeg = "0.0.3" + +[target.'cfg(windows)'.dependencies] +ffmpeg = "0.0.3" diff --git a/tests/examples/ffmpeg-module/tests/ffmpeg_module.cpp b/tests/examples/ffmpeg-module/tests/ffmpeg_module.cpp index 09f9859..cf851cb 100644 --- a/tests/examples/ffmpeg-module/tests/ffmpeg_module.cpp +++ b/tests/examples/ffmpeg-module/tests/ffmpeg_module.cpp @@ -1,7 +1,6 @@ // Public ffmpeg module package end-to-end assertion: import-only consumption // (`import ffmpeg.av;`), libavutil version of the FFmpeg 8.1.x train, core -// decoders present, demuxer registry populated. Linux-only (see mcpp.toml). -#ifdef __linux__ +// decoders present, demuxer registry populated. Builds on linux+macOS+windows. import std; import ffmpeg.av; @@ -26,6 +25,3 @@ int main() { std::println("{} demuxers registered", demuxers); return demuxers > 300 ? 0 : 3; } -#else -int main() { return 0; } -#endif