From ce955da36daa278d5b331b3c97e228e733a5125e Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 8 Sep 2025 13:54:36 -0400 Subject: Major FFmpeg build improvements - Make build more compatible with a traditional linux environment. Signed-off-by: Andrew Opalach --- env/android_build.txt | 4 ++++ env/mingw_build.sh | 12 ------------ env/mingw_build.txt | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 env/android_build.txt delete mode 100644 env/mingw_build.sh create mode 100644 env/mingw_build.txt (limited to 'env') diff --git a/env/android_build.txt b/env/android_build.txt new file mode 100644 index 0000000..7855be7 --- /dev/null +++ b/env/android_build.txt @@ -0,0 +1,4 @@ +#! /usr/bin/env sh +meson setup build-android -Dserver=disabled -Drenderer-api=gl -Dwindow=glfm \ + -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=mediacodec \ + --cross-file ./cross/aarch64-linux-android.txt --default-library=static diff --git a/env/mingw_build.sh b/env/mingw_build.sh deleted file mode 100644 index 805c4f5..0000000 --- a/env/mingw_build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env sh -meson setup build-mingw64 -Drenderer-api=vulkan -Drenderer=libplacebo \ - -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg -Dcodec-hwaccel=enabled -Dsubtitles=enabled \ - -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=2 -Ddebug=false --strip - -meson setup build-mingw32-min -Drenderer-api=gl -Drenderer=momo \ - -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ - -Dcodecs=ffmpeg -Dcodec-hwaccel=disabled -Dsubtitles=enabled \ - -Dtests=disabled -Dwin32-compat=true --cross-file ./cross/i686-w64-mingw32.txt \ - --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip diff --git a/env/mingw_build.txt b/env/mingw_build.txt new file mode 100644 index 0000000..e091f9a --- /dev/null +++ b/env/mingw_build.txt @@ -0,0 +1,18 @@ +meson setup build-mingw64-vulkan -Drenderer-api=vulkan -Drenderer=libplacebo -Dwindow=win32 \ + -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ + -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=vulkan -Dsubtitles=enabled \ + -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ + --default-library=static --buildtype=release --optimization=2 -Ddebug=false --strip + +meson setup build-mingw64-dx11 -Drenderer-api=dx11 -Drenderer=libplacebo -Dwindow=win32 \ + -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ + -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=8 -Dcodec-hwaccels=d3d11va -Dsubtitles=enabled \ + -Dtests=disabled -Dwin32-compat=false --cross-file ./cross/x86_64-w64-mingw32.txt \ + --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip + +# Windows XP 32bit Support. +meson setup build-mingw32-min -Drenderer-api=gl -Drenderer=momo -Dwindow=win32 \ + -Dsink-only=false -Dserver=enabled -Dportal=disabled -Dclient=disabled \ + -Dcodecs=ffmpeg -Dcodec-ffmpeg-version=3 -Dsubtitles=enabled \ + -Dtests=disabled -Dwin32-compat=true --cross-file ./cross/i686-w64-mingw32.txt \ + --default-library=static --buildtype=release --optimization=s -Ddebug=false --strip -- cgit v1.2.3-101-g0448