diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-01-08 12:32:33 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-01-08 12:32:33 -0500 |
| commit | be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58 (patch) | |
| tree | e593aaaefa37907b3ad81a1f81d2d538eef920de /subprojects | |
| parent | 342e613fba5849c11a07d568f765f512f30ea6cf (diff) | |
| download | camu-be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58.tar.gz camu-be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58.tar.bz2 camu-be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58.zip | |
Cleanup
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/libakiyo.wrap | 4 | ||||
| -rw-r--r-- | subprojects/libalabaster.wrap | 4 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 31 |
3 files changed, 18 insertions, 21 deletions
diff --git a/subprojects/libakiyo.wrap b/subprojects/libakiyo.wrap new file mode 100644 index 0000000..2cd2caa --- /dev/null +++ b/subprojects/libakiyo.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://git.akon.city/libakiyo +revision = master +depth = 1 diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap new file mode 100644 index 0000000..c0358cf --- /dev/null +++ b/subprojects/libalabaster.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://git.akon.city/libalabaster +revision = master +depth = 1 diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 1466086..2faa65e 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -95,26 +95,15 @@ proj = ext_proj.add_project('configure', '--enable-parser=' + parsers, '--enable-bsf=' + bsfs, extra_options, - ], verbose: true) + ], + cross_configure_options: ['--enable-cross-compile'], + verbose: true) -inc = include_directories('.') +avutil = proj.dependency('avutil') +avformat = proj.dependency('avformat') +avcodec = proj.dependency('avcodec') +swresample = proj.dependency('swresample') +swscale = proj.dependency('swscale') -if is_msvc - # TODO: FFmpeg patch to fix all libs coming out as .a. - avutil = proj.dependency('libavutil') - avformat = proj.dependency('libavformat') - avcodec = proj.dependency('libavcodec') - swresample = proj.dependency('libswresample') - swscale = proj.dependency('libswscale') -else - avutil = proj.dependency('avutil') - avformat = proj.dependency('avformat') - avcodec = proj.dependency('avcodec') - swresample = proj.dependency('swresample') - swscale = proj.dependency('swscale') - if is_64bit and is_windows - lib_dir = meson.project_build_root() + '/distlib64' - else - lib_dir = meson.project_build_root() + '/dist/usr/local/lib64' - endif -endif +libdir = meson.project_build_root() + '/dist/usr/locallib' +inc = include_directories('.') |