Merge branches 'fixes' and 'ffmpeg_build' into feature
This commit is contained in:
commit
1dbd3b3cc7
5 changed files with 2365 additions and 3 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -83,7 +83,7 @@ jobs:
|
||||||
- name: Install dependencies (Windows)
|
- name: Install dependencies (Windows)
|
||||||
if: matrix.config.os == 'windows-latest'
|
if: matrix.config.os == 'windows-latest'
|
||||||
run: |
|
run: |
|
||||||
choco install ninja innosetup
|
choco install ninja innosetup yasm
|
||||||
$url = "https://github.com/leafo/moonscript/releases/download/win32-v0.5.0/moonscript-187bac54ee5a7450013e9c38e005a0e671b76f45.zip"
|
$url = "https://github.com/leafo/moonscript/releases/download/win32-v0.5.0/moonscript-187bac54ee5a7450013e9c38e005a0e671b76f45.zip"
|
||||||
mkdir moonscript
|
mkdir moonscript
|
||||||
Invoke-WebRequest -Uri $url -OutFile ".\moonscript\moonscript.zip"
|
Invoke-WebRequest -Uri $url -OutFile ".\moonscript\moonscript.zip"
|
||||||
|
|
|
@ -34,8 +34,8 @@ int GetSelectedChoices(wxWindow *parent, wxArrayInt& selections, wxString const&
|
||||||
selNone->Bind(wxEVT_BUTTON, [&](wxCommandEvent&) { dialog.SetSelections(wxArrayInt()); });
|
selNone->Bind(wxEVT_BUTTON, [&](wxCommandEvent&) { dialog.SetSelections(wxArrayInt()); });
|
||||||
|
|
||||||
auto buttonSizer = new wxBoxSizer(wxHORIZONTAL);
|
auto buttonSizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
buttonSizer->Add(selAll, wxSizerFlags(0).Left());
|
buttonSizer->Add(selAll);
|
||||||
buttonSizer->Add(selNone, wxSizerFlags(0).Right());
|
buttonSizer->Add(selNone);
|
||||||
|
|
||||||
auto sizer = dialog.GetSizer();
|
auto sizer = dialog.GetSizer();
|
||||||
sizer->Insert(2, buttonSizer, wxSizerFlags(0).Center());
|
sizer->Insert(2, buttonSizer, wxSizerFlags(0).Center());
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
directory = ffmpeg
|
directory = ffmpeg
|
||||||
url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
|
url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
|
||||||
revision = meson-4.4
|
revision = meson-4.4
|
||||||
|
patch_directory = ffmpeg
|
||||||
|
|
||||||
[provide]
|
[provide]
|
||||||
libavformat = libavformat_dep
|
libavformat = libavformat_dep
|
||||||
|
|
31
subprojects/packagefiles/ffmpeg/libavutil/x86/meson.build
Normal file
31
subprojects/packagefiles/ffmpeg/libavutil/x86/meson.build
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
libavutil_x86_sources = files(
|
||||||
|
'cpu.c',
|
||||||
|
'fixed_dsp_init.c',
|
||||||
|
'float_dsp_init.c',
|
||||||
|
'imgutils_init.c',
|
||||||
|
'lls_init.c',
|
||||||
|
)
|
||||||
|
|
||||||
|
libavutil_x86_optional_sources = {
|
||||||
|
'pixelutils' : files('pixelutils_init.c'),
|
||||||
|
}
|
||||||
|
|
||||||
|
libavutil_x86_x86asm_sources = files(
|
||||||
|
'cpuid.asm',
|
||||||
|
'emms.asm',
|
||||||
|
'fixed_dsp.asm',
|
||||||
|
'float_dsp.asm',
|
||||||
|
'imgutils.asm',
|
||||||
|
'lls.asm',
|
||||||
|
)
|
||||||
|
|
||||||
|
libavutil_x86_x86asm_optional_sources = {
|
||||||
|
'pixelutils' : files('pixelutils.asm'),
|
||||||
|
}
|
||||||
|
|
||||||
|
libavutil_x86_mmx_optional_sources = {
|
||||||
|
}
|
||||||
|
|
||||||
|
libavutil_x86_optional_tests = {
|
||||||
|
}
|
||||||
|
|
2330
subprojects/packagefiles/ffmpeg/meson.build
Normal file
2330
subprojects/packagefiles/ffmpeg/meson.build
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue