diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2026-08-26 15:08:16 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2026-08-26 15:08:16 -0400 |
| commit | 6094c907b26e21f13373bae6bf3306dbae40af3c (patch) | |
| tree | 981864ddb1ab9749d3e10a81edc782311826e101 /subprojects/packagefiles/ffmpeg/meson.build | |
| parent | da9bddc70ff8544f3294b880d719c4605e87ad97 (diff) | |
| download | camu-6094c907b26e21f13373bae6bf3306dbae40af3c.tar.gz camu-6094c907b26e21f13373bae6bf3306dbae40af3c.tar.bz2 camu-6094c907b26e21f13373bae6bf3306dbae40af3c.zip | |
Update deps, small changes and cleanup
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects/packagefiles/ffmpeg/meson.build')
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index ed3617c..aa881bc 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -12,6 +12,7 @@ is_windows = host_machine.system() == 'windows' is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl' is_mingw = is_windows and not is_msvc is_android = host_machine.system() == 'android' +is_static_shared_lib = is_android args = ['-DFFMPEG_VERSION="' + meson.project_version() + '"'] deps = [] @@ -33,9 +34,6 @@ endif extra_options += ['--arch=' + cpu] extra_options += ['--cc=' + compiler.cmd_array()[0]] if meson.is_cross_build() - if is_msvc - extra_options += ['--ld=' + meson.get_external_property('ld')] - endif extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')] extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] endif @@ -45,6 +43,9 @@ if cpu == 'x86_64' or cpu == 'x86' endif extra_options += ['--enable-static', '--disable-shared'] +if is_static_shared_lib + extra_options += ['--enable-pic'] +endif if is_windows if get_option('win32-compat') @@ -211,7 +212,6 @@ extra_options += [ '--disable-nvdec', '--disable-nvenc', '--disable-vdpau', - '--disable-audiotoolbox', '--disable-videotoolbox' ] @@ -262,7 +262,6 @@ proj = ext_proj.add_project('configure', '--prefix=@PREFIX@', '--libdir=@PREFIX@/@LIBDIR@', '--incdir=@PREFIX@/@INCLUDEDIR@', - '--enable-pic', '--disable-all', '--disable-autodetect', '--disable-everything', |